Skip to content

Commit d91b9ce

Browse files
brianmayvlinhart
andauthored
Update tests to test Python 3.8 and Django 3.0 (jazzband#104)
* Update tests to test Python 3.8 and Django 2.2 * add django 3.0 support * exclude some Python x Django combinations as they are not valid https://docs.djangoproject.com/en/3.0/faq/install/#what-python-version-can-i-use-with-django * exclude some more Python x Django combinations as they are not defined https://docs.djangoproject.com/en/3.0/faq/install/#what-python-version-can-i-use-with-django Co-authored-by: vlinhart <[email protected]>
1 parent 4cefe4a commit d91b9ce

File tree

4 files changed

+30
-2
lines changed

4 files changed

+30
-2
lines changed

.travis.yml

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,30 @@ python:
1313
- "3.5"
1414
- "3.6"
1515
- "3.7"
16+
- "3.8"
1617

1718
env:
1819
- DJANGO_VERSION=1.8
1920
- DJANGO_VERSION=1.9
2021
- DJANGO_VERSION=1.10
2122
- DJANGO_VERSION=1.11
23+
- DJANGO_VERSION=2.2
24+
- DJANGO_VERSION=3.0
25+
26+
jobs:
27+
exclude:
28+
- python: 2.7
29+
env: DJANGO_VERSION=2.2
30+
- python: 2.7
31+
env: DJANGO_VERSION=3.0
32+
- python: 3.5
33+
env: DJANGO_VERSION=3.0
34+
- python: 3.8
35+
env: DJANGO_VERSION=1.8
36+
- python: 3.8
37+
env: DJANGO_VERSION=1.9
38+
- python: 3.8
39+
env: DJANGO_VERSION=1.10
2240

2341
install:
2442
- pip install coveralls flake8 urllib3

setup.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,8 @@ def find_version(*file_paths):
5050
'Programming Language :: Python :: 2.7',
5151
'Programming Language :: Python :: 3.5',
5252
'Programming Language :: Python :: 3.6',
53+
'Programming Language :: Python :: 3.7',
54+
'Programming Language :: Python :: 3.8',
5355
'Programming Language :: Python :: Implementation :: CPython',
5456
'Programming Language :: Python :: Implementation :: PyPy',
5557
'Topic :: Internet :: Proxy Servers',

tests/urls.py

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
from django.conf.urls import url
2-
from django.contrib.auth.views import login
2+
try:
3+
from django.contrib.auth.views import login
4+
except ImportError:
5+
# Django 2.2 moved this
6+
from django.contrib.auth import login
37

48
urlpatterns = [
59
url(r'^accounts/login/$', login, name='login'),

tox.ini

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,23 @@
11

22
[tox]
3-
envlist = py{27,35,36}-dj{18,19,110}
3+
envlist = py{27,35,36,37,38}-dj{18,19,110},py{35,36,37,38}-dj{220},py{36,37,38}-dj{330}
44

55
[testenv]
66
basepython =
77
py27: python2.7
88
py35: python3.5
99
py36: python3.6
10+
py37: python3.7
11+
py38: python3.8
1012

1113
deps =
1214
coverage
1315
flake8
1416
dj18: Django>=1.8,<1.8.99
1517
dj19: Django>=1.9,<1.9.99
1618
dj110: Django>=1.10,<1.10.99
19+
dj220: Django>=2.2,<2.2.99
20+
dj30: Django>=3.0,<3.0.99
1721

1822
commands =
1923
flake8 revproxy -v

0 commit comments

Comments
 (0)