Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Updated settings and imports to support Django>=1.11 #3

Merged
merged 2 commits into from Jan 21, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
5 changes: 4 additions & 1 deletion .gitignore
Expand Up @@ -10,4 +10,7 @@ avatars
.coverage
docs/_build
tests/test_static/
htmlcov/
htmlcov/
*.geany
*.out
.env
7 changes: 6 additions & 1 deletion .travis.yml
Expand Up @@ -14,6 +14,7 @@ env:
- DJANGO=1.7.10
- DJANGO=1.8.8
- DJANGO=1.9.1
- DJANGO=1.11.9
matrix:
exclude:
- python: 3.2
Expand All @@ -24,5 +25,9 @@ matrix:
env: DJANGO=1.7.10
- python: 3.5
env: DJANGO=1.8.8
- python: 3.2
env: DJANGO=1.11.9
- python: 3.3
env: DJANGO=1.11.9
after_success:
- coveralls
- coveralls
4 changes: 2 additions & 2 deletions lazy_tags/urls.py
@@ -1,6 +1,6 @@
from django.conf.urls import patterns, url
from .views import tag
from django.conf.urls import url

from .views import tag

urlpatterns = [
url(r'^tag/(?P<tag_id>.+)?$', tag, name='lazy_tag'),
Expand Down
1 change: 1 addition & 0 deletions setup.py
Expand Up @@ -31,6 +31,7 @@ def find_version(*file_paths):
'Framework :: Django :: 1.7',
'Framework :: Django :: 1.8',
'Framework :: Django :: 1.9',
'Framework :: Django :: 1.11',
'Intended Audience :: Developers',
'License :: OSI Approved :: MIT License',
'Operating System :: OS Independent',
Expand Down
12 changes: 12 additions & 0 deletions tests/settings.py
Expand Up @@ -49,3 +49,15 @@
"django.contrib.staticfiles.finders.FileSystemFinder",
"django.contrib.staticfiles.finders.AppDirectoriesFinder",
)

# Required in Django>=1.10.
TEMPLATES = [
{
'BACKEND': 'django.template.backends.django.DjangoTemplates',
'DIRS': [],
'APP_DIRS': True,
'OPTIONS': {
# ... some options here ...
},
},
]
26 changes: 20 additions & 6 deletions tests/urls.py
@@ -1,15 +1,29 @@
try:
from django.conf.urls import patterns, include, url
# Removed in Django 1.6
from django.conf.urls.defaults import url, include
except ImportError:
from django.conf.urls.defaults import patterns, include, url
from django.conf.urls import url, include

from . import views
try:
# Relocated in Django 1.6
from django.conf.urls.defaults import patterns
except ImportError:
# Completely removed in Django 1.10
try:
from django.conf.urls import patterns
except ImportError:
patterns = None

from . import views

urlpatterns = patterns(
'',
_patterns = [
url(r'^$', views.test_jquery, name='lazy_tags_jquery'),
url(r'^js/$', views.test_javascript, name='lazy_tags_javascript'),
url(r'^prototype/$', views.test_prototype, name='lazy_tags_prototype'),
url(r'^lazy_tags/', include('lazy_tags.urls')),
)
]

if patterns is None:
urlpatterns = _patterns
else:
urlpatterns = patterns('', *_patterns)