Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Advanced version identifiers for 1.6 cycle.

  • Loading branch information...
commit 373df56d36891b9ab1f88519bf9e8f3c0b3bb108 1 parent 11699ac
@ramiro ramiro authored
Showing with 16 additions and 4 deletions.
  1. +1 −1  django/__init__.py
  2. +15 −3 docs/conf.py
View
2  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.
View
18 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.

1 comment on commit 373df56

@timgraham
Owner

This still doesn't work properly -- could you offer your input on the current ticket?

Please sign in to comment.
Something went wrong with that request. Please try again.