Merge pull request #14 from JamesRitchie/django_version_bump

Django version bump

.travis.yml

@@ -1,24 +1,28 @@
 language: python
 python:
-  - "2.6"
   - "2.7"
   - "3.2"
   - "3.3"
   - "3.4"
+  - "3.5"
 env:
-  - DJANGO_VERSION=1.6.11
-  - DJANGO_VERSION=1.7.7
-  - DJANGO_VERSION=1.8
+  - DJANGO_VERSION=1.8.14
+  - DJANGO_VERSION=1.9.9
+  - DJANGO_VERSION=1.10.1
 matrix:
   exclude:
-    - python: "2.6"
-      env: DJANGO_VERSION=1.7.7
-    - python: "2.6"
-      env: DJANGO_VERSION=1.8
+    - python: "3.2"
+      env: DJANGO_VERSION=1.9.9
+    - python: "3.2"
+      env: DJANGO_VERSION=1.10.1
+    - python: "3.3"
+      env: DJANGO_VERSION=1.9.9
+    - python: "3.3"
+      env: DJANGO_VERSION=1.10.1
   fast_finish: true
 
 install:
-  - pip install Django==$DJANGO_VERSION djangorestframework==3.2.3
+  - pip install Django==$DJANGO_VERSION djangorestframework==3.4.6
   - pip install coverage==3.7.1
   - pip install coveralls
 script:

README.md

@@ -91,9 +91,16 @@ The `obtain_expiring_auth_token` view works exactly the same as the `obtain_auth
  * Possibly change `obtain_expiring_auth_token` to always replace an existing token. (Configurable?)
  * South Migrations
 
-## Changelog
+## Contributors
+
+ * [James Ritchie](https://github.com/JamesRitchie)
+ * [fcasas](https://github.com/fcasas)
 
+## Changelog
 
+ * 0.1.4
+  * Fixed a typo causing an incorrect 500 error response with an invalid token.
+  * Support Django 1.10 and Django Rest Framework 3.4
  * 0.1.3
   * Set a default token lifespan of 30 days.
  * 0.1.2

rest_framework_expiring_authtoken/__init__.py

@@ -6,4 +6,4 @@
     'views'
 ]
 
-__version__ = '0.1.3'
+__version__ = '0.1.4'

setup.py

@@ -35,10 +35,12 @@
     license='BSD',
     packages=find_packages(exclude=['tests*']),
     install_requires=[
-        'djangorestframework>=3.2.3'
+        'djangorestframework>=3.2.3,<=3.4.6'
     ],
     test_suite='runtests.run',
-    tests_require=['Django'],
+    tests_require=[
+        'Django>=1.8.14,<=1.10.1'
+    ],
     zip_safe=False,
     classifiers=[
         'Development Status :: 5 - Production/Stable',

tests/urls.py

@@ -1,9 +1,8 @@
 """URL conf for testing Expiring Tokens."""
-from django.conf.urls import patterns
+from django.conf.urls import url
 
 from rest_framework_expiring_authtoken.views import obtain_expiring_auth_token
 
-urlpatterns = patterns(
-    '',
-    (r'^obtain-token/$', obtain_expiring_auth_token),
-)
+urlpatterns = [
+    url(r'^obtain-token/$', obtain_expiring_auth_token),
+]