Merge 9d8bbe7 into a54c2b9

.travis.yml

@@ -12,8 +12,9 @@ python:
 
 env:
   matrix:
-  - DJANGO='django18'
+  - DJANGO='django110'
   - DJANGO='django19'
+  - DJANGO='django18'
   - TOXENV='pep8'
   - TOXENV='isort'
   - TOXENV='docs'
@@ -60,6 +61,8 @@ matrix:
     env: TOXENV='docs'
   - python: 3.3
     env: DJANGO='django19'
+  - python: 3.3
+    env: DJANGO='django110'
 
 
 cache:

HISTORY.rst

@@ -3,6 +3,11 @@
 History
 -------
 
+0.3.2 (unreleased)
+++++++++++++++++++
+
+* Add support for Django 1.10
+
 0.3.1 (2016-09-10)
 ++++++++++++++++++
 

setup.cfg

@@ -8,7 +8,8 @@ tag = True
 [bumpversion:file:knocker/__init__.py]
 
 [flake8]
-exclude = *.egg-info,.git,.settings,.tox,docs,migrations
+exclude = *.egg-info,.git,.settings,.tox,docs,migrations,.eggs
+ignore = E305
 max-line-length = 119
 
 [metadata]

tests/example_app/models.py

@@ -52,7 +52,7 @@ def get_title(self):
     def __unicode__(self):
         return self.title
 
-    def get_absolute_url(self):
+    def get_absolute_url(self, ciao):
         return reverse('post-detail', kwargs={'slug': self.slug})
 
 

tests/example_app/urls.py

@@ -5,7 +5,6 @@
 import django.views.static
 from django.conf import settings
 from django.conf.urls import include, url
-from django.conf.urls.i18n import i18n_patterns
 from django.contrib import admin
 
 from .views import PostDetailView, PostListView, PostMixinDetailView
@@ -16,11 +15,9 @@
 urlpatterns = [
     url(r'^media/(?P<path>.*)$', django.views.static.serve,  # NOQA
         {'document_root': settings.MEDIA_ROOT, 'show_indexes': True}),
+    url(r'^admin/', include(admin.site.urls)),  # NOQA
     url(r'^jsi18n/(?P<packages>\S+?)/$', django.views.i18n.javascript_catalog),  # NOQA
     url(r'^mixin/(?P<slug>\w[-\w]*)/$', PostMixinDetailView.as_view(), name='post-detail-mixinx'),
     url(r'^(?P<slug>\w[-\w]*)/$', PostDetailView.as_view(), name='post-detail'),
     url(r'^$', PostListView.as_view(), name='post-list'),
 ]
-urlpatterns += i18n_patterns('',
-    url(r'^admin/', include(admin.site.urls)),  # NOQA
-)

tox.ini

@@ -1,5 +1,5 @@
 [tox]
-envlist = pep8,isort,py{27,34,35}-django{19},py{27,33,34}-django{18}
+envlist = pep8,isort,py{35,34,27}-django{110,19},py{35,34,33,27}-django{18}
 skip_missing_interpreters = true
 
 [testenv]
@@ -9,6 +9,7 @@ commands = {env:COMMAND:python} cms_helper.py test knocker
 deps =
     django18: Django>=1.8,<1.9
     django19: Django>=1.9,<1.10
+    django110: Django>=1.10,<1.11
     -r{toxinidir}/requirements-test.txt
 
 [testenv:pep8]