From d61858be4b20bbfb9c04855d10c6ce1314c16901 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Thu, 22 Jan 2026 19:56:33 +0100 Subject: [PATCH] Revert "Only change the tox config for Python 3.6 on dedicated CI jobs" This reverts commit b3dbb5707d1f6cec5341aa404a166d1de6c7e2ac. Revert "Require older virtualenv for Python 3.6 in tox" This reverts commit 75f08cc411d19cb2c7e5d36f71645deda3e7d896. Now when https://github.com/fedora-python/fedora-python-tox/issues/88 is fixed, it is no longer needed. --- .github/workflows/main.yml | 17 ++--------------- 1 file changed, 2 insertions(+), 15 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 403b1bf..c05afde 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -16,10 +16,6 @@ jobs: uses: actions/checkout@v2 - name: Set up QEMU uses: docker/setup-qemu-action@v2 - - name: Setup tox for end-of-life Python versions - if: ${{ matrix.legacy }} - run: | - sed -i '/\[tox\]/a requires = virtualenv<20.22.0' tox.ini - name: Run tests in container run: | docker run --platform linux/${{ matrix.arch }} -v ${{ github.workspace }}:/src -w /src -e TOX_PARALLEL_NO_SPINNER=1 -e TOX_PARAMS="-p auto" -e TOXENV=${{ matrix.toxenv }} fedorapython/fedora-python-tox:latest @@ -27,28 +23,19 @@ jobs: matrix: include: - arch: amd64 - toxenv: py39,py310,py311,py312,py313,py314,py315,black,mypy - - arch: amd64 - toxenv: py36 - legacy: true + toxenv: py36,py39,py310,py311,py312,py313,py314,py315,black,mypy - arch: arm64 toxenv: py36 - legacy: true - arch: arm64 toxenv: py39 - arch: arm64 toxenv: py310,py311 - arch: ppc64le - legacy: true toxenv: py36 - arch: ppc64le - legacy: true toxenv: py39,py310,py311 - arch: s390x - toxenv: py39,py310,py311 - - arch: s390x - toxenv: py36 - legacy: true + toxenv: py36,py39,py310,py311 # Use GitHub's Linux Docker host runs-on: ubuntu-latest