Skip to content

Commit

Permalink
Merge pull request #1 from vlinhart/update_tests
Browse files Browse the repository at this point in the history
add django 3.0 support
  • Loading branch information
brianmay committed Feb 4, 2020
2 parents bfd11c5 + 19b6a46 commit 728d4b9
Show file tree
Hide file tree
Showing 3 changed files with 23 additions and 2 deletions.
16 changes: 16 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,22 @@ env:
- DJANGO_VERSION=1.10
- DJANGO_VERSION=1.11
- DJANGO_VERSION=2.2
- DJANGO_VERSION=3.0

jobs:
exclude:
- python: 2.7
env: DJANGO_VERSION=2.2
- python: 2.7
env: DJANGO_VERSION=3.0
- python: 3.5
env: DJANGO_VERSION=3.0
- python: 3.8
env: DJANGO_VERSION=1.8
- python: 3.8
env: DJANGO_VERSION=1.9
- python: 3.8
env: DJANGO_VERSION=1.10

install:
- pip install coveralls flake8 urllib3
Expand Down
6 changes: 5 additions & 1 deletion tests/urls.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
from django.conf.urls import url
from django.contrib.auth.views import login
try:
from django.contrib.auth.views import login
except ImportError:
# Django 2.2 moved this
from django.contrib.auth import login

urlpatterns = [
url(r'^accounts/login/$', login, name='login'),
Expand Down
3 changes: 2 additions & 1 deletion tox.ini
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@

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

[testenv]
basepython =
Expand All @@ -17,6 +17,7 @@ deps =
dj19: Django>=1.9,<1.9.99
dj110: Django>=1.10,<1.10.99
dj220: Django>=2.2,<2.2.99
dj30: Django>=3.0,<3.0.99

commands =
flake8 revproxy -v
Expand Down

0 comments on commit 728d4b9

Please sign in to comment.