Implemented PEP386-compatible version numbers. Thanks Jannis for the guidance.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@17357 bcc190cf-cafb-0310-a4f2-bffc1f526a37

4 files changed, 27 insertions, 2 deletions

diff --git a/tests/regressiontests/admin_scripts/tests.py b/tests/regressiontests/admin_scripts/tests.py
index 948eb3a659..0a7c56c86e 100644
--- a/tests/regressiontests/admin_scripts/tests.py
+++ b/tests/regressiontests/admin_scripts/tests.py
@@ -1177,8 +1177,7 @@ class CommandTypes(AdminScriptTestCase):
         args = ['--version']
         out, err = self.run_manage(args)
         self.assertNoOutput(err)
-        # Only check the first part of the version number
-        self.assertOutput(out, get_version().split('-')[0])
+        self.assertOutput(out, get_version())
 
     def test_help(self):
         "--help is handled as a special case"
diff --git a/tests/regressiontests/version/__init__.py b/tests/regressiontests/version/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/tests/regressiontests/version/__init__.py
diff --git a/tests/regressiontests/version/models.py b/tests/regressiontests/version/models.py
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/tests/regressiontests/version/models.py
diff --git a/tests/regressiontests/version/tests.py b/tests/regressiontests/version/tests.py
new file mode 100644
index 0000000000..1a67483c1f
--- /dev/null
+++ b/tests/regressiontests/version/tests.py
@@ -0,0 +1,26 @@
+import re
+
+from django import get_version
+from django.utils.unittest import TestCase
+
+class VersionTests(TestCase):
+
+    def test_development(self):
+        ver_tuple = (1, 4, 0, 'alpha', 0)
+        # This will return a different result when it's run within or outside
+        # of a SVN checkout: 1.4.devNNNNN or 1.4.
+        ver_string = get_version(ver_tuple)
+        self.assertRegexpMatches(ver_string, r'1\.4(\.dev\d+)?')
+
+    def test_releases(self):
+        tuples_to_strings = (
+            ((1, 4, 0, 'alpha', 1), '1.4a1'),
+            ((1, 4, 0, 'beta', 1), '1.4b1'),
+            ((1, 4, 0, 'rc', 1), '1.4c1'),
+            ((1, 4, 0, 'final', 0), '1.4'),
+            ((1, 4, 1, 'rc', 2), '1.4.1c2'),
+            ((1, 4, 1, 'final', 0), '1.4.1'),
+        )
+        for ver_tuple, ver_string in tuples_to_strings:
+            self.assertEqual(get_version(ver_tuple), ver_string)
+