Commit f38cf60c authored by Ramiro Morales's avatar Ramiro Morales
Browse files

Advanced version identifiers for 1.5 development cycle. 

git-svn-id: http://code.djangoproject.com/svn/django/trunk@17860 bcc190cf-cafb-0310-a4f2-bffc1f526a37
parent 89b66efa

django/__init__.py

+1 −1
Original line number Diff line number Diff line 
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."""

docs/conf.py

+3 −3
Original line number Diff line number Diff line
@@ -50,11 +50,11 @@ copyright = 'Django Software Foundation and contributors' 
# 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.