test0908
/
django
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Bump trunk to 1.4 RC 2. 

git-svn-id: http://code.djangoproject.com/svn/django/trunk@17740 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
James Bennett 2012-03-15 03:29:49 +00:00
parent a935e83443
commit e6ae858811
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
django/__init__.py
View File

@ -1,4 +1,4 @@
VERSION = (1, 4, 0, 'rc', 1) VERSION = (1, 4, 0, 'rc', 2)
def get_version(version=None): def get_version(version=None):
"""Derives a PEP386-compliant version number from VERSION.""" """Derives a PEP386-compliant version number from VERSION."""

2
docs/conf.py
View File

@ -52,7 +52,7 @@ copyright = 'Django Software Foundation and contributors'
# The short X.Y version. # The short X.Y version.
version = '1.4' version = '1.4'
# The full version, including alpha/beta/rc tags. # The full version, including alpha/beta/rc tags.
release = '1.4 rc 1' release = '1.4 rc 2'
# The next version to be released # The next version to be released
django_next_version = '1.4' django_next_version = '1.4'

2
setup.py
View File

@ -75,7 +75,7 @@ setup(
author = 'Django Software Foundation', author = 'Django Software Foundation',
author_email = 'foundation@djangoproject.com', author_email = 'foundation@djangoproject.com',
description = 'A high-level Python Web framework that encourages rapid development and clean, pragmatic design.', description = 'A high-level Python Web framework that encourages rapid development and clean, pragmatic design.',
download_url = 'https://www.djangoproject.com/m/releases/1.4/Django-1.4c1.tar.gz', download_url = 'https://www.djangoproject.com/m/releases/1.4/Django-1.4c2.tar.gz',
packages = packages, packages = packages,
cmdclass = cmdclasses, cmdclass = cmdclasses,
data_files = data_files, data_files = data_files,