From f951995c5e3d68bfb128126666b4f95a415c4e60 Mon Sep 17 00:00:00 2001 From: Agate Berriot Date: Wed, 3 Aug 2022 13:10:49 +0200 Subject: [PATCH 7/7] Test drf 3.9 under django 2 and drf 3.12 under cjango 3 --- Jenkinsfile | 10 +++++----- tox.ini | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 9eeb782..240d1d5 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -14,15 +14,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/tox.ini b/tox.ini index a439bd0..eb02abf 100644 --- a/tox.ini +++ b/tox.ini @@ -35,9 +35,9 @@ 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 -- 2.36.1