Remove CI image build hacks

.github/workflows/gnocchi.yml

@@ -167,12 +167,18 @@ jobs:
           push: false
           tags: ghcr.io/gnocchixyz/ci:latest
         if: steps.changes.outputs.ci_image == 'true'
+      # NOTE(callumdickinson): SETUPTOOLS_USE_DISTUTILS needs to be set to 'stdlib'
+      # for Debian-packaged setuptools to work correctly on Python 3.9 and 3.11.
+      # https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1003252
       - name: Set env vars
         run: |
+          export DOCKER_ENV_OPTS=
           if [ "${{ github.event.inputs.debug }}" == "true" ]; then
-            echo "DOCKER_ENV_OPTS=-e GNOCCHI_TEST_DEBUG=1" >> $GITHUB_ENV
-          else
-            echo "DOCKER_ENV_OPTS=" >> $GITHUB_ENV
+            export DOCKER_ENV_OPTS="$DOCKER_ENV_OPTS -e GNOCCHI_TEST_DEBUG=1"
+          fi
+          if [ "${{ matrix.python }}" = "py39" -o "${{ matrix.python }}" = "py311" ]; then
+            export DOCKER_ENV_OPTS="$DOCKER_ENV_OPTS -e SETUPTOOLS_USE_DISTUTILS=stdlib"
           fi
+          echo "DOCKER_ENV_OPTS=$DOCKER_ENV_OPTS" >> $GITHUB_ENV
       - name: Run tests with tox in container
         run: docker run --rm -v ${{ github.workspace }}:/github/workspace -w /github/workspace $DOCKER_ENV_OPTS ghcr.io/gnocchixyz/ci:latest "tox -e ${{ matrix.python }}-${{ matrix.env }}"

images/Dockerfile.ci

@@ -15,12 +15,16 @@ RUN apt-get update -y && apt-get install -qy \
         python3 \
         python3-dev \
         python3-pip \
+        python3-setuptools \
+        python3-wheel \
         python3-virtualenv \
         python3.9 \
         python3.9-dev \
         python3.9-distutils \
         python3.11 \
         python3.11-dev \
+        python3.11-distutils \
+        tox \
 # Needed for uwsgi core routing support
         build-essential \
         libffi-dev \
@@ -42,15 +46,6 @@ RUN apt-get update -y && apt-get install -qy \
 
 RUN rm -rf /var/lib/apt/lists/*
 
-# NOTE(tobias.urdin): hack since pyparsing in site-packages collides with our requirements
-RUN rm -rf /usr/lib/python3/dist-packages/pyparsing*
-
-# NOTE(tobias.urdin): hack since jaraco packages in site-packages collides with our requirements
-RUN rm -rf /usr/lib/python3/dist-packages/jaraco*
-
-# TODO(tobias.urdin): hack remove this when we drop python 3.9
-RUN sed -i '1s/^/from __future__ import annotations\n/' /usr/lib/python3/dist-packages/werkzeug/sansio/utils.py
-
 #NOTE(sileht): really no utf-8 in 2017 !?
 ENV LANG en_US.UTF-8
 RUN update-locale

images/entrypoint.sh.ci

@@ -1,7 +1,3 @@
 #!/bin/sh
 
-python3 -m virtualenv /tmp/gnocchi-tox-env
-. /tmp/gnocchi-tox-env/bin/activate
-pip install tox
-
 $@

tox.ini

@@ -10,7 +10,7 @@ passenv =
     GNOCCHI_TEST_*
     AWS_*
 setenv =
-    VIRTUALENV_SETUPTOOLS=bundle
+    SETUPTOOLS_USE_DISTUTILS={env:SETUPTOOLS_USE_DISTUTILS:local}
     GNOCCHI_TEST_STORAGE_DRIVER=file
     GNOCCHI_TEST_INDEXER_DRIVER=postgresql
     GNOCCHI_TEST_STORAGE_DRIVERS=file swift ceph s3 redis
@@ -69,7 +69,7 @@ deps =
 # Gnocchi we can't reuse the virtualenv
 recreate = True
 setenv =
-    VIRTUALENV_SETUPTOOLS=bundle
+    SETUPTOOLS_USE_DISTUTILS={env:SETUPTOOLS_USE_DISTUTILS:local}
     GNOCCHI_VERSION_FROM=stable/4.5
     GNOCCHI_VARIANT=test,postgresql,file
 deps =
@@ -84,7 +84,7 @@ allowlist_externals = {toxinidir}/run-upgrade-tests.sh
 # Gnocchi we can't reuse the virtualenv
 recreate = True
 setenv =
-    VIRTUALENV_SETUPTOOLS=bundle
+    SETUPTOOLS_USE_DISTUTILS={env:SETUPTOOLS_USE_DISTUTILS:local}
     GNOCCHI_VERSION_FROM=stable/4.5
     GNOCCHI_VARIANT=test,mysql,ceph,ceph_recommended_lib
 deps =
@@ -134,7 +134,7 @@ deps =
     .[test,file,postgresql,doc]
     doc8
 setenv =
-    VIRTUALENV_SETUPTOOLS=bundle
+    SETUPTOOLS_USE_DISTUTILS={env:SETUPTOOLS_USE_DISTUTILS:local}
     GNOCCHI_TEST_DEBUG=1
 commands =
     doc8 --ignore-path doc/source/rest.rst,doc/source/comparison-table.rst doc/source
@@ -145,7 +145,7 @@ allowlist_externals =
     /bin/bash
     /bin/rm
 setenv =
-    VIRTUALENV_SETUPTOOLS=bundle
+    SETUPTOOLS_USE_DISTUTILS={env:SETUPTOOLS_USE_DISTUTILS:local}
     GNOCCHI_STORAGE_DEPS=file
     GNOCCHI_TEST_DEBUG=1
 deps =