summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJames Bennett <ubernostrum@gmail.com>2012-02-16 04:01:58 +0000
committerJames Bennett <ubernostrum@gmail.com>2012-02-16 04:01:58 +0000
commit50c64ed37966699e49d475202bbe1d5049471f46 (patch)
tree861cf9c248f98a83505816f1aafcfd18d1985f69
parent46671e9b6856be277cd7a82053faae8633ac7ea7 (diff)
Accommodate new version numbering scheme.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17532 bcc190cf-cafb-0310-a4f2-bffc1f526a37
-rw-r--r--docs/releases/1.4-beta-1.txt17
-rw-r--r--setup.py2
2 files changed, 18 insertions, 1 deletions
diff --git a/docs/releases/1.4-beta-1.txt b/docs/releases/1.4-beta-1.txt
index 60aae3c6d5..6b65c2c5a4 100644
--- a/docs/releases/1.4-beta-1.txt
+++ b/docs/releases/1.4-beta-1.txt
@@ -24,6 +24,23 @@ and we've `begun the deprecation process for some features`_.
.. _backwards incompatible changes: `Backwards incompatible changes in 1.4`_
.. _begun the deprecation process for some features: `Features deprecated in 1.4`_
+
+Version numbering
+=================
+
+Internally, Django's version number is represented by the tuple
+``django.VERSION``. This is used to generate human-readable version
+number strings; as of Django 1.4 beta 1, the algorithm for generating
+these strings has been changed to match the recommendations of `PEP
+386 <http://www.python.org/dev/peps/pep-0386/>`. This only affects the
+human-readable strings identifying Django alphas, betas and release
+candidates, and should not affect end users in any way.
+
+For example purposes, the old algorithm would give Django 1.4 beta 1 a
+version string of the form "1.4 beta 1". The new algorithm generates
+the version string "1.4b1".
+
+
Python compatibility
====================
diff --git a/setup.py b/setup.py
index 4539d7b0a8..610686eeeb 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-beta-1.tar.gz',
+ download_url = 'https://www.djangoproject.com/m/releases/1.4/Django-1.4-b1.tar.gz',
packages = packages,
cmdclass = cmdclasses,
data_files = data_files,