summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJames Bennett <james@b-list.org>2013-02-26 13:06:35 -0600
committerJames Bennett <james@b-list.org>2013-02-26 13:06:35 -0600
commite7f2c6f2d7bf6687a058f6bdcc2f17e372c2d729 (patch)
tree1a492071141428c7f1d1ae4a3178821e2fb6a374
parent702d39921cb95883d3b7590eadd65b03f76d0f92 (diff)
[1.5.x] Bump version numbers for Django 1.5 release.
-rw-r--r--django/__init__.py2
-rw-r--r--docs/conf.py2
-rw-r--r--docs/releases/1.5.txt6
-rw-r--r--setup.py2
4 files changed, 6 insertions, 6 deletions
diff --git a/django/__init__.py b/django/__init__.py
index 859e064585..4dba0dce00 100644
--- a/django/__init__.py
+++ b/django/__init__.py
@@ -1,4 +1,4 @@
-VERSION = (1, 5, 0, 'rc', 2)
+VERSION = (1, 5, 0, 'final', 2)
def get_version(*args, **kwargs):
# Don't litter django/__init__.py with all the get_version stuff.
diff --git a/docs/conf.py b/docs/conf.py
index b400729401..0f0f28f787 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -54,7 +54,7 @@ copyright = 'Django Software Foundation and contributors'
# The short X.Y version.
version = '1.5'
# The full version, including alpha/beta/rc tags.
-release = '1.5c2'
+release = '1.5'
# The next version to be released
django_next_version = '1.6'
diff --git a/docs/releases/1.5.txt b/docs/releases/1.5.txt
index c965af4228..b8801f7db8 100644
--- a/docs/releases/1.5.txt
+++ b/docs/releases/1.5.txt
@@ -1,6 +1,6 @@
-============================================
-Django 1.5 release notes - UNDER DEVELOPMENT
-============================================
+========================
+Django 1.5 release notes
+========================
Welcome to Django 1.5!
diff --git a/setup.py b/setup.py
index 3b85647f8c..d117352cba 100644
--- a/setup.py
+++ b/setup.py
@@ -90,7 +90,7 @@ 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.5/Django-1.5c2.tar.gz',
+ download_url = 'https://www.djangoproject.com/m/releases/1.5/Django-1.5.tar.gz',
license = "BSD",
packages = packages,
cmdclass = cmdclasses,