Skip to content

Commit 1eac5d3

Browse files
authored
Merge pull request #64 from peopledoc/dj4-tox-fix
Fixing Django 4.0 definition in tox.ini
2 parents 7c919cd + dd4db81 commit 1eac5d3

File tree

3 files changed

+8
-2
lines changed

3 files changed

+8
-2
lines changed

.github/workflows/ci.yml

+3
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,9 @@ on:
1111
jobs:
1212
build:
1313

14+
# When testing new Python or Django versions, one should use the
15+
# filterwarnings definition of setup.cfg to turn deprecation warnings
16+
# into errors.
1417
strategy:
1518
matrix:
1619
include:

setup.cfg

+4-1
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,10 @@ testpaths =
6060
django_genericfilters/tests
6161
demoproject/tests.py
6262
filterwarnings =
63-
error
63+
# Uncomment below when testing a new version of Python or Django so that
64+
# DeprecationWarnings can be treated as errors
65+
# error
66+
ignore:.*distutils Version classes are deprecated.*:DeprecationWarning
6467

6568
DJANGO_SETTINGS_MODULE = demoproject.settings
6669

tox.ini

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ deps =
2323
django30: psycopg2<2.9 # https://github.com/django/django/commit/837ffcfa681d0f65f444d881ee3d69aec23770be
2424
django31: Django==3.1.*
2525
django32: Django==3.2.*
26-
django40: Django==3.2.*
26+
django40: Django==4.0.*
2727
commands =
2828
pytest {posargs}
2929
passenv =

0 commit comments

Comments
 (0)