run tests against django 2.2 (#49283)
gitea-wip/hobo/pipeline/head There was a failure building this commit Details
gitea/hobo/pipeline/head Something is wrong with the build of this commit Details

This commit is contained in:
Emmanuel Cazenave 2021-01-12 14:52:39 +01:00
parent 41d847ab04
commit 1977c3ed95
3 changed files with 19 additions and 15 deletions

10
Jenkinsfile vendored
View File

@ -14,15 +14,15 @@ pipeline {
utils = new Utils()
utils.publish_coverage('coverage-*.xml')
utils.publish_coverage_native(
'index.html', 'htmlcov-py3-coverage-authentic', 'Coverage authentic tests')
'index.html', 'htmlcov-py3-django22-coverage-authentic', 'Coverage authentic tests')
utils.publish_coverage_native(
'index.html', 'htmlcov-py3-coverage-hobo', 'Coverage hobo tests')
'index.html', 'htmlcov-py3-django22-coverage-hobo', 'Coverage hobo tests')
utils.publish_coverage_native(
'index.html', 'htmlcov-py3-coverage-multipublik', 'Coverage multipublik tests')
'index.html', 'htmlcov-py3-django22-coverage-multipublik', 'Coverage multipublik tests')
utils.publish_coverage_native(
'index.html', 'htmlcov-py3-coverage-multitenant', 'Coverage multitenant tests')
'index.html', 'htmlcov-py3-django22-coverage-multitenant', 'Coverage multitenant tests')
utils.publish_coverage_native(
'index.html', 'htmlcov-py3-coverage-passerelle', 'Coverage passerelle tests')
'index.html', 'htmlcov-py3-django22-coverage-passerelle', 'Coverage passerelle tests')
utils.publish_pylint('pylint.out')
}
mergeJunitResults()

View File

@ -144,13 +144,13 @@ setup(
'Programming Language :: Python',
'Programming Language :: Python :: 2',
],
install_requires=['django>=1.11, <1.12',
install_requires=['django>=1.11, <2.3',
'gadjo',
'celery<4' if sys.version_info < (3,7) else 'celery>=4',
'django-mellon',
'django-tenant-schemas',
'prometheus_client',
'djangorestframework>=3.1, <3.10',
'djangorestframework>=3.4, <3.10',
'dnspython',
'lxml',
],

20
tox.ini
View File

@ -4,7 +4,7 @@
# and then run "tox" from this directory.
[tox]
toxworkdir = {env:TMPDIR:/tmp}/tox-{env:USER}/hobo/{env:BRANCH_NAME:}
envlist = {py2,py3-coverage}-{hobo,multipublik,multitenant,multitenant-oldstylemiddleware,schemas},py3-coverage-{authentic,passerelle}
envlist = py2-django111-{hobo,multipublik,multitenant,multitenant-oldstylemiddleware,schemas},py3-django111-{hobo,multipublik,multitenant,multitenant-oldstylemiddleware,schemas,authentic,passerelle},py3-django22-coverage-{hobo,multipublik,multitenant,multitenant-oldstylemiddleware,schemas,authentic,passerelle}
[testenv]
usedevelop = True
@ -12,6 +12,7 @@ setenv =
BRANCH_NAME={env:BRANCH_NAME:}
DB_ENGINE=django.db.backends.postgresql_psycopg2
SETUPTOOLS_USE_DISTUTILS=stdlib
JUNIT=--junitxml=junit-{envname}.xml
hobo: DJANGO_SETTINGS_MODULE=hobo.settings
hobo: HOBO_SETTINGS_FILE=tests/settings.py
schemas: DJANGO_SETTINGS_MODULE=hobo.settings
@ -26,10 +27,13 @@ setenv =
passerelle: DEBIAN_CONFIG_COMMON=debian/debian_config_common.py
passerelle: PASSERELLE_SETTINGS_FILE=tests_passerelle/settings.py
passerelle: DJANGO_SETTINGS_MODULE=passerelle.settings
coverage: COVERAGE=--junitxml=junit-{envname}.xml --cov-report xml:coverage-{envname}.xml --cov-report html:htmlcov-{envname} --cov=hobo/ --cov-config .coveragerc
coverage: COVERAGE=--cov-report xml:coverage-{envname}.xml --cov-report html:htmlcov-{envname} --cov=hobo/ --cov-config .coveragerc
fast: NOMIGRATIONS=--nomigrations
oldstylemiddleware: OLD_STYLE_MIDDLEWARE=true
deps:
django111: django>=1.11,<1.12
django22: django>=2.2,<2.3
django111: djangorestframework<3.12.0
pytest!=6.0.0
pytest-cov
pytest-django
@ -61,9 +65,9 @@ deps:
commands =
py2: ./getlasso.sh
py3: ./getlasso3.sh
hobo: py.test {env:COVERAGE:} {env:NOMIGRATIONS:} {posargs:tests/}
schemas: py.test {env:COVERAGE:} {env:NOMIGRATIONS:} {posargs:tests_schemas/}
multitenant: py.test {env:COVERAGE:} {env:NOMIGRATIONS:} {posargs:tests_multitenant/}
multipublik: py.test {env:COVERAGE:} {env:NOMIGRATIONS:} {posargs:tests_multipublik/}
authentic: py.test {env:FAST:} {env:COVERAGE:} {env:NOMIGRATIONS:} {posargs:tests_authentic/}
passerelle: py.test {env:COVERAGE:} {env:NOMIGRATIONS:} {posargs:tests_passerelle/}
hobo: py.test {env:JUNIT:} {env:COVERAGE:} {env:NOMIGRATIONS:} {posargs:tests/}
schemas: py.test {env:JUNIT:} {env:COVERAGE:} {env:NOMIGRATIONS:} {posargs:tests_schemas/}
multitenant: py.test {env:JUNIT:} {env:COVERAGE:} {env:NOMIGRATIONS:} {posargs:tests_multitenant/}
multipublik: py.test {env:JUNIT:} {env:COVERAGE:} {env:NOMIGRATIONS:} {posargs:tests_multipublik/}
authentic: py.test {env:JUNIT:} {env:FAST:} {env:COVERAGE:} {env:NOMIGRATIONS:} {posargs:tests_authentic/}
passerelle: py.test {env:JUNIT:} {env:COVERAGE:} {env:NOMIGRATIONS:} {posargs:tests_passerelle/}