From 235f95b967e42137010990c777eaa9a19560104f Mon Sep 17 00:00:00 2001 From: Fabre Florian Date: Thu, 14 Sep 2017 10:09:59 +0200 Subject: [PATCH 1/5] Fix django 1.10 deprecation of django.conf.urls.patterns. Add django 1.11 to tox targets. Downgrade django-nose because versions >= 1.4.3 no longer supports django 1.5. --- demo/demoproject/apache/urls.py | 9 +++++--- demo/demoproject/http/urls.py | 4 ++-- demo/demoproject/lighttpd/urls.py | 9 +++++--- demo/demoproject/nginx/urls.py | 10 ++++++--- demo/demoproject/object/urls.py | 4 ++-- demo/demoproject/path/urls.py | 4 ++-- demo/demoproject/settings.py | 34 ++++++++++++++++++++++++++++++- demo/demoproject/storage/urls.py | 3 ++- demo/demoproject/urlpatterns.py | 5 +++++ demo/demoproject/urls.py | 4 +++- demo/demoproject/virtual/urls.py | 3 ++- tox.ini | 11 +++++++++- 12 files changed, 80 insertions(+), 20 deletions(-) create mode 100644 demo/demoproject/urlpatterns.py diff --git a/demo/demoproject/apache/urls.py b/demo/demoproject/apache/urls.py index c89140e..aec9cdf 100644 --- a/demo/demoproject/apache/urls.py +++ b/demo/demoproject/apache/urls.py @@ -1,13 +1,16 @@ """URL mapping.""" -from django.conf.urls import patterns, url +from django.conf.urls import url + +from demoproject.apache import views +from demoproject.urlpatterns import patterns urlpatterns = patterns( 'demoproject.apache.views', url(r'^optimized-by-middleware/$', - 'optimized_by_middleware', + views.optimized_by_middleware, name='optimized_by_middleware'), url(r'^optimized-by-decorator/$', - 'optimized_by_decorator', + views.optimized_by_decorator, name='optimized_by_decorator'), ) diff --git a/demo/demoproject/http/urls.py b/demo/demoproject/http/urls.py index ebb70c6..f8e0c92 100644 --- a/demo/demoproject/http/urls.py +++ b/demo/demoproject/http/urls.py @@ -1,7 +1,7 @@ -from django.conf.urls import patterns, url +from django.conf.urls import url from demoproject.http import views - +from demoproject.urlpatterns import patterns urlpatterns = patterns( '', diff --git a/demo/demoproject/lighttpd/urls.py b/demo/demoproject/lighttpd/urls.py index 9cb6b97..a325a37 100644 --- a/demo/demoproject/lighttpd/urls.py +++ b/demo/demoproject/lighttpd/urls.py @@ -1,13 +1,16 @@ """URL mapping.""" -from django.conf.urls import patterns, url +from django.conf.urls import url + +from demoproject.lighttpd import views +from demoproject.urlpatterns import patterns urlpatterns = patterns( 'demoproject.lighttpd.views', url(r'^optimized-by-middleware/$', - 'optimized_by_middleware', + views.optimized_by_middleware, name='optimized_by_middleware'), url(r'^optimized-by-decorator/$', - 'optimized_by_decorator', + views.optimized_by_decorator, name='optimized_by_decorator'), ) diff --git a/demo/demoproject/nginx/urls.py b/demo/demoproject/nginx/urls.py index b7817a5..1f13ecb 100644 --- a/demo/demoproject/nginx/urls.py +++ b/demo/demoproject/nginx/urls.py @@ -1,13 +1,17 @@ """URL mapping.""" -from django.conf.urls import patterns, url + +from django.conf.urls import url + +from demoproject.nginx import views +from demoproject.urlpatterns import patterns urlpatterns = patterns( 'demoproject.nginx.views', url(r'^optimized-by-middleware/$', - 'optimized_by_middleware', + views.optimized_by_middleware, name='optimized_by_middleware'), url(r'^optimized-by-decorator/$', - 'optimized_by_decorator', + views.optimized_by_decorator, name='optimized_by_decorator'), ) diff --git a/demo/demoproject/object/urls.py b/demo/demoproject/object/urls.py index a231fa1..03e7fd4 100644 --- a/demo/demoproject/object/urls.py +++ b/demo/demoproject/object/urls.py @@ -1,7 +1,7 @@ -from django.conf.urls import patterns, url +from django.conf.urls import url from demoproject.object import views - +from demoproject.urlpatterns import patterns urlpatterns = patterns( '', diff --git a/demo/demoproject/path/urls.py b/demo/demoproject/path/urls.py index 18f2847..17dad33 100644 --- a/demo/demoproject/path/urls.py +++ b/demo/demoproject/path/urls.py @@ -1,7 +1,7 @@ -from django.conf.urls import patterns, url +from django.conf.urls import url from demoproject.path import views - +from demoproject.urlpatterns import patterns urlpatterns = patterns( '', diff --git a/demo/demoproject/settings.py b/demo/demoproject/settings.py index 2d0b8e8..5fa2e23 100755 --- a/demo/demoproject/settings.py +++ b/demo/demoproject/settings.py @@ -1,7 +1,11 @@ # -*- coding: utf-8 -*- """Django settings for django-downloadview demo project.""" + +from distutils.version import StrictVersion import os +from django.utils.version import get_version + # Configure some relative directories. demoproject_dir = os.path.dirname(os.path.abspath(__file__)) @@ -112,7 +116,6 @@ DOWNLOADVIEW_RULES += [ # Test/development settings. DEBUG = True -TEMPLATE_DEBUG = DEBUG TEST_RUNNER = 'django_nose.NoseTestSuiteRunner' NOSE_ARGS = [ '--verbosity=2', @@ -122,3 +125,32 @@ NOSE_ARGS = [ '--with-coverage', '--with-doctest', ] + +if StrictVersion(get_version()) >= StrictVersion('1.8'): + TEMPLATES = [ + { + 'BACKEND': 'django.template.backends.django.DjangoTemplates', + 'DIRS': [ + os.path.join(os.path.dirname(__file__), "templates"), + ], + 'OPTIONS': { + 'debug': DEBUG, + 'context_processors': [ + # Insert your TEMPLATE_CONTEXT_PROCESSORS here or use this + # list if you haven't customized them: + 'django.contrib.auth.context_processors.auth', + 'django.template.context_processors.debug', + 'django.template.context_processors.i18n', + 'django.template.context_processors.media', + 'django.template.context_processors.static', + 'django.template.context_processors.tz', + 'django.contrib.messages.context_processors.messages', + ], + }, + }, + ] +else: + TEMPLATE_DEBUG = DEBUG + TEMPLATE_DIRS = ( + os.path.join(os.path.dirname(__file__), "templates"), + ) diff --git a/demo/demoproject/storage/urls.py b/demo/demoproject/storage/urls.py index b3f912e..53cd38c 100644 --- a/demo/demoproject/storage/urls.py +++ b/demo/demoproject/storage/urls.py @@ -1,6 +1,7 @@ -from django.conf.urls import patterns, url +from django.conf.urls import url from demoproject.storage import views +from demoproject.urlpatterns import patterns urlpatterns = patterns( diff --git a/demo/demoproject/urlpatterns.py b/demo/demoproject/urlpatterns.py new file mode 100644 index 0000000..6e046ad --- /dev/null +++ b/demo/demoproject/urlpatterns.py @@ -0,0 +1,5 @@ +try: + from django.conf.urls import patterns +except: + def patterns(prefix, *args): + return list(args) diff --git a/demo/demoproject/urls.py b/demo/demoproject/urls.py index 78a48c8..dc43654 100755 --- a/demo/demoproject/urls.py +++ b/demo/demoproject/urls.py @@ -1,6 +1,8 @@ -from django.conf.urls import patterns, include, url +from django.conf.urls import include, url from django.views.generic import TemplateView +from demoproject.urlpatterns import patterns + home = TemplateView.as_view(template_name='home.html') diff --git a/demo/demoproject/virtual/urls.py b/demo/demoproject/virtual/urls.py index 6c6a7ce..2595b3f 100644 --- a/demo/demoproject/virtual/urls.py +++ b/demo/demoproject/virtual/urls.py @@ -1,6 +1,7 @@ -from django.conf.urls import patterns, url +from django.conf.urls import url from demoproject.virtual import views +from demoproject.urlpatterns import patterns urlpatterns = patterns( diff --git a/tox.ini b/tox.ini index 85408af..1f9b5d5 100644 --- a/tox.ini +++ b/tox.ini @@ -1,5 +1,5 @@ [tox] -envlist = py{27}-django{15,16,17,18,19}, py{33,34}-django{15,16,17}, py{34,35}-django{18,19}, flake8, sphinx, readme +envlist = py{27}-django{15,16,17,18,19,110,111}, py{33,34}-django{15,16,17}, py{34,35}-django{18,19,110,111}, flake8, sphinx, readme [testenv] basepython = @@ -10,10 +10,19 @@ basepython = deps = coverage django15: Django>=1.5,<1.6 + django15: django-nose<1.4.3 django16: Django>=1.6,<1.7 + django16: django-nose<1.4.3 django17: Django>=1.7,<1.8 + django17: django-nose<1.4.3 django18: Django>=1.8,<1.9 + django18: django-nose>=1.4.2 django19: Django>=1.9,<1.10 + django19: django-nose>=1.4.3 + django110: Django>=1.10,<1.11 + django110: django-nose>=1.4.4 + django111: Django>=1.11,<2.0 + django111: django-nose>=1.4.5 nose py27: mock commands = From 24afd546c6549e0992d85020da37fd9ea251850c Mon Sep 17 00:00:00 2001 From: Fabre Florian Date: Thu, 14 Sep 2017 11:08:27 +0200 Subject: [PATCH 2/5] Fix travis config. --- .travis.yml | 51 +++++++++++++++++++++++++++++++++------------------ 1 file changed, 33 insertions(+), 18 deletions(-) diff --git a/.travis.yml b/.travis.yml index e623329..99e9bb7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,23 +1,38 @@ language: python env: - - TOXENV=py27-django15 - - TOXENV=py27-django16 - - TOXENV=py27-django17 - - TOXENV=py27-django18 - - TOXENV=py27-django19 - - TOXENV=py33-django15 - - TOXENV=py33-django16 - - TOXENV=py33-django17 - - TOXENV=py34-django15 - - TOXENV=py34-django16 - - TOXENV=py34-django17 - - TOXENV=py34-django18 - - TOXENV=py34-django19 - - TOXENV=py35-django18 - - TOXENV=py35-django19 - - TOXENV=flake8 - - TOXENV=sphinx - - TOXENV=readme + include: + - python: 2.7 + env: + - TOXENV=py27-django15 + - TOXENV=py27-django16 + - TOXENV=py27-django17 + - TOXENV=py27-django18 + - TOXENV=py27-django19 + - TOXENV=py27-django110 + - TOXENV=py27-django111 + - python: 3.3 + env: + - TOXENV=py33-django15 + - TOXENV=py33-django16 + - TOXENV=py33-django17 + - python: 3.4 + env: + - TOXENV=py34-django15 + - TOXENV=py34-django16 + - TOXENV=py34-django17 + - TOXENV=py34-django18 + - TOXENV=py34-django19 + - TOXENV=py34-django110 + - TOXENV=py34-django111 + - python: 3.5 + env: + - TOXENV=py35-django18 + - TOXENV=py35-django19 + - TOXENV=py34-django110 + - TOXENV=py34-django111 +# - TOXENV=flake8 +# - TOXENV=sphinx +# - TOXENV=readme install: script: - make test From ade4c0667083aa246a06a6ffd4bbebbdb17c62a4 Mon Sep 17 00:00:00 2001 From: Fabre Florian Date: Thu, 14 Sep 2017 11:15:24 +0200 Subject: [PATCH 3/5] Fix travis config. --- .travis.yml | 50 ++++++++++++++++++++------------------------------ 1 file changed, 20 insertions(+), 30 deletions(-) diff --git a/.travis.yml b/.travis.yml index 99e9bb7..19868e0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,35 +1,25 @@ language: python +python: + - "3.5" env: - include: - - python: 2.7 - env: - - TOXENV=py27-django15 - - TOXENV=py27-django16 - - TOXENV=py27-django17 - - TOXENV=py27-django18 - - TOXENV=py27-django19 - - TOXENV=py27-django110 - - TOXENV=py27-django111 - - python: 3.3 - env: - - TOXENV=py33-django15 - - TOXENV=py33-django16 - - TOXENV=py33-django17 - - python: 3.4 - env: - - TOXENV=py34-django15 - - TOXENV=py34-django16 - - TOXENV=py34-django17 - - TOXENV=py34-django18 - - TOXENV=py34-django19 - - TOXENV=py34-django110 - - TOXENV=py34-django111 - - python: 3.5 - env: - - TOXENV=py35-django18 - - TOXENV=py35-django19 - - TOXENV=py34-django110 - - TOXENV=py34-django111 + - TOXENV=py27-django15 + - TOXENV=py27-django16 + - TOXENV=py27-django17 + - TOXENV=py27-django18 + - TOXENV=py27-django19 + - TOXENV=py27-django110 + - TOXENV=py27-django111 + - TOXENV=py34-django15 + - TOXENV=py34-django16 + - TOXENV=py34-django17 + - TOXENV=py34-django18 + - TOXENV=py34-django19 + - TOXENV=py34-django110 + - TOXENV=py34-django111 + - TOXENV=py35-django18 + - TOXENV=py35-django19 + - TOXENV=py34-django110 + - TOXENV=py34-django111 # - TOXENV=flake8 # - TOXENV=sphinx # - TOXENV=readme From 5306a54222aa31aa5a83201626f190aa382380bc Mon Sep 17 00:00:00 2001 From: Fabre Florian Date: Thu, 14 Sep 2017 11:37:13 +0200 Subject: [PATCH 4/5] Fix travis config. --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 19868e0..c6931de 100644 --- a/.travis.yml +++ b/.travis.yml @@ -20,7 +20,7 @@ env: - TOXENV=py35-django19 - TOXENV=py34-django110 - TOXENV=py34-django111 -# - TOXENV=flake8 + - TOXENV=flake8 # - TOXENV=sphinx # - TOXENV=readme install: From 9aaa069e233f7a803e7d775da63d377ae2371361 Mon Sep 17 00:00:00 2001 From: Fabre Florian Date: Thu, 14 Sep 2017 11:40:27 +0200 Subject: [PATCH 5/5] Fix flake8 issue --- demo/demoproject/settings.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/demo/demoproject/settings.py b/demo/demoproject/settings.py index 5fa2e23..c091ce6 100755 --- a/demo/demoproject/settings.py +++ b/demo/demoproject/settings.py @@ -133,7 +133,7 @@ if StrictVersion(get_version()) >= StrictVersion('1.8'): 'DIRS': [ os.path.join(os.path.dirname(__file__), "templates"), ], - 'OPTIONS': { + 'OPTIONS': { 'debug': DEBUG, 'context_processors': [ # Insert your TEMPLATE_CONTEXT_PROCESSORS here or use this