From ea5804bb4785fb709b8ee3add7a16d322173a1f2 Mon Sep 17 00:00:00 2001 From: Serghei Mihai Date: Tue, 24 Oct 2017 09:56:49 +0200 Subject: [PATCH] add support of Django 1.11 (#19614) --- corbo/settings.py | 2 +- requirements.txt | 2 +- setup.py | 2 +- tox.ini | 3 ++- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/corbo/settings.py b/corbo/settings.py index d4d6e76..13f43f0 100644 --- a/corbo/settings.py +++ b/corbo/settings.py @@ -82,7 +82,7 @@ USE_L10N = True USE_TZ = True -STATICFILES_FINDERS = global_settings.STATICFILES_FINDERS + ('gadjo.finders.XStaticFinder',) +STATICFILES_FINDERS = tuple(global_settings.STATICFILES_FINDERS) + ('gadjo.finders.XStaticFinder',) # Static files (CSS, JavaScript, Images) diff --git a/requirements.txt b/requirements.txt index f134314..ad6f7f2 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,4 +1,4 @@ -Django>1.7, <1.9 +Django>1.7, <1.12 django-ckeditor<4.5.3 djangorestframework>=3.3,<3.4 html2text diff --git a/setup.py b/setup.py index f03e1e6..fba55d2 100644 --- a/setup.py +++ b/setup.py @@ -93,7 +93,7 @@ setup( 'Programming Language :: Python', 'Programming Language :: Python :: 2', ], - install_requires=['django>1.7, <1.9', + install_requires=['django>1.7, <1.12', 'django-ckeditor<4.5.3', 'djangorestframework>=3.3,<3.4', 'html2text', diff --git a/tox.ini b/tox.ini index 8ef71bf..27e858d 100644 --- a/tox.ini +++ b/tox.ini @@ -1,5 +1,5 @@ [tox] -envlist = coverage-django18 +envlist = coverage-django18,coverage-django111 [testenv] usedevelop = @@ -10,6 +10,7 @@ setenv = coverage: COVERAGE=--junitxml=test_results.xml --cov-report xml --cov=corbo/ --cov-config .coveragerc deps = django18: django>=1.8,<1.9 + django111: django>=1.11,<1.12 http://git.entrouvert.org/hobo.git/snapshot/hobo-master.tar.gz pytest-cov pytest-django>=3.1.1 -- 2.15.0.rc2