summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJames Bennett <james@b-list.org>2013-11-06 08:17:26 -0600
committerJames Bennett <james@b-list.org>2013-11-06 08:17:26 -0600
commit30eb916bdb9b6b9fc881dfda919b49d036953a3b (patch)
tree5dccd88c9838305614d5df808fb9ac37fcc397f9
parent848a7594748c0124a208425dbf0fd2cc861995c3 (diff)
[1.4.x] Bump version info and add release notes for 1.4.10.1.4.10
-rw-r--r--django/__init__.py2
-rw-r--r--docs/conf.py4
-rw-r--r--docs/releases/1.4.10.txt12
-rw-r--r--setup.py2
4 files changed, 16 insertions, 4 deletions
diff --git a/django/__init__.py b/django/__init__.py
index 7b149e61ff..6ec73911af 100644
--- a/django/__init__.py
+++ b/django/__init__.py
@@ -1,4 +1,4 @@
-VERSION = (1, 4, 10, 'alpha', 0)
+VERSION = (1, 4, 10, 'final', 0)
def get_version(version=None):
"""Derives a PEP386-compliant version number from VERSION."""
diff --git a/docs/conf.py b/docs/conf.py
index cc01014dff..6e25feebb7 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -50,9 +50,9 @@ copyright = 'Django Software Foundation and contributors'
# built documents.
#
# The short X.Y version.
-version = '1.4.8'
+version = '1.4.10'
# The full version, including alpha/beta/rc tags.
-release = '1.4.9'
+release = '1.4.10'
# The next version to be released
django_next_version = '1.5'
diff --git a/docs/releases/1.4.10.txt b/docs/releases/1.4.10.txt
new file mode 100644
index 0000000000..59d1646d0b
--- /dev/null
+++ b/docs/releases/1.4.10.txt
@@ -0,0 +1,12 @@
+============================
+ Django 1.4.10 release notes
+============================
+
+*November 6, 2013*
+
+Django 1.4.10 fixes a Python-compatibility bug in the 1.4 series.
+
+Python compatibility
+--------------------
+
+Django 1.4.9 inadvertently introduced issues with Python 2.5 compatibility. Django 1.4.10 restores Python 2.5 compatibility. This was issue #21362 in Django's Trac. \ No newline at end of file
diff --git a/setup.py b/setup.py
index d0403af5b8..da5f86a820 100644
--- a/setup.py
+++ b/setup.py
@@ -75,7 +75,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.4/Django-1.4.9.tar.gz',
+ download_url = 'https://www.djangoproject.com/m/releases/1.4/Django-1.4.10.tar.gz',
packages = packages,
cmdclass = cmdclasses,
data_files = data_files,