Advanced version identifiers for 1.5 development cycle.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@17860 bcc190cf-cafb-0310-a4f2-bffc1f526a37
django · Mar 31, 2012 · f38cf60 · f38cf60
1 parent 89b66ef
commit f38cf60
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/django/__init__.py b/django/__init__.py
@@ -1,4 +1,4 @@
-VERSION = (1, 4, 0, 'final', 0)
+VERSION = (1, 5, 0, 'alpha', 0)
 
 def get_version(version=None):
     """Derives a PEP386-compliant version number from VERSION."""

diff --git a/docs/conf.py b/docs/conf.py
@@ -50,11 +50,11 @@
 # built documents.
 #
 # The short X.Y version.
-version = '1.4'
+version = '1.5'
 # The full version, including alpha/beta/rc tags.
-release = '1.4'
+release = '1.5'
 # The next version to be released
-django_next_version = '1.5'
+django_next_version = '1.6'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.