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

Bump trunk to 1.4. 

git-svn-id: http://code.djangoproject.com/svn/django/trunk@17799 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
James Bennett 2012-03-23 16:53:23 +00:00
parent a033d4992c
commit 2591fb8d4c
3 changed files with 5 additions and 5 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', 2) VERSION = (1, 4, 0, 'final', 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."""

4
docs/conf.py
View File

@ -52,9 +52,9 @@ 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 2' release = '1.4'
# The next version to be released # The next version to be released
django_next_version = '1.4' django_next_version = '1.5'
# The language for content autogenerated by Sphinx. Refer to documentation # The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages. # for a list of supported languages.

4
setup.py
View File

@ -75,13 +75,13 @@ 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.4c2.tar.gz', download_url = 'https://www.djangoproject.com/m/releases/1.4/Django-1.4.tar.gz',
packages = packages, packages = packages,
cmdclass = cmdclasses, cmdclass = cmdclasses,
data_files = data_files, data_files = data_files,
scripts = ['django/bin/django-admin.py'], scripts = ['django/bin/django-admin.py'],
classifiers = [ classifiers = [
'Development Status :: 4 - Beta', 'Development Status :: 5 - Production/Stable',
'Environment :: Web Environment', 'Environment :: Web Environment',
'Framework :: Django', 'Framework :: Django',
'Intended Audience :: Developers', 'Intended Audience :: Developers',