diff --git a/setup.py b/setup.py index 9938f0d..e5e6b92 100644 --- a/setup.py +++ b/setup.py @@ -97,7 +97,7 @@ setup( 'Programming Language :: Python', 'Programming Language :: Python :: 2', ], - install_requires=['django>=1.7, <1.9', + install_requires=['django>=1.8,<1.12', 'gadjo', 'django-ckeditor<4.5.3', 'django-haystack<2.8', diff --git a/tests/conftest.py b/tests/conftest.py index d6b91e7..aa578cc 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -20,7 +20,11 @@ import django_webtest @pytest.fixture def app(request): + import django + wtm = django_webtest.WebTestMixin() + if django.VERSION >= (1, 11): + wtm._middleware_setting_name = 'MIDDLEWARE_CLASSES' wtm._patch_settings() request.addfinalizer(wtm._unpatch_settings) return django_webtest.DjangoTestApp() diff --git a/tox.ini b/tox.ini index fb717aa..c1a239c 100644 --- a/tox.ini +++ b/tox.ini @@ -7,7 +7,6 @@ usedevelop = coverage: True setenv = DJANGO_SETTINGS_MODULE=welco.settings - PASSERELLE_SETTINGS_FILE=tests/settings.py fast: FAST=--nomigrations coverage: COVERAGE=--junitxml=test_results.xml --cov-report xml --cov=welco/ deps =