add support for django 1.11 in dependencies versions (#21489)

This commit is contained in:
Elias Showk 2018-05-25 14:27:36 +02:00
parent d644728787
commit 75e6f1d671
4 changed files with 10 additions and 11 deletions

View File

@ -19,8 +19,8 @@ Depends: ${misc:Depends}, ${python:Depends},
python-dnspython (>= 1.10),
python-django-select2 (>= 5),
python-gadjo (>= 0.53),
python-django-tables2 (>= 1),
python-django-tables2 (<< 1.1),
python-django-tables2 (>= 1.2),
python-django-tables2 (<< 1.3),
python-django-import-export (>= 0.2.7),
python-djangorestframework (>= 3.3),
python-markdown (>= 2.1),

View File

@ -19,8 +19,8 @@ Depends: ${misc:Depends}, ${python:Depends},
python-dnspython (>= 1.10),
python-django-select2 (>= 5),
python-gadjo (>= 0.53),
python-django-tables2 (>= 1),
python-django-tables2 (<< 1.1),
python-django-tables2 (>= 1.2),
python-django-tables2 (<< 1.3),
python-django-import-export (>= 0.2.7),
python-djangorestframework (>= 3.3),
python-markdown (>= 2.1),

View File

@ -109,13 +109,12 @@ setup(name="authentic2",
},
include_package_data=True,
install_requires=[
'django>=1.8,<1.9',
'django>=1.8,<1.12',
'requests>=2.3',
'django-model-utils>=2.4',
'django-admin-tools>=0.6,<0.7',
'dnspython>=1.10',
'Django-Select2>5,<6',
'django-tables2>=1.0,<1.1',
'django-tables2>=1.2,<1.3',
'gadjo>=0.53',
'django-import-export>=0.2.7',
'djangorestframework>=3.3,<3.4',

View File

@ -5,7 +5,7 @@
[tox]
toxworkdir = {env:TMPDIR:/tmp}/tox-{env:USER}/authentic/
envlist = coverage-dj18-{authentic,rbac}-{pg,sqlite}
envlist = coverage-{dj18, dj111}-{authentic,rbac}-{pg,sqlite}
[testenv]
# django.contrib.auth is not tested it does not work with our templates
@ -22,10 +22,10 @@ setenv =
usedevelop =
coverage: True
nocoverage: False
deps =
deps =
pip > 9
dj18: django>1.8,<1.9
dj19: django>1.8,<1.9
dj18: django>1.7,<1.9
dj111: django>1.10,<1.12
pg: psycopg2
coverage
pytest-cov