Skip to content

Commit acd10a3

Browse files
authored
Remove requirements//test-djangoXY.txt (#728)
1 parent 875ae4c commit acd10a3

File tree

7 files changed

+26
-17
lines changed

7 files changed

+26
-17
lines changed

.github/workflows/test.yml

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,18 @@ jobs:
1111
runs-on: ubuntu-latest
1212
strategy:
1313
fail-fast: false
14-
matrix:
14+
matrix: # https://docs.djangoproject.com/en/stable/faq/install/#what-python-version-can-i-use-with-django
15+
django-version: ["3.2", "4.2", "5.0"]
1516
python-version: ['3.8', '3.9', '3.10', '3.11', '3.12', 'pypy-3.10']
17+
exclude:
18+
- django-version: "3.2"
19+
python-version: "3.11"
20+
- django-version: "3.2"
21+
python-version: "3.12"
22+
- django-version: "5.0"
23+
python-version: "3.8"
24+
- django-version: "5.0"
25+
python-version: "3.9"
1626

1727
services:
1828
rabbitmq:
@@ -31,4 +41,6 @@ jobs:
3141
python -m pip install --upgrade pip
3242
python -m pip install tox tox-gh-actions
3343
- name: Test with tox
34-
run: tox -vv
44+
run: tox
45+
env:
46+
DJANGO: ${{ matrix.django-version }}

requirements/test-django32.txt

Lines changed: 0 additions & 1 deletion
This file was deleted.

requirements/test-django40.txt

Lines changed: 0 additions & 1 deletion
This file was deleted.

requirements/test-django41.txt

Lines changed: 0 additions & 1 deletion
This file was deleted.

requirements/test-django42.txt

Lines changed: 0 additions & 1 deletion
This file was deleted.

requirements/test-django50.txt

Lines changed: 0 additions & 1 deletion
This file was deleted.

tox.ini

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
; https://docs.djangoproject.com/en/stable/faq/install/#what-python-version-can-i-use-with-django
2+
13
[gh-actions]
24
python =
35
3.8: py38, apicheck, linkcheck
@@ -16,12 +18,12 @@ DJANGO =
1618

1719
[tox]
1820
envlist =
19-
py38-django{32,41,42}
20-
py39-django{32,41,42}
21-
py310-django{32,41,42,50}
22-
py311-django{41,42,50}
23-
py312-django{41,42,50}
24-
pypy3-django{32,41,42,50}
21+
py38-django{32,42}
22+
py39-django{32,42}
23+
py310-django{32,42,50}
24+
py311-django{42,50}
25+
py312-django{42,50}
26+
pypy3-django{32,42,50}
2527
flake8
2628
apicheck
2729
linkcheck
@@ -36,10 +38,10 @@ deps=
3638

3739
cov: -r{toxinidir}/requirements/test-django.txt
3840

39-
django32: -r{toxinidir}/requirements/test-django32.txt
40-
django41: -r{toxinidir}/requirements/test-django41.txt
41-
django42: -r{toxinidir}/requirements/test-django42.txt
42-
django50: -r{toxinidir}/requirements/test-django50.txt
41+
django32: Django ~= 3.2
42+
django41: Django ~= 4.1
43+
django42: Django ~= 4.2
44+
django50: Django ~= 5.0
4345

4446
linkcheck,apicheck: -r{toxinidir}/requirements/docs.txt
4547
flake8,pydocstyle: -r{toxinidir}/requirements/pkgutils.txt

0 commit comments

Comments
 (0)