Skip to content

Commit

Permalink
Fix problem in travis with django/python version (#122)
Browse files Browse the repository at this point in the history
* Fix travis

* Fix url
  • Loading branch information
tomasgarzon authored Feb 14, 2021
1 parent 71f9ae8 commit 07a5e44
Show file tree
Hide file tree
Showing 3 changed files with 20 additions and 7 deletions.
4 changes: 4 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,8 @@ matrix:
env: DJANGO_VERSION='Django>=1.9,<1.10'
- python: "3.6"
env: DJANGO_VERSION='Django>=1.10,<1.11'
- python: "3.6"
env: DJANGO_VERSION='https://github.com/django/django/archive/master.tar.gz'
- python: "3.7"
env: DJANGO_VERSION='Django>=1.4,<1.5'
- python: "3.7"
Expand All @@ -91,6 +93,8 @@ matrix:
env: DJANGO_VERSION='Django>=1.9,<1.10'
- python: "3.7"
env: DJANGO_VERSION='Django>=1.10,<1.11'
- python: "3.7"
env: DJANGO_VERSION='https://github.com/django/django/archive/master.tar.gz'
- python: "3.8"
env: DJANGO_VERSION='Django>=1.4,<1.5'
- python: "3.8"
Expand Down
19 changes: 13 additions & 6 deletions example/app/urls.py
Original file line number Diff line number Diff line change
Expand Up @@ -30,12 +30,19 @@ def patterns(prefix, *args):
else:
return list(args)
except ImportError: # Django < 1.4
from django.conf.urls.defaults import patterns, url
if VERSION < (4, 0):
from django.conf.urls.defaults import patterns, url
else:
from django.urls import re_path as url

from .views import app_index


urlpatterns = patterns(
'',
url(r'^$', app_index, name='app_index'),
)
if VERSION < (1, 11):
urlpatterns = patterns(
'',
url(r'^$', app_index, name='app_index'),
)
else:
urlpatterns = [
url(r'^$', app_index, name='app_index'),
]
4 changes: 3 additions & 1 deletion example/example/urls.py
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,10 @@ def patterns(prefix, *args):
except ImportError: # Django < 1.4
if VERSION < (1, 4):
from django.conf.urls.defaults import include, patterns, url
else:
elif VERSION < (4, 0):
from django.urls import include, url
else:
from django.urls import re_path as url


js_info_dict = {
Expand Down

0 comments on commit 07a5e44

Please sign in to comment.