From 50e6f539154c4d46510d8ddb8ee606f884260d24 Mon Sep 17 00:00:00 2001 From: Adam DePue Date: Thu, 3 Dec 2015 04:28:43 +0000 Subject: [PATCH 1/5] Add Django 1.9 to test suite --- .travis.yml | 5 ++++- pylint.rc | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 44d51d8..3a12c7e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -20,9 +20,12 @@ env: - 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 index a28e666..8aa44ec 100644 --- 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 From 52ba52397196477b366ba80044580b7b85cb2362 Mon Sep 17 00:00:00 2001 From: Adam DePue Date: Thu, 3 Dec 2015 15:26:47 +0000 Subject: [PATCH 2/5] Bump version and support --- setup.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/setup.py b/setup.py index c4fd49d..906fcf3 100755 --- a/setup.py +++ b/setup.py @@ -16,7 +16,7 @@ install_requires = ( - 'Django>=1.3,<1.9', + 'Django>=1.3,<1.10', 'richenum', ) @@ -77,7 +77,7 @@ def run_tests(self): setup( name='django-richenum', - version='2.3.2', + version='2.3.3', description='Django Enum library for python.', long_description=( open('README.rst').read() + '\n\n' + From a3b5dd199a0c32d1d65111c82afc4e0e651f66ac Mon Sep 17 00:00:00 2001 From: Adam DePue Date: Thu, 3 Dec 2015 15:38:18 +0000 Subject: [PATCH 3/5] Move to Django 1.8+ per Djangos support policy --- .travis.yml | 15 --------------- setup.py | 4 ++-- 2 files changed, 2 insertions(+), 17 deletions(-) diff --git a/.travis.yml b/.travis.yml index 3a12c7e..e949ef7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,21 +2,6 @@ language: python python: - "2.7" 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 diff --git a/setup.py b/setup.py index 906fcf3..1788417 100755 --- a/setup.py +++ b/setup.py @@ -16,7 +16,7 @@ install_requires = ( - 'Django>=1.3,<1.10', + 'Django>=1.8,<1.10', 'richenum', ) @@ -77,7 +77,7 @@ def run_tests(self): setup( name='django-richenum', - version='2.3.3', + version='2.4.0', description='Django Enum library for python.', long_description=( open('README.rst').read() + '\n\n' + From 988dee6e05ddda744101da11ed4aafd17a033731 Mon Sep 17 00:00:00 2001 From: Adam DePue Date: Thu, 3 Dec 2015 20:54:36 +0000 Subject: [PATCH 4/5] new build infra --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index e949ef7..2b4a637 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,7 @@ language: python python: - "2.7" +sudo: false env: - 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 From 5287ee18fb31183ba2640af8071fde49e1daa7f8 Mon Sep 17 00:00:00 2001 From: Adam DePue Date: Thu, 3 Dec 2015 20:56:33 +0000 Subject: [PATCH 5/5] Fix imports --- tests/test_form_fields.py | 2 +- tests/test_model_form.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/test_form_fields.py b/tests/test_form_fields.py index 3cfbb41..0f4215e 100644 --- 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 index 79664c6..c4b8049 100644 --- 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