From 02f6e7b0487a14c773c369e318ff34539c5f4c8f Mon Sep 17 00:00:00 2001 From: Agate Berriot Date: Thu, 4 Aug 2022 15:24:26 +0200 Subject: [PATCH 1/4] dj32: enable django 3.2 testing in tox file (#67950) --- setup.py | 2 +- tox.ini | 22 ++++++++++++++-------- 2 files changed, 15 insertions(+), 9 deletions(-) diff --git a/setup.py b/setup.py index b8a2522..3720e73 100644 --- a/setup.py +++ b/setup.py @@ -94,7 +94,7 @@ setup( include_package_data=True, install_requires=[ 'requests', - 'django>=2.2, <2.3', + 'django>=2.2, <3.3', 'psycopg2', 'isodate', 'Django-Select2<6', diff --git a/tox.ini b/tox.ini index 2aa7b2b..6fc2be7 100644 --- a/tox.ini +++ b/tox.ini @@ -6,7 +6,8 @@ [tox] toxworkdir = {env:TMPDIR:/tmp}/tox-{env:USER}/bijoe/{env:BRANCH_NAME:} envlist = - py3-dj22 + py3-django22, + py3-django32, code-style [testenv:code-style] @@ -24,24 +25,29 @@ setenv = SETUPTOOLS_USE_DISTUTILS=stdlib coverage: COVERAGE=--junit-xml=test_results.xml --cov=bijoe --cov-report xml --cov-report html --cov-config .coveragerc deps = - dj22: django>=2.2,<2.3 + django22: django>=2.2,<2.3 + django32: django>=3.2,<3.3 coverage pytest pytest-cov pytest-django pytest-freezegun WebTest - django-webtest<1.9.3 + django32: django-webtest + django22: django-webtest<1.9.3 mock pyquery tabulate sentry_sdk<0.12.3 - psycopg2<2.9 - psycopg2-binary<2.9 - dj22: djangorestframework>=3.7 - dj22: https://git.entrouvert.org/hobo.git/snapshot/hobo-main.tar.gz + django32: psycopg2 + django22: psycopg2<2.9 + django32: psycopg2-binary + django22: psycopg2-binary<2.9 + + django22,django32: djangorestframework>=3.7 + django22,django32: https://git.entrouvert.org/hobo.git/snapshot/hobo-main.tar.gz commands = - py3-dj22: py.test {posargs: --junitxml=test_{envname}_results.xml --cov-report xml --cov-report html --cov=bijoe tests/} + py3-django22,py3-django32: py.test {posargs: --junitxml=test_{envname}_results.xml --cov-report xml --cov-report html --cov=bijoe tests/} [pytest] filterwarnings = -- 2.37.2