From e6d2c7246aadb3e1a4f4d859e81bce0b815baebe Mon Sep 17 00:00:00 2001 From: Agate Berriot Date: Thu, 4 Aug 2022 14:25:56 +0200 Subject: [PATCH 1/2] Enabled django 3.2 testing in tox file (#67945) --- setup.py | 4 ++-- tox.ini | 21 +++++++++++++++------ 2 files changed, 17 insertions(+), 8 deletions(-) diff --git a/setup.py b/setup.py index 860413b..7718323 100644 --- a/setup.py +++ b/setup.py @@ -160,11 +160,11 @@ setup( 'Programming Language :: Python :: 3', ], install_requires=[ - 'django>=2.2, <2.3', + 'django>=2.2, <3.2', 'gadjo>=0.53', 'requests', 'eopayment>=1.60', - 'djangorestframework>=3.3, <3.10', + 'djangorestframework>=3.3, <3.13', ], zip_safe=False, cmdclass={ diff --git a/tox.ini b/tox.ini index 86257f5..50b6514 100644 --- a/tox.ini +++ b/tox.ini @@ -1,6 +1,9 @@ [tox] toxworkdir = {env:TMPDIR:/tmp}/tox-{env:USER}/lingo/{env:BRANCH_NAME:} -envlist = coverage-py3-django22-codestyle, pylint +envlist = + py3-django32, + coverage-py3-django22-codestyle, + pylint [testenv] usedevelop = True @@ -14,6 +17,7 @@ setenv = passenv = BRANCH_NAME deps = + django32: django>=3.2,<3.3 django22: django>=2.2,<2.3 pytest-cov pytest-django @@ -24,9 +28,11 @@ deps = httmock pylint pylint-django - django-webtest<1.9.3 + django32: django-webtest + django22: django-webtest<1.9.3 pyquery - psycopg2-binary<2.9 + django32: psycopg2-binary + django22: psycopg2-binary<2.9 django-mellon>=1.13 git+https://git.entrouvert.org/publik-django-templatetags.git pre-commit @@ -49,13 +55,16 @@ deps = WebTest mock<4 httmock - django>=2.2,<2.3 + django32: django>=3.2,<3.3 + django22: django>=2.2,<2.3 django-mellon>=1.13 pylint pylint-django - django-webtest<1.9.3 + django32: django-webtest + django22: django-webtest<1.9.3 pyquery - psycopg2-binary<2.9 + django32: psycopg2-binary + django22: psycopg2-binary<2.9 git+https://git.entrouvert.org/publik-django-templatetags.git commands = ./getlasso3.sh -- 2.36.1