From 0334a896c6b7509b3fe2f0431e85ad48725bf76f Mon Sep 17 00:00:00 2001 From: Agate Date: Thu, 28 Jul 2022 15:15:30 +0200 Subject: [PATCH 1/4] Enabled django 3.2 testing in tox/setup.py file --- setup.py | 4 ++-- tox.ini | 9 +++++++-- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/setup.py b/setup.py index d4527569..da3a5cb2 100755 --- a/setup.py +++ b/setup.py @@ -138,8 +138,8 @@ setup( scripts=['manage.py'], include_package_data=True, install_requires=[ - 'django >= 1.11, <2.3', - 'django-model-utils<4', + 'django >= 1.11, <3.3', + 'django-model-utils<4.3', 'requests', 'gadjo', 'phpserialize', diff --git a/tox.ini b/tox.ini index c83fb852..df59064c 100644 --- a/tox.ini +++ b/tox.ini @@ -15,9 +15,13 @@ setenv = coverage: COVERAGE=--junitxml=junit-{envname}.xml --cov-report xml --cov-report html --cov=passerelle/ --cov-config .coveragerc -Wignore deps = django22: django>=2.2,<2.3 + django32: django>=3.2,<3.3 xmlschema14: xmlschema<1.5 xmlschema10: xmlschema<1.1 - psycopg2-binary<2.9 + django32: psycopg2-binary + django22: psycopg2-binary<2.9 + django32: django-model-utils>=4.2 + django22: django-model-utils<4.2 pytest-cov pytest-django pytest-xdist @@ -26,7 +30,8 @@ deps = mock<4 httmock python-dateutil - django-webtest<1.9.3 + django32: django-webtest + django22: django-webtest<1.9.3 lxml mohawk pytest-freezegun -- 2.36.1