From f8d1267f07041eb8692eb46023fee9ef819f4caa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= <miro@hroncok.cz>
Date: Fri, 28 Nov 2025 21:33:58 +0100
Subject: [PATCH 1/2] CI: Run py36,pypy27 toxenvs specially

Fixes: https://github.com/fedora-python/fedora-python-tox/issues/88
---
 .github/workflows/build-and-push.yml | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/build-and-push.yml b/.github/workflows/build-and-push.yml
index f495798..d5fb04d 100644
--- a/.github/workflows/build-and-push.yml
+++ b/.github/workflows/build-and-push.yml
@@ -22,7 +22,9 @@ jobs:
       matrix:
         include:
           - arch: amd64
-            toxenv: py36,py39,py310,py311,py312,py313,py314,py315,py314t,py315t,pypy,pypy39,pypy310,pypy311
+            toxenv: py39,py310,py311,py312,py313,py314,py315,py314t,py315t,pypy39,pypy310,pypy311
+          - arch: amd64
+            toxenv: py36,pypy27
           - arch: arm64
             toxenv: py312
           - arch: ppc64le
@@ -45,12 +47,17 @@ jobs:
           tags: |
             fedorapython/fedora-python-tox:${{ matrix.arch }}
             fedorapython/fedora-python-tox:${{ matrix.arch }}-f${{ env.FEDORA_VERSION }}
+      - name: Setup tox for end-of-life Python versions
+        if: ${{ matrix.toxenv == 'py36,pypy27' }}
+        run: |
+          sed -i '/\[tox\]/a requires = virtualenv<20.22.0' example_project/tox.ini
       - name: Test local project
         env:
           TOXENV: ${{ matrix.toxenv }}
         run: |
           docker run --rm --platform linux/${{ matrix.arch }} -v $PWD/example_project:/src -w /src -e TOXENV fedorapython/fedora-python-tox:${{ matrix.arch }}
       - name: Test remote project
+        if: ${{ matrix.toxenv != 'py36,pypy27' }}
         env:
           TOXENV: ${{ matrix.toxenv }}
         run: |
@@ -61,22 +68,24 @@ jobs:
         run: |
           docker run --rm --platform linux/${{ matrix.arch }} -v $PWD/example_project:/src -w /src -e TOXENV -e TOX_PARAMS="-p auto" fedorapython/fedora-python-tox:${{ matrix.arch }}
       - name: Test dnf install and wheel build
+        if: ${{ matrix.toxenv != 'py36,pypy27' }}
         env:
           TOXENV: ${{ matrix.toxenv }}
         run: |
           docker run --rm --platform linux/${{ matrix.arch }} -e DNF_INSTALL="libffi-devel 'pkgconfig(libgit2) >= 1.9' /usr/bin/cowsay" fedorapython/fedora-python-tox:${{ matrix.arch }} sh -c "/run_tests.sh; pip install -I --no-deps --compile --no-binary :all: cffi pygit2~=1.17.0 && cowsay DONE"
       - name: Test external project with WORKDIR
+        if: ${{ matrix.toxenv != 'py36,pypy27' }}
         run: |
           docker run --rm --platform linux/${{ matrix.arch }} -e TOXENV=py3 -e GIT_URL=https://github.com/frenzymadness/nflxprofile.git -e WORKDIR=python fedorapython/fedora-python-tox:${{ matrix.arch }}
       - name: Login to DockerHub
         uses: docker/login-action@v1
-        if: github.event_name == 'push' || github.event_name == 'schedule'
+        if: ${{ matrix.toxenv != 'py36,pypy27' && (github.event_name == 'push' || github.event_name == 'schedule') }}
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
       - name: Push to Dockerhub
         uses: docker/build-push-action@v2
-        if: github.event_name == 'push' || github.event_name == 'schedule'
+        if: ${{ matrix.toxenv != 'py36,pypy27' && (github.event_name == 'push' || github.event_name == 'schedule') }}
         with:
           context: .
           platforms: linux/${{ matrix.arch }}

From 046b1e03323f95ead06efa603794a11551c7cffd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= <miro@hroncok.cz>
Date: Fri, 28 Nov 2025 22:15:39 +0100
Subject: [PATCH 2/2] CI: Remove unavailable pypy3.9

---
 .github/workflows/build-and-push.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build-and-push.yml b/.github/workflows/build-and-push.yml
index d5fb04d..fd974a8 100644
--- a/.github/workflows/build-and-push.yml
+++ b/.github/workflows/build-and-push.yml
@@ -22,7 +22,7 @@ jobs:
       matrix:
         include:
           - arch: amd64
-            toxenv: py39,py310,py311,py312,py313,py314,py315,py314t,py315t,pypy39,pypy310,pypy311
+            toxenv: py39,py310,py311,py312,py313,py314,py315,py314t,py315t,pypy310,pypy311
           - arch: amd64
             toxenv: py36,pypy27
           - arch: arm64