From 7c2e8a75fd403396647d1897eca6bd43ebbc4056 Mon Sep 17 00:00:00 2001 From: Agate Berriot Date: Thu, 28 Jul 2022 09:38:38 +0200 Subject: [PATCH 1/5] Enabled django 3.2 testing in tox file --- Jenkinsfile | 10 +++++----- setup.py | 2 +- tox.ini | 19 ++++++++++++------- 3 files changed, 18 insertions(+), 13 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index d4e266c..e1ccbe9 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -17,15 +17,15 @@ pipeline { utils = new Utils() utils.publish_coverage('coverage-*.xml') utils.publish_coverage_native( - 'index.html', 'htmlcov-py3-django22-drf312-coverage-authentic', 'Coverage authentic tests') + 'index.html', 'htmlcov-py3-django22-coverage-authentic', 'Coverage authentic tests') utils.publish_coverage_native( - 'index.html', 'htmlcov-py3-django22-drf312-coverage-hobo', 'Coverage hobo tests') + 'index.html', 'htmlcov-py3-django22-coverage-hobo', 'Coverage hobo tests') utils.publish_coverage_native( - 'index.html', 'htmlcov-py3-django22-drf312-coverage-multipublik', 'Coverage multipublik tests') + 'index.html', 'htmlcov-py3-django22-coverage-multipublik', 'Coverage multipublik tests') utils.publish_coverage_native( - 'index.html', 'htmlcov-py3-django22-drf312-coverage-multitenant', 'Coverage multitenant tests') + 'index.html', 'htmlcov-py3-django22-coverage-multitenant', 'Coverage multitenant tests') utils.publish_coverage_native( - 'index.html', 'htmlcov-py3-django22-drf312-coverage-passerelle', 'Coverage passerelle tests') + 'index.html', 'htmlcov-py3-django22-coverage-passerelle', 'Coverage passerelle tests') utils.publish_pylint('pylint.out') } mergeJunitResults() diff --git a/setup.py b/setup.py index f621bef..a176301 100644 --- a/setup.py +++ b/setup.py @@ -148,7 +148,7 @@ setup( 'Programming Language :: Python', ], install_requires=[ - 'django>=2.2, <2.3', + 'django>=2.2, <3.3', 'gadjo', 'celery<4' if sys.version_info < (3, 7) else 'celery>=4', 'django-mellon', diff --git a/tox.ini b/tox.ini index 468ed5f..1bee635 100644 --- a/tox.ini +++ b/tox.ini @@ -5,8 +5,8 @@ [tox] toxworkdir = {env:TMPDIR:/tmp}/tox-{env:USER}/hobo/{env:BRANCH_NAME:} envlist = - py3-django22-drf39-{hobo,authentic,multipublik,multitenant,schemas,passerelle} - py3-django22-drf312-coverage-{hobo,authentic,multipublik,multitenant,schemas,passerelle} + py3-django22-coverage-{hobo,authentic,multipublik,multitenant,schemas,passerelle} + py3-django32-{hobo,authentic,multipublik,multitenant,schemas,passerelle} py3-black [testenv] @@ -35,9 +35,10 @@ setenv = coverage: COVERAGE=--cov-report xml:coverage-{envname}.xml --cov-report html:htmlcov-{envname} --cov=hobo/ --cov-config .coveragerc fast: NOMIGRATIONS=--nomigrations deps: - drf39: djangorestframework>=3.9.2,<3.10 - drf312: djangorestframework>=3.12,<3.13 + django22: djangorestframework>=3.9.2,<3.10 django22: django>=2.2,<2.3 + django32: djangorestframework>=3.12,<3.13 + django32: django>=3.2,<3.3 pytest!=6.0.0 pytest-cov pytest-django @@ -48,7 +49,8 @@ deps: django-mellon django-webtest Markdown<3 - django-tables2<2.0 + django22: django-tables2<2.0 + django32: django-tables2>=2.4<2.5 authentic: https://git.entrouvert.org/authentic.git/snapshot/authentic-main.tar.gz passerelle: https://git.entrouvert.org/passerelle.git/snapshot/passerelle-main.tar.gz passerelle: python-memcached @@ -61,8 +63,11 @@ deps: pytest-freezegun xmlschema<1.1 enum34<=1.1.6 - psycopg2<2.9 - psycopg2-binary<2.9 + django32: psycopg2 + django32: psycopg2-binary + django22: psycopg2<2.9 + django22: psycopg2-binary<2.9 + black: pre-commit commands = ./getlasso3.sh -- 2.37.2