Skip to content

Commit 8fbabca

Browse files
authored
Bump environment. (#685)
* Bump environment. * Exclude django2 on pypy and py2 * Fix testsuite.
1 parent 2240bfd commit 8fbabca

File tree

4 files changed

+13
-8
lines changed

4 files changed

+13
-8
lines changed

.travis.yml

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,20 @@ language: python
22
python:
33
- 2.7
44
- 3.4
5+
- 3.5
6+
- 3.6
57
- pypy
68
env:
7-
- DJANGO=1.9.13
8-
- DJANGO=1.10.7
99
- DJANGO=1.11
10+
- DJANGO=2.0
1011
install:
1112
- pip install -e .
1213
- pip install -q Django==$DJANGO
1314
script:
1415
- DJANGO_SETTINGS_MODULE=suit.tests.settings django-admin test suit
16+
matrix:
17+
exclude:
18+
- python: 2.7
19+
env: DJANGO=2.0
20+
- python: pypy
21+
env: DJANGO=2.0

setup.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,10 @@
1818
'Intended Audience :: System Administrators',
1919
'Operating System :: OS Independent',
2020
'Programming Language :: Python',
21-
'Programming Language :: Python :: 2.6',
2221
'Programming Language :: Python :: 2.7',
23-
'Programming Language :: Python :: 3.2',
24-
'Programming Language :: Python :: 3.3',
2522
'Programming Language :: Python :: 3.4',
23+
'Programming Language :: Python :: 3.5',
24+
'Programming Language :: Python :: 3.6',
2625
'Environment :: Web Environment',
2726
'Topic :: Software Development',
2827
'Topic :: Software Development :: User Interfaces',

suit/tests/settings.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,12 @@
1414
'django.contrib.sites',
1515
]
1616

17-
MIDDLEWARE_CLASSES = [
17+
MIDDLEWARE = [
1818
'django.middleware.security.SecurityMiddleware',
1919
'django.contrib.sessions.middleware.SessionMiddleware',
2020
'django.middleware.common.CommonMiddleware',
2121
'django.middleware.csrf.CsrfViewMiddleware',
2222
'django.contrib.auth.middleware.AuthenticationMiddleware',
23-
'django.contrib.auth.middleware.SessionAuthenticationMiddleware',
2423
'django.contrib.messages.middleware.MessageMiddleware',
2524
'django.middleware.clickjacking.XFrameOptionsMiddleware',
2625
]

suit/tests/urls.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@
22
from django.contrib import admin
33

44
urlpatterns = [
5-
url(r'^admin/', include(admin.site.urls)),
5+
url(r'^admin/', admin.site.urls),
66
]

0 commit comments

Comments
 (0)