Skip to content

Commit

Permalink
Merge pull request #35 from dimagi/np/111
Browse files Browse the repository at this point in the history
support django 1.11
  • Loading branch information
nickpell committed Oct 31, 2017
2 parents c547b73 + c5c2d63 commit 4ca84ea
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 5 deletions.
1 change: 1 addition & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ env:
- DJANGO_VERSION_MIN=1.8 DJANGO_VERSION_MAX=1.9
- DJANGO_VERSION_MIN=1.9 DJANGO_VERSION_MAX=1.10
- DJANGO_VERSION_MIN=1.10 DJANGO_VERSION_MAX=1.11
- DJANGO_VERSION_MIN=1.11 DJANGO_VERSION_MAX=2.0
install:
- pip install "django>=$DJANGO_VERSION_MIN,<$DJANGO_VERSION_MAX"
- "pip install -e ."
Expand Down
8 changes: 4 additions & 4 deletions django_prbac/urls.py
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@

from django.conf.urls import patterns, include
from django.conf.urls import include, url
from django.contrib import admin

admin.autodiscover()

urlpatterns = patterns('',
(r'^admin/', include(admin.site.urls)),
)
urlpatterns = [
url(r'^admin/', include(admin.site.urls)),
]
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ def get_version():
packages=find_packages(),
zip_safe=False,
install_requires=[
'django>=1.8,<1.11',
'django>=1.8,<2.0',
'jsonfield>=1.0.3',
'simplejson',
'six',
Expand Down

0 comments on commit 4ca84ea

Please sign in to comment.