Advanced version identifiers for 1.6 cycle.

django · Oct 27, 2012 · 373df56 · 373df56 · timgraham · Dec 31, 2013
1 parent 11699ac
commit 373df56
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 4 deletions.
diff --git a/django/__init__.py b/django/__init__.py
@@ -1,4 +1,4 @@
-VERSION = (1, 5, 0, 'alpha', 0)
+VERSION = (1, 6, 0, 'alpha', 0)
 
 def get_version(*args, **kwargs):
     # Don't litter django/__init__.py with all the get_version stuff.

diff --git a/docs/conf.py b/docs/conf.py
@@ -52,11 +52,23 @@
 # built documents.
 #
 # The short X.Y version.
-version = '1.5'
+version = '1.6'
 # The full version, including alpha/beta/rc tags.
-release = '1.5'
+try:
+    from django import VERSION, get_version
+except ImportError:
+    release = version
+else:
+    def django_release():
+        pep386ver = get_version()
+        if VERSION[3:5] == ('alpha', 0) and 'dev' not in pep386ver:
+            return pep386ver + '.dev'
+        return pep386ver
+
+    release = django_release()
+
 # The next version to be released
-django_next_version = '1.6'
+django_next_version = '1.7'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.