Merge branch 'release/1.4' into develop

* release/1.4: bump 1.4
saxix · May 2, 2017 · 2c92198 · 2c92198
2 parents 186984e + 3f83bb1
commit 2c92198
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/docs/conf.py b/docs/conf.py
@@ -87,7 +87,7 @@
 version = ".".join(map(str, concurrency.VERSION[0:2]))
 # The full version, including alpha/beta/rc tags.
 release = concurrency.get_version()
-next_version = '1.4'
+next_version = '1.5'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

diff --git a/setup.py b/setup.py
@@ -70,6 +70,8 @@ def run_tests(self):
         'Programming Language :: Python',
         'Framework :: Django :: 1.8',
         'Framework :: Django :: 1.9',
+        'Framework :: Django :: 1.10',
+        'Framework :: Django :: 1.11',
         'Programming Language :: Python :: 2.7',
         'Programming Language :: Python :: 3',
         'Programming Language :: Python :: 3.3',

diff --git a/src/concurrency/__init__.py b/src/concurrency/__init__.py
@@ -5,7 +5,7 @@
 __author__ = 'sax'
 default_app_config = 'concurrency.apps.ConcurrencyConfig'
 
-VERSION = __version__ = (1, 4, 0, 'alpha', 0)
+VERSION = __version__ = (1, 4, 0, 'final', 0)
 NAME = 'django-concurrency'