Bump trunk to 1.4.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@17799 bcc190cf-cafb-0310-a4f2-bffc1f526a37
rizumu · Mar 23, 2012 · 2591fb8 · 2591fb8
1 parent a033d49
commit 2591fb8
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/django/__init__.py b/django/__init__.py
@@ -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."""

diff --git a/docs/conf.py b/docs/conf.py
@@ -52,9 +52,9 @@
 # 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.

diff --git a/setup.py b/setup.py
@@ -75,13 +75,13 @@ def fullsplit(path, result=None):
     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',