From b2d2e06105e7f2574b86430707551a35f6a48f24 Mon Sep 17 00:00:00 2001 From: Thomas NOEL Date: Wed, 25 Oct 2017 23:42:26 +0200 Subject: [PATCH] update dependances, accepting django 1.11 (#19890) --- requirements.txt | 2 +- setup.py | 2 +- tox.ini | 3 ++- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/requirements.txt b/requirements.txt index 5637f87..7700e19 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,4 +1,4 @@ -django >= 1.8, <1.9 +django >= 1.8, <1.12 django-jsonresponse >= 0.10, < 0.11 django-model-utils django-jsonfield >= 0.9.3 diff --git a/setup.py b/setup.py index 81e735f..cecda2d 100755 --- a/setup.py +++ b/setup.py @@ -85,7 +85,7 @@ setup(name='passerelle', scripts=['manage.py'], include_package_data=True, install_requires=[ - 'django >= 1.8, <1.9', + 'django >= 1.8, <1.12', 'django-model-utils', 'django-jsonfield', 'requests', diff --git a/tox.ini b/tox.ini index b416d7c..355541b 100644 --- a/tox.ini +++ b/tox.ini @@ -1,5 +1,5 @@ [tox] -envlist = coverage-django18-pylint +envlist = coverage-{django18,django111}-pylint toxworkdir = {env:TMPDIR:/tmp}/tox-{env:USER}/passerelle/ [testenv] @@ -12,6 +12,7 @@ setenv = coverage: COVERAGE=--junitxml=test_results.xml --cov-report xml --cov=passerelle/ --cov-config .coveragerc deps = django18: django>=1.8,<1.9 + django111: django>=1.11,<1.12 pytest-cov pytest-django pytest -- 2.14.2