From 70f90e9bf760ed67eb19295c805e34ad2c950d77 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20P=C3=A9ters?= Date: Wed, 26 Apr 2017 18:40:38 +0200 Subject: [PATCH 1/3] misc: add support for django 1.11 (#16057) Signed-off-by: Christophe Siraut --- setup.py | 2 +- tests/settings.py | 1 + tox.ini | 3 ++- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/setup.py b/setup.py index 264ba6f..ae9ef00 100755 --- a/setup.py +++ b/setup.py @@ -99,7 +99,7 @@ setup( install_requires=[ 'django>=1.7', 'gadjo', - 'django-tables2<1.1', + 'django-tables2>=1.5', 'django-jsonfield >= 0.9.3', 'django-filter>1', 'djangorestframework>=3.3,<3.4', diff --git a/tests/settings.py b/tests/settings.py index cdfe539..3ea6644 100644 --- a/tests/settings.py +++ b/tests/settings.py @@ -2,6 +2,7 @@ import os DEBUG = False +ALLOWED_HOSTS = ['*'] LANGUAGE_CODE = 'en-US' DATABASES = { diff --git a/tox.ini b/tox.ini index a52c074..63f28f9 100644 --- a/tox.ini +++ b/tox.ini @@ -1,6 +1,6 @@ [tox] toxworkdir = {env:TMPDIR:/tmp}/tox-{env:USER}/fargo/ -envlist = coverage-dj18-sqlite +envlist = coverage-dj18-sqlite,coverage-dj111-sqlite [testenv] usedevelop = True @@ -14,6 +14,7 @@ setenv = coverage: COVERAGE=--cov=fargo --cov-report xml deps = dj18: django>=1.8,<1.9 + dj111: django>=1.11,<1.12 pytest pytest-cov pytest-random -- 2.11.0