Fix tests

* Python Docker images now default to Debian Bookworm, and LLVM upstream
  only builds versions 15 and newer for that release. We can work around
  that by using Debian Bullseye and Buster for LLVM versions <15 and <11

* Poetry was unhappy about an "old" lock file

* Some Python images did not have six installed, and `poetry install`
  installs (dev) dependencies into a virtualenv, while lldb uses the
  system site-packages dir

Dockerfile

@@ -20,7 +20,7 @@ RUN if [ "${LLDB_VERSION}" = "9" ]; then \
 
 ENV PYTHONPATH /usr/lib/llvm-${LLDB_VERSION}/lib/python3/dist-packages
 
-RUN python -m pip install poetry
+RUN python -m pip install poetry six
 
 COPY . /root/.lldb/cpython-lldb
 RUN cd /root/.lldb/cpython-lldb && \

Makefile

@@ -2,11 +2,14 @@ PY_VERSION ?= 3.10
 LLDB_VERSION ?= 11
 DOCKER_IMAGE_TAG = $(PY_VERSION)-lldb$(LLDB_VERSION)
 
-# older LLVM versions are not packaged for Debian Bullseye, which is the new stable
-# used in Python Docker images. We can fall back to Buster images for testing those
 ifeq ($(shell test $(LLDB_VERSION) -lt 11 && echo true), true)
+	# LLVM >= 7: https://apt.llvm.org/buster/pool/main/l/
 	PY_DISTRO = $(PY_VERSION)-buster
+else ifeq ($(shell test $(LLDB_VERSION) -lt 15 && echo true), true)
+	# LLVM >= 11: https://apt.llvm.org/bullseye/pool/main/l/
+	PY_DISTRO = $(PY_VERSION)-bullseye
 else
+	# LLVM >= 15
 	PY_DISTRO = $(PY_VERSION)
 endif