Merge pull request #41 from adepue/django18

Add Django 1.9 to test suite
hearsaycorp · Dec 3, 2015 · 7b44931 · 7b44931
2 parents c1934dc + 5287ee1
commit 7b44931
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 21 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,28 +1,17 @@
 language: python
 python:
   - "2.7"
+sudo: false
 env:
-  - DJANGO_VERSION_CEILING=1.4 DJANGO_DB_ENGINE=sqlite
-  - DJANGO_VERSION_CEILING=1.4 DJANGO_DB_ENGINE=postgres DJANGO_DB_NAME=testdb DJANGO_DB_USER=postgres
-  - DJANGO_VERSION_CEILING=1.4 DJANGO_DB_ENGINE=mysql DJANGO_DB_NAME=testdb DJANGO_DB_USER=travis
-  - DJANGO_VERSION_CEILING=1.5 DJANGO_DB_ENGINE=sqlite
-  - DJANGO_VERSION_CEILING=1.5 DJANGO_DB_ENGINE=postgres DJANGO_DB_NAME=testdb DJANGO_DB_USER=postgres
-  - DJANGO_VERSION_CEILING=1.5 DJANGO_DB_ENGINE=mysql DJANGO_DB_NAME=testdb DJANGO_DB_USER=travis
-  - DJANGO_VERSION_CEILING=1.6 DJANGO_DB_ENGINE=sqlite
-  - DJANGO_VERSION_CEILING=1.6 DJANGO_DB_ENGINE=postgres DJANGO_DB_NAME=testdb DJANGO_DB_USER=postgres
-  - DJANGO_VERSION_CEILING=1.6 DJANGO_DB_ENGINE=mysql DJANGO_DB_NAME=testdb DJANGO_DB_USER=travis
-  - DJANGO_VERSION_CEILING=1.7 DJANGO_DB_ENGINE=sqlite
-  - DJANGO_VERSION_CEILING=1.7 DJANGO_DB_ENGINE=postgres DJANGO_DB_NAME=testdb DJANGO_DB_USER=postgres
-  - DJANGO_VERSION_CEILING=1.7 DJANGO_DB_ENGINE=mysql DJANGO_DB_NAME=testdb DJANGO_DB_USER=travis
-  - DJANGO_VERSION_CEILING=1.8 DJANGO_DB_ENGINE=sqlite
-  - DJANGO_VERSION_CEILING=1.8 DJANGO_DB_ENGINE=postgres DJANGO_DB_NAME=testdb DJANGO_DB_USER=postgres
-  - DJANGO_VERSION_CEILING=1.8 DJANGO_DB_ENGINE=mysql DJANGO_DB_NAME=testdb DJANGO_DB_USER=travis
   - DJANGO_VERSION_CEILING=1.9 DJANGO_DB_ENGINE=sqlite
   - DJANGO_VERSION_CEILING=1.9 DJANGO_DB_ENGINE=postgres DJANGO_DB_NAME=testdb DJANGO_DB_USER=postgres
   - DJANGO_VERSION_CEILING=1.9 DJANGO_DB_ENGINE=mysql DJANGO_DB_NAME=testdb DJANGO_DB_USER=travis
+  - DJANGO_VERSION_CEILING=1.10 DJANGO_DB_ENGINE=sqlite
+  - DJANGO_VERSION_CEILING=1.10 DJANGO_DB_ENGINE=postgres DJANGO_DB_NAME=testdb DJANGO_DB_USER=postgres
+  - DJANGO_VERSION_CEILING=1.10 DJANGO_DB_ENGINE=mysql DJANGO_DB_NAME=testdb DJANGO_DB_USER=travis
 
 install:
-  - pip install -q "Django<$DJANGO_VERSION_CEILING" MySQL-python psycopg2
+  - pip install "Django<$DJANGO_VERSION_CEILING" MySQL-python psycopg2
   - pip install -q flake8 pylint pylint-django django-nose
   - pip install -e .
 before_script:

diff --git a/pylint.rc b/pylint.rc
@@ -9,4 +9,4 @@ reports=no
 
 [TYPECHECK]
 # Dynamically-set members missed by the inference system.
-generated-members=index,canonical_name,display_name,is_valid,cleaned_data,objects
+generated-members=index,canonical_name,display_name,is_valid,cleaned_data,objects,save,prepare_value
diff --git a/setup.py b/setup.py
@@ -16,7 +16,7 @@
 
 
 install_requires = (
-    'Django>=1.3,<1.9',
+    'Django>=1.8,<1.10',
     'richenum',
 )
 
@@ -77,7 +77,7 @@ def run_tests(self):
 
 setup(
     name='django-richenum',
-    version='2.3.2',
+    version='2.4.0',
     description='Django Enum library for python.',
     long_description=(
         open('README.rst').read() + '\n\n' +

diff --git a/tests/test_form_fields.py b/tests/test_form_fields.py
@@ -1,5 +1,5 @@
 from django import forms
-from django.utils.unittest import TestCase
+from unittest import TestCase
 
 from django_richenum.forms import CanonicalEnumField
 from django_richenum.forms import IndexEnumField

diff --git a/tests/test_model_form.py b/tests/test_model_form.py
@@ -1,5 +1,5 @@
 from django import forms
-from django.utils.unittest import TestCase
+from unittest import TestCase
 
 from .models import NumNode