prepare 0.1.7; add django 1.10 comparision

.gitignore

@@ -5,6 +5,7 @@
 .hgtags
 .tox/
 .travis.yml~
+.idea/
 
 MANIFEST.in~
 tmp/
@@ -25,5 +26,5 @@ tmp/
 /dist/
 /var/
 /src/django_nine.egg-info
-/examples/simple/local_settings.py
+/examples/simple/simple/local_settings.py
 /examples/simple/db.sqlite3

.hgignore

@@ -5,6 +5,7 @@ syntax: regexp
 \.git/
 \.tox/
 \.travis\.yml~
+\.idea/
 
 ^MANIFEST\.in~
 ^tmp/
@@ -26,3 +27,5 @@ syntax: regexp
 ^dist/
 ^src/django_nine\.egg-info
 ^examples/simple/db.sqlite3
+^examples/simple/simple/local_settings.py
+

CHANGELOG.rst

@@ -15,6 +15,12 @@ are used for versioning (schema follows below):
   0.3.2 to 0.4).
 - All backwards incompatible changes are mentioned in this document.
 
+0.1.7
+-----
+2015-12-18
+
+- Added Django 1.10 version comparison.
+
 0.1.6
 -----
 2015-10-25

examples/simple/simple/local_settings.example

@@ -0,0 +1 @@
+DEV = True

examples/simple/simple/settings.py

@@ -21,6 +21,7 @@
 
 # SECURITY WARNING: don't run with debug turned on in production!
 DEBUG = True
+DEV = False
 
 TEMPLATE_DEBUG = True
 
@@ -81,3 +82,14 @@
 # https://docs.djangoproject.com/en/1.7/howto/static-files/
 
 STATIC_URL = '/static/'
+
+# Do not put any settings below this line
+try:
+    from local_settings import *
+except Exception as err:
+    pass
+
+# Make the `django-nine` package available without installation.
+if DEV:
+    import sys
+    sys.path.insert(0, os.path.abspath('../../src'))

setup.py

@@ -8,7 +8,7 @@
 except:
     readme = ''
 
-version = '0.1.6'
+version = '0.1.7'
 
 install_requires = [
     #'Django',
@@ -40,6 +40,8 @@
         "Programming Language :: Python :: 2.7",
         "Programming Language :: Python :: 3",
         "Programming Language :: Python :: 3.3",
+        "Programming Language :: Python :: 3.4",
+        "Programming Language :: Python :: 3.5",
         "Environment :: Web Environment",
         "License :: OSI Approved :: GNU General Public License v2 (GPLv2)",
         "License :: OSI Approved :: GNU Lesser General Public License v2 or later (LGPLv2+)",

src/nine/__init__.py

@@ -1,6 +1,6 @@
 __title__ = 'django-nine'
-__version__ = '0.1.6'
-__build__ = 0x000007
+__version__ = '0.1.7'
+__build__ = 0x000008
 __author__ = 'Artur Barseghyan <artur.barseghyan@gmail.com>'
 __copyright__ = 'Copyright (c) 2015 Artur Barseghyan'
 __license__ = 'GPL 2.0/LGPL 2.1'

src/nine/tests/test_versions.py

@@ -192,6 +192,41 @@ def test_django_1_8_a1(self):
         self.assertTrue(versions.DJANGO_GTE_1_8)
         self.assertTrue(not versions.DJANGO_GTE_1_9)
 
+    @print_info
+    @mock.patch('django.get_version', mock.MagicMock(return_value='1.10'))
+    def test_django_1_10(self):
+        """
+        Tests as if we were using Django==1.10.
+        """
+        from nine import versions
+        reload(versions)
+
+        # Exact version matching
+        self.assertTrue(not versions.DJANGO_1_4)
+        self.assertTrue(not versions.DJANGO_1_5)
+        self.assertTrue(not versions.DJANGO_1_6)
+        self.assertTrue(not versions.DJANGO_1_7)
+        self.assertTrue(not versions.DJANGO_1_8)
+        self.assertTrue(not versions.DJANGO_1_9)
+        self.assertTrue(versions.DJANGO_1_10)
+
+        # Less than or equal matching
+        self.assertTrue(not versions.DJANGO_LTE_1_4)
+        self.assertTrue(not versions.DJANGO_LTE_1_5)
+        self.assertTrue(not versions.DJANGO_LTE_1_6)
+        self.assertTrue(not versions.DJANGO_LTE_1_7)
+        self.assertTrue(not versions.DJANGO_LTE_1_8)
+        self.assertTrue(not versions.DJANGO_LTE_1_9)
+
+        # Greater than or equal matching
+        self.assertTrue(versions.DJANGO_GTE_1_4)
+        self.assertTrue(versions.DJANGO_GTE_1_5)
+        self.assertTrue(versions.DJANGO_GTE_1_6)
+        self.assertTrue(versions.DJANGO_GTE_1_7)
+        self.assertTrue(versions.DJANGO_GTE_1_8)
+        self.assertTrue(versions.DJANGO_GTE_1_9)
+        self.assertTrue(versions.DJANGO_GTE_1_10)
+
 
 if __name__ == "__main__":
     unittest.main()

src/nine/versions.py

@@ -11,37 +11,44 @@
     'LOOSE_DJANGO_VERSION', 'LOOSE_DJANGO_MINOR_VERSION',
 
     'DJANGO_1_4', 'DJANGO_1_5', 'DJANGO_1_6', 'DJANGO_1_7', 'DJANGO_1_8',
-    'DJANGO_1_9', 'DJANGO_2_0',
+    'DJANGO_1_9', 'DJANGO_1_10', 'DJANGO_1_11', 'DJANGO_2_0',
 
     'DJANGO_GTE_1_4', 'DJANGO_GTE_1_5', 'DJANGO_GTE_1_6', 'DJANGO_GTE_1_7',
-    'DJANGO_GTE_1_8', 'DJANGO_GTE_1_9', 'DJANGO_GTE_2_0',
+    'DJANGO_GTE_1_8', 'DJANGO_GTE_1_9', 'DJANGO_GTE_1_10', 'DJANGO_GTE_1_11',
+    'DJANGO_GTE_2_0',
 
     'DJANGO_LTE_1_4', 'DJANGO_LTE_1_5', 'DJANGO_LTE_1_6', 'DJANGO_LTE_1_7',
-    'DJANGO_LTE_1_8', 'DJANGO_LTE_1_9', 'DJANGO_LTE_2_0',
+    'DJANGO_LTE_1_8', 'DJANGO_LTE_1_9', 'DJANGO_LTE_1_10', 'DJANGO_LTE_1_11',
+    'DJANGO_LTE_2_0',
 )
 
 from distutils.version import LooseVersion
 
 import django
 
 LOOSE_DJANGO_VERSION = LooseVersion(django.get_version())
-LOOSE_DJANGO_MINOR_VERSION = LooseVersion('.'.join([str(i) for i in LOOSE_DJANGO_VERSION.version[0:2]]))
+LOOSE_DJANGO_MINOR_VERSION = LooseVersion(
+    '.'.join([str(i) for i in LOOSE_DJANGO_VERSION.version[0:2]])
+)
 LOOSE_VERSION_1_4 = LooseVersion('1.4')
 LOOSE_VERSION_1_5 = LooseVersion('1.5')
 LOOSE_VERSION_1_6 = LooseVersion('1.6')
 LOOSE_VERSION_1_7 = LooseVersion('1.7')
 LOOSE_VERSION_1_8 = LooseVersion('1.8')
 LOOSE_VERSION_1_9 = LooseVersion('1.9')
+LOOSE_VERSION_1_10 = LooseVersion('1.10')
+LOOSE_VERSION_1_11 = LooseVersion('1.11')
 LOOSE_VERSION_2_0 = LooseVersion('2.0')
-LOOSE_VERSION_2_1 = LooseVersion('2.0')
+LOOSE_VERSION_2_1 = LooseVersion('2.1')
 
 # Exact versions
 DJANGO_1_4 = LOOSE_VERSION_1_4 <= LOOSE_DJANGO_VERSION < LOOSE_VERSION_1_5
 DJANGO_1_5 = LOOSE_VERSION_1_5 <= LOOSE_DJANGO_VERSION < LOOSE_VERSION_1_6
 DJANGO_1_6 = LOOSE_VERSION_1_6 <= LOOSE_DJANGO_VERSION < LOOSE_VERSION_1_7
 DJANGO_1_7 = LOOSE_VERSION_1_7 <= LOOSE_DJANGO_VERSION < LOOSE_VERSION_1_8
 DJANGO_1_8 = LOOSE_VERSION_1_8 <= LOOSE_DJANGO_VERSION < LOOSE_VERSION_1_9
-DJANGO_1_9 = LOOSE_VERSION_1_9 <= LOOSE_DJANGO_VERSION < LOOSE_VERSION_2_0
+DJANGO_1_9 = LOOSE_VERSION_1_9 <= LOOSE_DJANGO_VERSION < LOOSE_VERSION_1_10
+DJANGO_1_10 = LOOSE_VERSION_1_10 <= LOOSE_DJANGO_VERSION < LOOSE_VERSION_1_11
 DJANGO_2_0 = LOOSE_VERSION_2_0 <= LOOSE_DJANGO_VERSION < LOOSE_VERSION_2_1
 
 # LTE list
@@ -51,6 +58,7 @@
 DJANGO_LTE_1_7 = LOOSE_DJANGO_MINOR_VERSION <= LOOSE_VERSION_1_7
 DJANGO_LTE_1_8 = LOOSE_DJANGO_MINOR_VERSION <= LOOSE_VERSION_1_8
 DJANGO_LTE_1_9 = LOOSE_DJANGO_MINOR_VERSION <= LOOSE_VERSION_1_9
+DJANGO_LTE_1_10 = LOOSE_DJANGO_MINOR_VERSION <= LOOSE_VERSION_1_10
 DJANGO_LTE_2_0 = LOOSE_DJANGO_MINOR_VERSION <= LOOSE_VERSION_2_0
 
 # GTE list
@@ -60,4 +68,5 @@
 DJANGO_GTE_1_7 = LOOSE_DJANGO_MINOR_VERSION >= LOOSE_VERSION_1_7
 DJANGO_GTE_1_8 = LOOSE_DJANGO_MINOR_VERSION >= LOOSE_VERSION_1_8
 DJANGO_GTE_1_9 = LOOSE_DJANGO_MINOR_VERSION >= LOOSE_VERSION_1_9
+DJANGO_GTE_1_10 = LOOSE_DJANGO_MINOR_VERSION >= LOOSE_VERSION_1_10
 DJANGO_GTE_2_0 = LOOSE_DJANGO_MINOR_VERSION >= LOOSE_VERSION_2_0