entrouvert
/
authentic
16
0
Fork 0
Code Issues Pull Requests 35 Releases Activity

django 1.11: adapt tox.ini and setup.py (#21489)

This commit is contained in:
Emmanuel Cazenave 2018-07-17 17:21:09 +02:00 committed by Frédéric Péters
parent 06c13938ac
commit c6e2632fbc
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
setup.py
View File

@ -109,7 +109,7 @@ setup(name="authentic2",
}, },
include_package_data=True, include_package_data=True,
install_requires=[ install_requires=[
'django>=1.8,<1.9', 'django>=1.8,<2.0',
'requests>=2.3', 'requests>=2.3',
'django-model-utils>=2.4', 'django-model-utils>=2.4',
'dnspython>=1.10', 'dnspython>=1.10',

3
tox.ini
View File

@ -5,7 +5,7 @@
[tox] [tox]
toxworkdir = {env:TMPDIR:/tmp}/tox-{env:USER}/authentic/{env:BRANCH_NAME:} toxworkdir = {env:TMPDIR:/tmp}/tox-{env:USER}/authentic/{env:BRANCH_NAME:}
envlist = coverage-dj18-{authentic,rbac}-{pg,sqlite} envlist = coverage-{dj18,dj111}-{authentic,rbac}-{pg,sqlite}
[testenv] [testenv]
# django.contrib.auth is not tested it does not work with our templates # django.contrib.auth is not tested it does not work with our templates
@ -27,6 +27,7 @@ usedevelop =
deps = deps =
pip > 9 pip > 9
dj18: django>1.8,<1.9 dj18: django>1.8,<1.9
dj111: django<2.0
pg: psycopg2 pg: psycopg2
coverage coverage
pytest-cov pytest-cov