From 373df56d36891b9ab1f88519bf9e8f3c0b3bb108 Mon Sep 17 00:00:00 2001 From: Ramiro Morales Date: Fri, 26 Oct 2012 22:01:34 -0300 Subject: [PATCH] Advanced version identifiers for 1.6 cycle. --- django/__init__.py | 2 +- docs/conf.py | 18 +++++++++++++++--- 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/django/__init__.py b/django/__init__.py index 32e1374765..873c328add 100644 --- 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 index 433fd679a1..6dd84cffba 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -52,11 +52,23 @@ copyright = 'Django Software Foundation and contributors' # 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.