diff options
| author | James Bennett <ubernostrum@gmail.com> | 2012-03-23 16:53:23 +0000 |
|---|---|---|
| committer | James Bennett <ubernostrum@gmail.com> | 2012-03-23 16:53:23 +0000 |
| commit | 2591fb8d4c0246f68b79554976c012039df75359 (patch) | |
| tree | f1c0e733fa7cfd92dcfdc1c7ece380b5c7aa2567 | |
| parent | a033d4992cc651e8dade81c87cc687911e8d63fe (diff) | |
Bump trunk to 1.4.1.4
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17799 bcc190cf-cafb-0310-a4f2-bffc1f526a37
| -rw-r--r-- | django/__init__.py | 2 | ||||
| -rw-r--r-- | docs/conf.py | 4 | ||||
| -rw-r--r-- | setup.py | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/django/__init__.py b/django/__init__.py index 34cb7db6a6..a410fbaec2 100644 --- 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 index e845faca7b..2e1a5a41e9 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -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. @@ -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', |