Fix workflow

Author: rnc

.github/workflows/squash.yml

@@ -9,23 +9,22 @@ on:
       - main
 
 jobs:
-  build-1:
+  build-docker-24:
     runs-on: ubuntu-20.04
     strategy:
       fail-fast: false
       matrix:
         python-version: ['3.6', '3.7', '3.8', '3.9', '3.10', '3.11', '3.12']
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           python-version: ${{ matrix.python-version }}
       - name: Setup
         run: |
           sudo apt-get update
-          pip install -U pip
-          pip install "tox<4.0.0"
+          pip install "tox<4.0.0" setuptools
       - name: Info
         run: |
           docker version
@@ -35,29 +34,27 @@ jobs:
           PV=${{ matrix.python-version }}
           echo "Running tests for Python version  $PV ( ${PV/./} )"
           make test-py"${PV/./}"
-  build-2:
+  build-docker-25:
     runs-on: ubuntu-20.04
     strategy:
       fail-fast: false
       matrix:
         python-version: ['3.6', '3.7', '3.8', '3.9', '3.10', '3.11', '3.12']
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           python-version: ${{ matrix.python-version }}
       - name: Setup
         run: |
           for pkg in containerd runc; do sudo apt-get remove $pkg; done
           sudo apt-get update
-          sudo apt-get install ca-certificates curl
-          sudo install -m 0755 -d /etc/apt/keyrings
-          sudo curl -fsSL https://download.docker.com/linux/ubuntu/gpg -o /etc/apt/keyrings/docker.asc
-          sudo chmod a+r /etc/apt/keyrings/docker.asc
-          sudo apt-get install docker-ce docker-ce-cli containerd.io docker-buildx-plugin docker-compose-plugin
-          pip install -U pip
-          pip install "tox<4.0.0"
+          sudo curl -fsSL https://download.docker.com/linux/ubuntu/gpg | sudo apt-key add -
+          sudo add-apt-repository "deb [arch=amd64] https://download.docker.com/linux/ubuntu focal stable"
+          apt-cache policy docker-ce
+          sudo apt-get install docker-ce docker-ce-cli containerd.io
+          pip install "tox<4.0.0" setuptools
       - name: Info
         run: |
           docker version

Makefile

@@ -21,6 +21,9 @@ test-py310: prepare
 test-py311: prepare
 	tox -e py311 -- tests
 
+test-py312: prepare
+	tox -e py312 -- tests
+
 test-unit: prepare
 	tox -- tests/test_unit*
 

tox.ini

@@ -1,13 +1,12 @@
 [tox]
-envlist = py36,py37,py38,py39,py310,py311
+envlist = py36,py37,py38,py39,py310,py311,py312
 
 [testenv]
-passenv=CI,HOME
-setenv=
-  ENVNAME={envname}
-  PIPENV_VERBOSITY=-1
-deps=
-  pipenv
+passenv=
+  CI
+  HOME
+setenv=PIPENV_VERBOSITY=-1
+deps=pipenv
 commands=
   pipenv install --dev --ignore-pipfile --skip-lock
   pipenv run pytest -v --cov-report term --cov-report html --cov docker_squash --basetemp={envtmpdir} --junit-xml target/junit-{envname}.xml --junit-prefix {envname} {posargs}