prepare 0.1.8; unify versions

barseghyanartur · Jul 11, 2016 · 1cb3e75 · 1cb3e75
1 parent 94ebee6
commit 1cb3e75
Show file tree

Hide file tree

Showing 7 changed files with 88 additions and 87 deletions.
diff --git a/CHANGELOG.rst b/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.8
+-----
+2016-07-11
+
+- Unify comparison versions list generation.
+
 0.1.7
 -----
 2015-12-18

diff --git a/setup.py b/setup.py
@@ -8,7 +8,7 @@
 except:
     readme = ''
 
-version = '0.1.7'
+version = '0.1.8'
 
 install_requires = [
     #'Django',
@@ -31,11 +31,11 @@
     pass
 
 setup(
-    name = 'django-nine',
-    version = version,
-    description = ("Compatibility library for Django."),
-    long_description = "{0}".format(readme),
-    classifiers = [
+    name='django-nine',
+    version=version,
+    description=("Compatibility library for Django."),
+    long_description="{0}".format(readme),
+    classifiers=[
         "Programming Language :: Python :: 2.6",
         "Programming Language :: Python :: 2.7",
         "Programming Language :: Python :: 3",
@@ -50,15 +50,15 @@
         "Operating System :: OS Independent",
         "Development Status :: 4 - Beta",
     ],
-    keywords = 'django, compatibility',
-    author = 'Artur Barseghyan',
-    author_email = 'artur.barseghyan@gmail.com',
-    url = 'https://github.com/barseghyanartur/django-nine/',
-    package_dir = {'': 'src'},
-    packages = find_packages(where='./src'),
-    license = 'GPL 2.0/LGPL 2.1',
-    install_requires = install_requires,
-    tests_require = tests_require,
-    package_data = {},
-    include_package_data = True,
+    keywords='django, compatibility',
+    author='Artur Barseghyan',
+    author_email='artur.barseghyan@gmail.com',
+    url='https://github.com/barseghyanartur/django-nine/',
+    package_dir={'': 'src'},
+    packages=find_packages(where='./src'),
+    license='GPL 2.0/LGPL 2.1',
+    install_requires=install_requires,
+    tests_require=tests_require,
+    package_data={},
+    include_package_data=True,
 )
diff --git a/src/nine/__init__.py b/src/nine/__init__.py
@@ -1,6 +1,6 @@
 __title__ = 'django-nine'
-__version__ = '0.1.7'
-__build__ = 0x000008
+__version__ = '0.1.8'
+__build__ = 0x000009
 __author__ = 'Artur Barseghyan <artur.barseghyan@gmail.com>'
-__copyright__ = 'Copyright (c) 2015 Artur Barseghyan'
+__copyright__ = 'Copyright (c) 2015-2016 Artur Barseghyan'
 __license__ = 'GPL 2.0/LGPL 2.1'
diff --git a/src/nine/tests/base.py b/src/nine/tests/base.py
@@ -2,7 +2,7 @@
 
 __title__ = 'nine.tests.base'
 __author__ = 'Artur Barseghyan'
-__copyright__ = 'Copyright (c) 2015 Artur Barseghyan'
+__copyright__ = 'Copyright (c) 2015-2016 Artur Barseghyan'
 __license__ = 'GPL 2.0/LGPL 2.1'
 __all__ = ('PRINT_INFO', 'TRACK_TIME', 'print_info',)
 

diff --git a/src/nine/tests/test_versions.py b/src/nine/tests/test_versions.py
@@ -1,9 +1,3 @@
-__title__ = 'nine.tests.test_versions'
-__author__ = 'Artur Barseghyan'
-__copyright__ = 'Copyright (c) 2015 Artur Barseghyan'
-__license__ = 'GPL 2.0/LGPL 2.1'
-__all__ = ('VersionsTest',)
-
 import unittest
 import mock
 # For Python3 >= 3.4
@@ -20,6 +14,13 @@
 
 from nine.tests.base import print_info
 
+__title__ = 'nine.tests.test_versions'
+__author__ = 'Artur Barseghyan'
+__copyright__ = 'Copyright (c) 2015 Artur Barseghyan'
+__license__ = 'GPL 2.0/LGPL 2.1'
+__all__ = ('VersionsTest',)
+
+
 class VersionsTest(unittest.TestCase):
     """
     Tests of ``nine.versions`` module.

diff --git a/src/nine/user.py b/src/nine/user.py
@@ -2,12 +2,6 @@
 Compatibility module for safe and sane User model import.
 """
 
-__title__ = 'nine.user'
-__author__ = 'Artur Barseghyan <artur.barseghyan@gmail.com>'
-__copyright__ = 'Copyright (c) 2015 Artur Barseghyan'
-__license__ = 'GPL 2.0/LGPL 2.1'
-__all__ = ('User',)
-
 import importlib
 
 from django.conf import settings
@@ -41,3 +35,9 @@
             "``settings.INSTALLED_APPS``"
             "".format(settings.AUTH_USER_MODEL, user_app_name)
         )
+
+__title__ = 'nine.user'
+__author__ = 'Artur Barseghyan <artur.barseghyan@gmail.com>'
+__copyright__ = 'Copyright (c) 2015-2016 Artur Barseghyan'
+__license__ = 'GPL 2.0/LGPL 2.1'
+__all__ = ('User',)
diff --git a/src/nine/versions.py b/src/nine/versions.py
@@ -1,72 +1,66 @@
 """
-Compatibility module. Contains information about the current Django version in
-use, including (LTE and GTE statements).
+Contains information about the current Django version in use, including (LTE
+and GTE).
 """
 
+from distutils.version import LooseVersion
+
+import django
+
 __title__ = 'nine.versions'
 __author__ = 'Artur Barseghyan <artur.barseghyan@gmail.com>'
-__copyright__ = 'Copyright (c) 2015 Artur Barseghyan'
+__copyright__ = 'Copyright (c) 2015-2016 Artur Barseghyan'
 __license__ = 'GPL 2.0/LGPL 2.1'
-__all__ = (
+__all__ = [
     '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_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_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_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_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.1')
+
+# Loose versions
+LOOSE_VERSIONS = (
+    '1.4', '1.5', '1.6', '1.7', '1.8', '1.9', '1.10', '1.11', '2.0', '2.1',
+)
+
+for v in LOOSE_VERSIONS:
+    var_name = 'LOOSE_VERSION_{0}'.format(v.replace('.', '_'))
+    globals()[var_name] = LooseVersion(v)
+    __all__.append(var_name)
 
 # 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_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
+EXACT_VERSIONS = LOOSE_VERSIONS[:-1]
+
+for i, v in enumerate(EXACT_VERSIONS):
+    l_cur = globals()['LOOSE_VERSION_{0}' \
+                      ''.format(LOOSE_VERSIONS[i].replace('.', '_'))]
+    l_nxt = globals()['LOOSE_VERSION_{0}' \
+                      ''.format(LOOSE_VERSIONS[i+1].replace('.', '_'))]
+    var_name = 'DJANGO_{0}'.format(v.replace('.', '_'))
+    globals()[var_name] = (l_cur <= LOOSE_DJANGO_VERSION < l_nxt)
+    __all__.append(var_name)
 
 # LTE list
-DJANGO_LTE_1_4 = LOOSE_DJANGO_MINOR_VERSION <= LOOSE_VERSION_1_4
-DJANGO_LTE_1_5 = LOOSE_DJANGO_MINOR_VERSION <= LOOSE_VERSION_1_5
-DJANGO_LTE_1_6 = LOOSE_DJANGO_MINOR_VERSION <= LOOSE_VERSION_1_6
-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
+LTE_VERSIONS = LOOSE_VERSIONS[:-1]
+
+for i, v in enumerate(EXACT_VERSIONS):
+    l_cur = globals()['LOOSE_VERSION_{0}' \
+                      ''.format(LOOSE_VERSIONS[i].replace('.', '_'))]
+    var_name = 'DJANGO_LTE_{0}'.format(v.replace('.', '_'))
+    globals()[var_name] = (LOOSE_DJANGO_MINOR_VERSION <= l_cur)
 
 # GTE list
-DJANGO_GTE_1_4 = LOOSE_DJANGO_MINOR_VERSION >= LOOSE_VERSION_1_4
-DJANGO_GTE_1_5 = LOOSE_DJANGO_MINOR_VERSION >= LOOSE_VERSION_1_5
-DJANGO_GTE_1_6 = LOOSE_DJANGO_MINOR_VERSION >= LOOSE_VERSION_1_6
-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
+GTE_VERSIONS = LOOSE_VERSIONS[:-1]
+
+for i, v in enumerate(EXACT_VERSIONS):
+    l_cur = globals()['LOOSE_VERSION_{0}' \
+                      ''.format(LOOSE_VERSIONS[i].replace('.', '_'))]
+    var_name = 'DJANGO_GTE_{0}'.format(v.replace('.', '_'))
+    globals()[var_name] = (
+        LOOSE_DJANGO_MINOR_VERSION >= l_cur
+    )
+    __all__.append(var_name)
+
+__all__ = tuple(__all__)