summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJames Bennett <ubernostrum@gmail.com>2011-12-23 04:00:26 +0000
committerJames Bennett <ubernostrum@gmail.com>2011-12-23 04:00:26 +0000
commit0e29e48c0548586e999eea090f2da7f2b03563c6 (patch)
tree64287a287ce4a0feb72adc96ed274365875835cb
parent90e05aaeac612a4251640564aa65f103ac635e12 (diff)
Bump to 1.4 alpha 1.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17255 bcc190cf-cafb-0310-a4f2-bffc1f526a37
-rw-r--r--django/__init__.py2
-rw-r--r--docs/conf.py4
-rw-r--r--setup.py4
3 files changed, 5 insertions, 5 deletions
diff --git a/django/__init__.py b/django/__init__.py
index 994b7cd02c..e790da37f3 100644
--- a/django/__init__.py
+++ b/django/__init__.py
@@ -1,4 +1,4 @@
-VERSION = (1, 4, 0, 'alpha', 0)
+VERSION = (1, 4, 0, 'alpha', 1)
def get_version():
version = '%s.%s' % (VERSION[0], VERSION[1])
diff --git a/docs/conf.py b/docs/conf.py
index 5ea5a06eba..663e84ea99 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.3'
+version = '1.4'
# The full version, including alpha/beta/rc tags.
-release = '1.3'
+release = '1.4 alpha 1'
# The next version to be released
django_next_version = '1.4'
diff --git a/setup.py b/setup.py
index 12c9059255..5526192fdc 100644
--- a/setup.py
+++ b/setup.py
@@ -77,13 +77,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 = 'http://media.djangoproject.com/releases/1.3/Django-1.3.tar.gz',
+ download_url = 'http://media.djangoproject.com/releases/1.3/Django-1.4-alpha-1.tar.gz',
packages = packages,
cmdclass = cmdclasses,
data_files = data_files,
scripts = ['django/bin/django-admin.py'],
classifiers = [
- 'Development Status :: 5 - Production/Stable',
+ 'Development Status :: 3 - Alpha',
'Environment :: Web Environment',
'Framework :: Django',
'Intended Audience :: Developers',