Skip to content

Add Django 4.1, Flask 2.2 #73

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jwhitlock merged 2 commits into from
Aug 18, 2022
Merged

Add Django 4.1, Flask 2.2 #73

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
62c7fd6
Add Django 4.1 to test matrix
jwhitlock Aug 18, 2022
c88d4f4
Add Flask 2.2 to test matrix, fix Flask 2.1
jwhitlock Aug 18, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ def read(*parts):
"Framework :: Django",
"Framework :: Django :: 3.2",
"Framework :: Django :: 4.0",
"Framework :: Django :: 4.1",
"Framework :: Flask",
"Intended Audience :: Developers",
"License :: OSI Approved :: Mozilla Public License 2.0 (MPL 2.0)",
Expand Down
1 change: 1 addition & 0 deletions tests/constraints/django-4.1.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Django>=4.1,<4.2
1 change: 1 addition & 0 deletions tests/constraints/flask-2.2.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Flask>=2.2,<2.3
2 changes: 2 additions & 0 deletions tests/django/settings.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,3 +66,5 @@
},
"loggers": {"request.summary": {"handlers": ["console"], "level": "DEBUG"}},
}

USE_TZ = True # Default False until Django 5.0, when it switches to True
16 changes: 9 additions & 7 deletions tox.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ envlist =
py38-lint
py38-docs
py{37,38,39,310}-dj32
py{38,39,310}-dj{40}
py{37,38,39,310}-fl{012,10,11,20,21}
py{38,39,310}-dj{40,41}
py{37,38,39,310}-fl{012,10,11,20,21,22}
py{37,38,39}-s20
py{37,38,39,310}-s{21,22}

Expand All @@ -25,24 +25,26 @@ setenv =
PYTHONPATH = {toxinidir}
deps =
-rtests/requirements/default.txt
dj{32,40}: -rtests/requirements/django.txt
fl{012,10,11,20,21}: -rtests/requirements/flask.txt
dj{32,40,41}: -rtests/requirements/django.txt
fl{012,10,11,20,21,22}: -rtests/requirements/flask.txt
s20: -rtests/requirements/sanic-20.txt
s{21,22}: -rtests/requirements/sanic.txt
dj32: -ctests/constraints/django-3.2.txt
dj40: -ctests/constraints/django-4.0.txt
dj41: -ctests/constraints/django-4.1.txt
fl012: -ctests/constraints/flask-0.12.txt
fl10: -ctests/constraints/flask-1.0.txt
fl11: -ctests/constraints/flask-1.1.txt
fl20: -ctests/constraints/flask-2.0.txt
fl21: -ctests/constraints/flask-2.0.txt
fl21: -ctests/constraints/flask-2.1.txt
fl22: -ctests/constraints/flask-2.2.txt
s20: -ctests/constraints/sanic-20.txt
s21: -ctests/constraints/sanic-21.txt
s22: -ctests/constraints/sanic-22.txt
commands =
python --version
dj{32,40}: pytest tests/core/ tests/django --nomigrations {posargs:}
fl{012,10,11,20,21}: pytest tests/core/ tests/flask/ {posargs:}
dj{32,40,41}: pytest tests/core/ tests/django --nomigrations {posargs:}
fl{012,10,11,20,21,22}: pytest tests/core/ tests/flask/ {posargs:}
s{20,21,22}: pytest tests/core/ tests/sanic/ {posargs:}

[testenv:py38-docs]
Expand Down