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:
parent
a033d4992c
commit
2591fb8d4c
|
@ -1,4 +1,4 @@
|
|||
VERSION = (1, 4, 0, 'rc', 2)
|
||||
VERSION = (1, 4, 0, 'final', 2)
|
||||
|
||||
def get_version(version=None):
|
||||
"""Derives a PEP386-compliant version number from VERSION."""
|
||||
|
|
|
@ -52,9 +52,9 @@ copyright = 'Django Software Foundation and contributors'
|
|||
# The short X.Y version.
|
||||
version = '1.4'
|
||||
# The full version, including alpha/beta/rc tags.
|
||||
release = '1.4 rc 2'
|
||||
release = '1.4'
|
||||
# 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
|
||||
# for a list of supported languages.
|
||||
|
|
4
setup.py
4
setup.py
|
@ -75,13 +75,13 @@ setup(
|
|||
author = 'Django Software Foundation',
|
||||
author_email = 'foundation@djangoproject.com',
|
||||
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,
|
||||
cmdclass = cmdclasses,
|
||||
data_files = data_files,
|
||||
scripts = ['django/bin/django-admin.py'],
|
||||
classifiers = [
|
||||
'Development Status :: 4 - Beta',
|
||||
'Development Status :: 5 - Production/Stable',
|
||||
'Environment :: Web Environment',
|
||||
'Framework :: Django',
|
||||
'Intended Audience :: Developers',
|
||||
|
|
Loading…
Reference in New Issue