Skip to content

Commit 7297801

Browse files
authored
Pin test dependencies to fix CI, drop EOL and add Django 6.0 (#122)
* Pin httpx<1 * Pin sanic-testing for httpx<1 * Drop EOL from tox matrix * Update release CI used Python version * Bump CI versions * Ignore ruff unused-unpacked-variable rule * Remove django-3.2 tests * Drop EOL * Remove django-5.1 testing * Add Django 6.0 to test matrix * Update metadata
1 parent 3221444 commit 7297801

File tree

10 files changed

+30
-32
lines changed

10 files changed

+30
-32
lines changed

.github/workflows/release.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,14 @@ jobs:
1212
runs-on: ubuntu-latest
1313

1414
steps:
15-
- uses: actions/checkout@v4
15+
- uses: actions/checkout@v5
1616
with:
1717
fetch-depth: 0
1818

1919
- name: Set up Python
20-
uses: actions/setup-python@v5
20+
uses: actions/setup-python@v6
2121
with:
22-
python-version: 3.8
22+
python-version: "3.9"
2323

2424
- name: Install pypa/build
2525
run: python3 -m pip install build

.github/workflows/test.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,10 @@ jobs:
1414
outputs:
1515
envlist: ${{ steps.generate-tox-envlist.outputs.envlist }}
1616
steps:
17-
- uses: actions/checkout@v4
18-
- uses: actions/setup-python@v5
17+
- uses: actions/checkout@v5
18+
- uses: actions/setup-python@v6
1919
with:
20-
python-version: 3.12
20+
python-version: "3.13"
2121
cache: pip
2222
- run: pip install tox tox-gh-matrix
2323
- id: generate-tox-envlist
@@ -47,9 +47,9 @@ jobs:
4747
# Maps port 6379 on service container to the host
4848
- 6379:6379
4949
steps:
50-
- uses: actions/checkout@v4
50+
- uses: actions/checkout@v5
5151
- name: Setup Python ${{ matrix.tox.python.version }}
52-
uses: actions/setup-python@v5
52+
uses: actions/setup-python@v6
5353
with:
5454
python-version: ${{ matrix.tox.python.spec }}
5555
cache: pip

pyproject.toml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,8 @@ ignore = [
2828
"PT011",
2929
# FIXME: parenthesize-chained-operators
3030
"RUF021",
31+
# FIXME: unused-unpacked-variable
32+
"RUF059",
3133
]
3234

3335
[tool.ruff.lint.isort]

setup.py

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,18 +27,16 @@ def read(*parts):
2727
"Development Status :: 5 - Production/Stable",
2828
"Environment :: Web Environment :: Mozilla",
2929
"Framework :: Django",
30-
"Framework :: Django :: 3.2",
3130
"Framework :: Django :: 4.2",
32-
"Framework :: Django :: 5.1",
3331
"Framework :: Django :: 5.2",
32+
"Framework :: Django :: 6.0",
3433
"Framework :: Flask",
3534
"Framework :: FastAPI",
3635
"Intended Audience :: Developers",
3736
"License :: OSI Approved :: Mozilla Public License 2.0 (MPL 2.0)",
3837
"Programming Language :: Python",
3938
"Programming Language :: Python :: 3",
4039
"Programming Language :: Python :: 3 :: Only",
41-
"Programming Language :: Python :: 3.8",
4240
"Programming Language :: Python :: 3.9",
4341
"Programming Language :: Python :: 3.10",
4442
"Programming Language :: Python :: 3.11",
@@ -53,5 +51,5 @@ def read(*parts):
5351
"fastapi": ["fastapi", "asgiref"],
5452
},
5553
zip_safe=False,
56-
python_requires=">=3.8,<4",
54+
python_requires=">=3.9,<4",
5755
)

tests/constraints/django-3.2.txt

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

tests/constraints/django-5.1.txt

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

tests/constraints/django-6.0.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Django>=6.0rc1,<6.1

tests/requirements/fastapi.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
fastapi
22
asgiref
3-
httpx
3+
httpx<1

tests/requirements/sanic.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,6 @@
33
aiohttp
44
Sanic
55
sanic_redis
6-
sanic-testing
6+
sanic-testing<23.6
77
uvloop>=0.14.0rc1
8-
setuptools
8+
setuptools

tox.ini

Lines changed: 14 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,16 @@
22
usedevelop = True
33
minversion = 1.8
44
envlist =
5-
py38-lint
5+
py39-lint
66
py311-docs
7-
py{38,39,310}-dj32
8-
py{38,39,310,311,312}-dj42
9-
py{310,311,312,313}-dj{51,52}
10-
py{38,39,310,311,312,313}-fa100
11-
py{38,39,310,311}-fl{20,21,22}
12-
py{38,39,310,311,312}-fl{23,30}
13-
py{38,39,310,311}-s{21,22}
14-
py{38,39,310,311,312,313}-s23
7+
py{39,310,311,312}-dj42
8+
py{310,311,312,313}-dj52
9+
py{312,313}-dj60
10+
py{39,310,311,312,313}-fa100
11+
py{39,310,311}-fl{20,21,22}
12+
py{39,310,311,312}-fl{23,30}
13+
py{39,310,311}-s{21,22}
14+
py{39,310,311,312,313}-s23
1515

1616
[testenv]
1717
usedevelop = true
@@ -21,14 +21,13 @@ setenv =
2121
PYTHONPATH = {toxinidir}
2222
deps =
2323
-rtests/requirements/default.txt
24-
dj{32,42,51,52}: -rtests/requirements/django.txt
24+
dj{42,52,60}: -rtests/requirements/django.txt
2525
fa100: -rtests/requirements/fastapi.txt
2626
fl{20,21,22,23,30}: -rtests/requirements/flask.txt
2727
s{21,22,23}: -rtests/requirements/sanic.txt
28-
dj32: -ctests/constraints/django-3.2.txt
2928
dj42: -ctests/constraints/django-4.2.txt
30-
dj51: -ctests/constraints/django-5.1.txt
3129
dj52: -ctests/constraints/django-5.2.txt
30+
dj60: -ctests/constraints/django-6.0.txt
3231
fa100: -ctests/constraints/fastapi-0.100.txt
3332
fl20: -ctests/constraints/flask-2.0.txt
3433
fl21: -ctests/constraints/flask-2.1.txt
@@ -40,7 +39,7 @@ deps =
4039
s23: -ctests/constraints/sanic-23.txt
4140
commands =
4241
python --version
43-
dj{32,42,51,52}: pytest --no-migrations -o DJANGO_SETTINGS_MODULE=tests.django.settings -o django_find_project=false {posargs:tests/core/ tests/django}
42+
dj{42,52,60}: pytest --no-migrations -o DJANGO_SETTINGS_MODULE=tests.django.settings -o django_find_project=false {posargs:tests/core/ tests/django}
4443
fa{100}: pytest {posargs: tests/core/ tests/fastapi/}
4544
fl{20,21,22,23,30}: pytest {posargs:tests/core/ tests/flask/}
4645
s{21,22,23}: pytest {posargs:tests/core/ tests/sanic/}
@@ -51,8 +50,8 @@ deps = -rdocs/requirements.txt
5150
commands = sphinx-build -b html -d {envtmpdir}/doctrees docs {envtmpdir}/html
5251
pip_pre = false
5352

54-
[testenv:py38-lint]
55-
basepython = python3.8
53+
[testenv:py39-lint]
54+
basepython = python3.9
5655
deps = -rtests/requirements/lint.txt
5756
commands =
5857
ruff check src/ tests/

0 commit comments

Comments
 (0)