Skip to content

Commit 7ca36b8

Browse files
tobamitobami
committed
Remove usage of pattern in urls.py to be compatible with Django 1.10
- Set travis matrix to Python 3.5 and Django 1.11 - Set max django version to 1.11 in requirements and setup.py
1 parent cd75999 commit 7ca36b8

File tree

6 files changed

+48
-53
lines changed

6 files changed

+48
-53
lines changed

‎.travis.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
language: python
22
python:
33
- 2.7
4-
- 3.4
4+
- 3.5
55
branches:
66
only:
77
- master
88
env:
99
global:
1010
- DJANGO_SETTINGS_MODULE=sample_project.settings
1111
matrix:
12-
- DJANGO_VERSION=1.8.18
13-
- DJANGO_VERSION=1.9.13
12+
- DJANGO_VERSION=1.8
13+
- DJANGO_VERSION=1.11
1414
install:
1515
- pip install flake8
1616
- pip install -q Django==$DJANGO_VERSION

‎codespeed/urls.py‎

Lines changed: 21 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,34 @@
11
# -*- coding: utf-8 -*-
2-
from django.conf.urls import patterns, url
2+
from django.conf.urls import url
33
from django.views.generic import TemplateView
44

5+
from codespeed import views
56
from codespeed.feeds import LatestEntries, LatestSignificantEntries
67

7-
8-
urlpatterns = patterns('',
8+
urlpatterns = [
99
url(r'^$', TemplateView.as_view(template_name='home.html'), name='home'),
10-
url(r'^about/$', TemplateView.as_view(template_name='about.html'), name='about'),
10+
url(r'^about/$',
11+
TemplateView.as_view(template_name='about.html'), name='about'),
1112
# RSS for reports
1213
url(r'^feeds/latest/$', LatestEntries(), name='latest-results'),
1314
url(r'^feeds/latest_significant/$', LatestSignificantEntries(),
1415
name='latest-significant-results'),
15-
)
16+
]
1617

17-
urlpatterns += patterns('codespeed.views',
18-
url(r'^reports/$', 'reports', name='reports'),
19-
url(r'^changes/$', 'changes', name='changes'),
20-
url(r'^changes/table/$', 'getchangestable', name='getchangestable'),
21-
url(r'^changes/logs/$', 'displaylogs', name='displaylogs'),
22-
url(r'^timeline/$', 'timeline', name='timeline'),
23-
url(r'^timeline/json/$', 'gettimelinedata', name='gettimelinedata'),
24-
url(r'^comparison/$', 'comparison', name='comparison'),
25-
url(r'^comparison/json/$', 'getcomparisondata', name='getcomparisondata'),
26-
url(r'^makeimage/$', 'makeimage', name='makeimage'),
27-
)
18+
urlpatterns += [
19+
url(r'^reports/$', views.reports, name='reports'),
20+
url(r'^changes/$', views.changes, name='changes'),
21+
url(r'^changes/table/$', views.getchangestable, name='getchangestable'),
22+
url(r'^changes/logs/$', views.displaylogs, name='displaylogs'),
23+
url(r'^timeline/$', views.timeline, name='timeline'),
24+
url(r'^timeline/json/$', views.gettimelinedata, name='gettimelinedata'),
25+
url(r'^comparison/$', views.comparison, name='comparison'),
26+
url(r'^comparison/json/$', views.getcomparisondata, name='getcomparisondata'),
27+
url(r'^makeimage/$', views.makeimage, name='makeimage'),
28+
]
2829

29-
urlpatterns += patterns('codespeed.views',
30+
urlpatterns += [
3031
# URLs for adding results
31-
url(r'^result/add/json/$', 'add_json_results'),
32-
url(r'^result/add/$', 'add_result'),
33-
)
32+
url(r'^result/add/json/$', views.add_json_results),
33+
url(r'^result/add/$', views.add_result),
34+
]

‎requirements.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
Django>=1.6,<1.10
1+
Django>=1.7,<2.0
22
isodate>=0.4.7,<0.6
33
matplotlib>=1.4.3,<2.0

‎sample_project/settings.py‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
import os
44

55
DEBUG = True
6-
TEMPLATE_DEBUG = DEBUG
76

87
BASEDIR = os.path.abspath(os.path.dirname(__file__))
98
TOPDIR = os.path.split(BASEDIR)[1]
@@ -39,10 +38,6 @@
3938

4039
SECRET_KEY = 'as%n_m#)^vee2pe91^^@c))sl7^c6t-9r8n)_69%)2yt+(la2&'
4140

42-
TEMPLATE_LOADERS = (
43-
'django.template.loaders.filesystem.Loader',
44-
'django.template.loaders.app_directories.Loader',
45-
)
4641

4742
MIDDLEWARE_CLASSES = (
4843
'django.middleware.common.CommonMiddleware',
@@ -54,24 +49,29 @@
5449

5550
ROOT_URLCONF = '{0}.urls'.format(TOPDIR)
5651

57-
TEMPLATE_DIRS = (
58-
os.path.join(BASEDIR, 'templates'),
59-
)
6052

61-
TEMPLATE_CONTEXT_PROCESSORS = (
62-
'django.contrib.auth.context_processors.auth',
63-
'django.contrib.messages.context_processors.messages',
64-
'django.core.context_processors.debug',
65-
'django.core.context_processors.i18n',
66-
'django.core.context_processors.media',
67-
'django.core.context_processors.static',
68-
'django.core.context_processors.request',
69-
)
53+
TEMPLATES = [
54+
{
55+
'BACKEND': 'django.template.backends.django.DjangoTemplates',
56+
'DIRS': [os.path.join(BASEDIR, 'templates')],
57+
'APP_DIRS': True,
58+
'OPTIONS': {
59+
'context_processors': [
60+
'django.template.context_processors.debug',
61+
'django.template.context_processors.request',
62+
'django.contrib.auth.context_processors.auth',
63+
'django.contrib.messages.context_processors.messages',
64+
],
65+
},
66+
},
67+
]
68+
7069

7170
INSTALLED_APPS = (
7271
'django.contrib.auth',
7372
'django.contrib.contenttypes',
7473
'django.contrib.sessions',
74+
'django.contrib.messages',
7575
'django.contrib.admin',
7676
'django.contrib.staticfiles',
7777
'codespeed',

‎sample_project/urls.py‎

Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,13 @@
11
# -*- coding: utf-8 -*-
22

3-
import os.path
4-
53
from django.conf import settings
6-
from django.conf.urls import patterns, include
7-
from django.views.generic import RedirectView
8-
from django.core.urlresolvers import reverse
4+
from django.conf.urls import include, url
95
from django.contrib import admin
106

11-
admin.autodiscover()
12-
13-
urlpatterns = patterns('',
14-
(r'^admin/', include(admin.site.urls)),
15-
(r'^', include('codespeed.urls')),
16-
)
7+
urlpatterns = [
8+
url(r'^admin/', include(admin.site.urls)),
9+
url(r'^', include('codespeed.urls'))
10+
]
1711

1812
if settings.DEBUG:
1913
# needed for development server

‎setup.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
download_url="https://github.com/tobami/codespeed/tags",
1010
license='GNU Lesser General Public License version 2.1',
1111
keywords=['benchmarking', 'visualization'],
12-
install_requires=['django>=1.6,<1.10', 'isodate>=0.4.7,<0.6', 'matplotlib>=1.4.3,<2.0'],
12+
install_requires=['django>=1.8,<2.0', 'isodate>=0.4.7,<0.6', 'matplotlib>=1.4.3,<2.0'],
1313
packages=find_packages(exclude=['ez_setup', 'sample_project']),
1414
setup_requires=['setuptools-markdown'],
1515
long_description_markdown_filename='README.md',

0 commit comments

Comments
 (0)