From 857833e9e901e667f2f3ae419282f8e1a1dd0b6c Mon Sep 17 00:00:00 2001 From: Ned Batchelder Date: Fri, 24 Feb 2023 18:40:35 -0500 Subject: [PATCH] fix: always use full-version rtfd links #1566 --- CHANGES.rst | 5 ++++- coverage/version.py | 9 ++++----- tests/test_version.py | 3 ++- 3 files changed, 10 insertions(+), 7 deletions(-) diff --git a/CHANGES.rst b/CHANGES.rst index e73d5c0ff..b493f68e7 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -20,7 +20,10 @@ development at the same time, such as 4.5.x and 5.0. Unreleased ---------- -Nothing yet. +- Fix: the PyPI page had broken links to documentation pages, but no longer + does, closing `issue 1566`_. + +.. _issue 1566: https://github.com/nedbat/coveragepy/issues/1566 .. scriv-start-here diff --git a/coverage/version.py b/coverage/version.py index 48e5f2b95..95491ed53 100644 --- a/coverage/version.py +++ b/coverage/version.py @@ -40,11 +40,10 @@ def _make_url( dev: int = 0, ) -> str: """Make the URL people should start at for this version of coverage.py.""" - url = "https://coverage.readthedocs.io" - if releaselevel != "final" or dev != 0: - # For pre-releases, use a version-specific URL. - url += "/en/" + _make_version(major, minor, micro, releaselevel, serial, dev) - return url + return ( + "https://coverage.readthedocs.io/en/" + + _make_version(major, minor, micro, releaselevel, serial, dev) + ) __version__ = _make_version(*version_info, _dev) diff --git a/tests/test_version.py b/tests/test_version.py index 9efa228ab..7e8935257 100644 --- a/tests/test_version.py +++ b/tests/test_version.py @@ -33,7 +33,8 @@ def test_make_version(self) -> None: assert _make_version(5, 10, 2, 'candidate', 7, 3) == "5.10.2rc7.dev3" def test_make_url(self) -> None: - assert _make_url(4, 0, 0, 'final') == "https://coverage.readthedocs.io" + expected = "https://coverage.readthedocs.io/en/4.1.2" + assert _make_url(4, 1, 2, 'final') == expected expected = "https://coverage.readthedocs.io/en/4.1.2b3" assert _make_url(4, 1, 2, 'beta', 3) == expected expected = "https://coverage.readthedocs.io/en/4.1.2b3.dev17"