Minor updates to support Django 2.0

Signed-off-by: kluchrj <christianklus@gmail.com>

.travis.yml

@@ -14,12 +14,13 @@ addons:
     - python2.7
     - python3.3
     - python3.4
+    - python3.6
 
 env:
-  - TOXENV=py27-django18,py33-django18
   - TOXENV=py27-django19,py34-django19,py35-django19
   - TOXENV=py27-django110,py34-django110,py35-django110
   - TOXENV=py27-django111,py34-django111,py35-django111
+  - TOXENV=py34-django20,py35-django20,py36-django20
 
 install:
   - pip install tox pip wheel codecov -U

AUTHORS.txt

@@ -28,5 +28,6 @@ Raphael Merx
 Josh Addington
 Tobias Zanke
 Petr Dlouhy
+Vinod Kurup
 
 Thanks for all of your work!

README.rst

@@ -33,8 +33,8 @@ Features
 Installation Requirements
 -----------------------------------
 
-- Python 2.7, 3.3+
-- `Django <http://www.djangoproject.com/>`_ >= 1.8, <= 1.11
+- Python 2.7, 3.4+
+- `Django <http://www.djangoproject.com/>`_ >= 1.9, <= 2.0
 - `jQuery <http://jquery.com/>`_ >= 1.9, < 3.0
 - `jQuery UI <http://jqueryui.com/>`_ >= 1.10, < 1.12
 

docs/admin.rst

@@ -77,7 +77,7 @@ a many to many relation to our ``Fruit`` model.
         @python_2_unicode_compatible
         class Farm(models.Model):
             name = models.CharField(max_length=200)
-            owner = models.ForeignKey('auth.User', related_name='farms')
+            owner = models.ForeignKey('auth.User', related_name='farms', on_delete=models.CASCADE)
             fruit = models.ManyToManyField(Fruit)
 
             def __str__(self):
@@ -171,4 +171,3 @@ We can even make use of the same ``FarmAdminForm``.
         admin.site.register(User, NewUserAdmin)
 
 The auto-complete functions will be bound as new forms are added dynamically.
-

docs/releases.rst

@@ -6,7 +6,7 @@ v1.2.0 (Released TBD)
 --------------------------------------
 
 Primarily a Django support related release. This version adds support for Django 2.0 while
-dropping support for Django 1.7. A number of deprecation warnings for future Django
+dropping support for Django 1.7 and 1.8. A number of deprecation warnings for future Django
 versions have also been addressed.
 
 Added the ability to search on multiple terms split by whitespace.
@@ -15,7 +15,7 @@ Added the ability to search on multiple terms split by whitespace.
 Backwards Incompatible Changes
 ________________________________
 
-- Dropped support for Django 1.7
+- Dropped support for Django 1.7 and 1.8
 
 
   v1.1.0 (Released 2018-01-12)

example/core/forms.py

@@ -1,10 +1,7 @@
 from django import forms
 from django.forms.models import modelformset_factory
 
-try:
-    from localflavor.us.forms import USStateField, USStateSelect
-except ImportError:
-    from django.contrib.localflavor.us.forms import USStateField, USStateSelect
+from localflavor.us.forms import USStateField, USStateSelect
 
 import selectable.forms as selectable
 

example/requirements.txt

@@ -1,2 +1,2 @@
-django>=1.4
+django>=1.11
 django-localflavor

setup.py

@@ -27,14 +27,18 @@ def read_file(filename):
         'Development Status :: 5 - Production/Stable',
         'Intended Audience :: Developers',
         'Framework :: Django',
+        'Framework :: Django :: 1.9',
+        'Framework :: Django :: 1.10',
+        'Framework :: Django :: 1.11',
+        'Framework :: Django :: 2.0',
         'License :: OSI Approved :: BSD License',
         'Operating System :: OS Independent',
         'Programming Language :: Python',
         'Programming Language :: Python :: 2.7',
         'Programming Language :: Python :: 3',
-        'Programming Language :: Python :: 3.3',
         'Programming Language :: Python :: 3.4',
         'Programming Language :: Python :: 3.5',
+        'Programming Language :: Python :: 3.6',
         'Topic :: Internet :: WWW/HTTP :: Dynamic Content',
     ],
     long_description=read_file('README.rst'),

tox.ini

@@ -1,18 +1,19 @@
 [tox]
-envlist = py{27,33}-django{18},py{27,34,35}-django{19,110,111},py35-django_master,docs
+envlist = py{27,34,35}-django{19,110,111},py{34,35,36}-django20,py35-django_master,docs
 
 [testenv]
 basepython =
     py27: python2.7
     py33: python3.3
     py34: python3.4
     py35: python3.5
+    py36: python3.6
 deps =
     coverage>=4.0,<4.1
-    django18: Django>=1.8,<1.9
     django19: Django>=1.9,<1.10
     django110: Django>=1.10,<1.11
     django111: Django>=1.11,<2.0
+    django20: Django>=2.0,<2.1
     django_master: https://github.com/django/django/archive/master.tar.gz
     py27: mock
 commands = coverage run runtests.py