Introduced support of Django 1.7, 1.8, 1.9 and support of Python 3.5 - …

…Closes #3, closes #30, closes #31, closes #32
benoitbryon · Dec 15, 2015 · bb6ad2b · bb6ad2b
2 parents 5ac9ce1 + 770c177
commit bb6ad2b
Show file tree

Hide file tree

Showing 16 changed files with 5,537 additions and 1,172 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -2,8 +2,19 @@ language: python
 env:
   - TOXENV=py27-dj15
   - TOXENV=py27-dj16
+  - TOXENV=py27-dj17
+  - TOXENV=py27-dj18
+  - TOXENV=py27-dj19
   - TOXENV=py33-dj15
   - TOXENV=py33-dj16
+  - TOXENV=py33-dj17
+  - TOXENV=py34-dj15
+  - TOXENV=py34-dj16
+  - TOXENV=py34-dj17
+  - TOXENV=py34-dj18
+  - TOXENV=py34-dj19
+  - TOXENV=py35-dj18
+  - TOXENV=py35-dj19
   - TOXENV=flake8
   - TOXENV=sphinx
   - TOXENV=readme

diff --git a/CHANGELOG b/CHANGELOG
@@ -8,7 +8,8 @@ future releases, check `milestones`_ and :doc:`/about/vision`.
 0.5 (unreleased)
 ----------------
 
-- Nothing changed yet.
+- Features #3, #31, #32 and bug #30 - Introduced support for Django 1.7 to 1.9
+  and Python 3.5.
 
 
 0.4 (2015-12-11)

diff --git a/INSTALL b/INSTALL
@@ -13,7 +13,13 @@ If you want to install a development environment, you should go to
 Prerequisites
 *************
 
-* `Python`_ 2.7, 3.3
+* `Python`_ 2.7, 3.3, 3.4, 3.5
+
+.. warning::
+
+   Django>=1.8 no longer supports Python 3.3, and Django<1.8 does not support
+   Python 3.5. As an example, `django-confit` can't work with Django 1.7 and
+   Python 3.5.
 
 
 ************

diff --git a/demo/django_confit_demo/tests.py b/demo/django_confit_demo/tests.py
@@ -11,7 +11,7 @@ def test_settings(self):
         # Local settings (JSON file).
         self.assertEqual(settings.SECRET_KEY, 'fake secret')
         # Test settings (YAML file).
-        self.assertTrue('--rednose' in settings.NOSE_ARGS)
+        self.assertTrue('--tests=django_confit_demo' in settings.NOSE_ARGS)
 
     def test_custom_schema(self):
         """Custom DjangoConfitDemoConfigurationSchema was loaded."""

diff --git a/demo/etc/test_settings.yaml b/demo/etc/test_settings.yaml
@@ -1,6 +1,5 @@
 DEBUG: True
 NOSE_ARGS:
-  - "--rednose"
   - "--verbosity=2"
   - "--nocapture"
   - "--with-doctest"

diff --git a/demo/setup.py b/demo/setup.py
@@ -26,7 +26,6 @@
     'coverage',
     'django-confit',
     'django-nose',
-    'rednose',
 ]
 ENTRY_POINTS = {
     'console_scripts': ['django-confit-demo = django_confit_demo.manage:main']

diff --git a/django_confit/schemas/__init__.py b/django_confit/schemas/__init__.py
@@ -2,30 +2,30 @@
 from __future__ import absolute_import
 import warnings
 
-import django
+import django as django_lib
 
 from django_confit.utils.importlib import import_member
 
 
 def get_django_schema_class():
     """Return colander schema class for current (installed) Django version."""
     schema_import_path = \
-        'django_confit.schemas.django' \
+        'django_confit.schemas.django.django_{major}_{minor}' \
         '.Django{major}_{minor}_{micro}ConfigurationSchema' \
         .format(
-            major=django.VERSION[0],
-            minor=django.VERSION[1],
-            micro=django.VERSION[2])
+            major=django_lib.VERSION[0],
+            minor=django_lib.VERSION[1],
+            micro=django_lib.VERSION[2])
     try:
         return import_member(schema_import_path)
     except ImportError as e:
         raise ImportError(
             'Could not import "{schema_path}". '
-            'Django version {version} is not supported by django_confit. \n'
+            'Django version {version:s} is not supported by django_confit. \n'
             '{exception}'
             .format(
                 schema_path=schema_import_path,
-                version=django.get_version(),
+                version=django_lib.VERSION,
                 exception=e,
             )
         )