summaryrefslogtreecommitdiff
path: root/releases
diff options
context:
space:
mode:
authorTim Graham <timograham@gmail.com>2016-05-20 08:36:55 -0400
committerTim Graham <timograham@gmail.com>2016-05-20 08:36:55 -0400
commitccc80b4d4892c3d3841336e791273be825e94d8e (patch)
treefe046d3409dd5eaa0bfe418b0eb31cfeb5f146a8 /releases
parent2dfcbaf4046ad55b5b832af412043f01ec2dbf80 (diff)
Added support for version 1.10 to download page.
Diffstat (limited to 'releases')
-rw-r--r--releases/templatetags/release_notes.py4
-rw-r--r--releases/tests.py16
2 files changed, 17 insertions, 3 deletions
diff --git a/releases/templatetags/release_notes.py b/releases/templatetags/release_notes.py
index 7f9f6066..ba75f1c0 100644
--- a/releases/templatetags/release_notes.py
+++ b/releases/templatetags/release_notes.py
@@ -1,3 +1,5 @@
+from distutils.version import LooseVersion
+
from django import template
from django.utils.html import format_html
from django.utils.translation import ugettext as _
@@ -10,7 +12,7 @@ register = template.Library()
@register.simple_tag()
def release_notes(version, show_version=False):
- version_x_dot_y = version[:3]
+ version_x_dot_y = '.'.join(str(x) for x in LooseVersion(version).version[:2])
is_pre_release = any(c in version for c in ('a', 'b', 'c'))
# links for prereleases don't have their own release notes
display_version = version_x_dot_y if is_pre_release else version
diff --git a/releases/tests.py b/releases/tests.py
index 34325a99..6deda212 100644
--- a/releases/tests.py
+++ b/releases/tests.py
@@ -36,8 +36,6 @@ class TestTemplateTags(TestCase):
self.assertEqual(get_latest_micro_release('1.4'), None)
def test_release_notes(self):
- Release.objects.create(major=1, minor=8, micro=0, is_lts=True, version='1.8')
-
output = release_notes('1.8')
self.assertIsInstance(output, SafeString)
self.assertEqual(
@@ -51,6 +49,20 @@ class TestTemplateTags(TestCase):
'1.8 release notes</a>'
)
+ def test_release_notes_1_10(self):
+ output = release_notes('1.10')
+ self.assertIsInstance(output, SafeString)
+ self.assertEqual(
+ output,
+ '<a href="http://docs.djangoproject.dev:8000/en/1.10/releases/1.10/">'
+ 'Online documentation</a>'
+ )
+ self.assertEqual(
+ release_notes('1.10', show_version=True),
+ '<a href="http://docs.djangoproject.dev:8000/en/1.10/releases/1.10/">'
+ '1.10 release notes</a>'
+ )
+
class TestReleaseManager(TestCase):