Skip to content

Commit b3dbb57

Browse files
committed
Only change the tox config for Python 3.6 on dedicated CI jobs
1 parent 75f08cc commit b3dbb57

File tree

2 files changed

+15
-4
lines changed

2 files changed

+15
-4
lines changed

.github/workflows/main.yml

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,26 +16,39 @@ jobs:
1616
uses: actions/checkout@v2
1717
- name: Set up QEMU
1818
uses: docker/setup-qemu-action@v2
19+
- name: Setup tox for end-of-life Python versions
20+
if: ${{ matrix.legacy }}
21+
run: |
22+
sed -i '/\[tox\]/a requires = virtualenv<20.22.0' tox.ini
1923
- name: Run tests in container
2024
run: |
2125
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
2226
strategy:
2327
matrix:
2428
include:
2529
- arch: amd64
26-
toxenv: py36,py39,py310,py311,py312,py313,py314,py315,black,mypy
30+
toxenv: py39,py310,py311,py312,py313,py314,py315,black,mypy
31+
- arch: amd64
32+
toxenv: py36
33+
legacy: true
2734
- arch: arm64
2835
toxenv: py36
36+
legacy: true
2937
- arch: arm64
3038
toxenv: py39
3139
- arch: arm64
3240
toxenv: py310,py311
3341
- arch: ppc64le
42+
legacy: true
3443
toxenv: py36
3544
- arch: ppc64le
45+
legacy: true
3646
toxenv: py39,py310,py311
3747
- arch: s390x
38-
toxenv: py36,py39,py310,py311
48+
toxenv: py39,py310,py311
49+
- arch: s390x
50+
toxenv: py36
51+
legacy: true
3952

4053
# Use GitHub's Linux Docker host
4154
runs-on: ubuntu-latest

tox.ini

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
11
[tox]
2-
# Older virtualenv required for Python 3.6.
3-
requires = virtualenv<20.22.0
42
envlist = black,mypy,py{36,39,310,311,312,313,314,315}
53
isolated_build = True
64

0 commit comments

Comments
 (0)