summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Graham <timograham@gmail.com>2015-01-13 13:14:08 -0500
committerTim Graham <timograham@gmail.com>2015-01-13 13:14:08 -0500
commitbd9dcd226b5b11fa40668553d26ce06000b3be75 (patch)
tree0dc8bc635ce3ff2bea532027fd91336bace4d950
parent88b7957b34b2305ece54a3aab57a87701279a1d8 (diff)
downloaddjango-bd9dcd226b5b11fa40668553d26ce06000b3be75.tar.gz
[1.4.x] Bumped version for 1.4.18 release.1.4.18
-rw-r--r--django/__init__.py2
-rw-r--r--docs/conf.py4
-rw-r--r--setup.py2
3 files changed, 4 insertions, 4 deletions
diff --git a/django/__init__.py b/django/__init__.py
index cfbcb02d95..e4e9e6c4ae 100644
--- a/django/__init__.py
+++ b/django/__init__.py
@@ -1,4 +1,4 @@
-VERSION = (1, 4, 18, 'alpha', 0)
+VERSION = (1, 4, 18, '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 cebde343c6..154e48e2fe 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.17'
+version = '1.4.18'
# The full version, including alpha/beta/rc tags.
-release = '1.4.17'
+release = '1.4.18'
# The next version to be released
django_next_version = '1.5'
diff --git a/setup.py b/setup.py
index d181f3bfdd..0694ee28e8 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.17.tar.gz',
+ download_url = 'https://www.djangoproject.com/m/releases/1.4/Django-1.4.18.tar.gz',
packages = packages,
cmdclass = cmdclasses,
data_files = data_files,