diff options
| author | Ned Batchelder <ned@nedbatchelder.com> | 2021-04-15 05:09:00 -0400 |
|---|---|---|
| committer | Ned Batchelder <ned@nedbatchelder.com> | 2021-04-15 05:09:00 -0400 |
| commit | 05fbe9c95352ad7536c1f8ebd53a6739714a8af9 (patch) | |
| tree | 21a5997fda2449443394b086140eeef322e45c7e | |
| parent | 4651411b26a4c5b2e15cd8066b264c9022f3010a (diff) | |
| download | python-coveragepy-git-05fbe9c95352ad7536c1f8ebd53a6739714a8af9.tar.gz | |
build: make tags like 5.6.1 not coverage-5.6.1
| -rw-r--r-- | ci/github_releases.py | 4 | ||||
| -rw-r--r-- | coverage/version.py | 2 | ||||
| -rw-r--r-- | doc/conf.py | 4 | ||||
| -rw-r--r-- | howto.txt | 2 | ||||
| -rw-r--r-- | tests/test_version.py | 2 |
5 files changed, 7 insertions, 7 deletions
diff --git a/ci/github_releases.py b/ci/github_releases.py index 1c7ee604..86dd7d1c 100644 --- a/ci/github_releases.py +++ b/ci/github_releases.py @@ -78,7 +78,7 @@ def release_for_relnote(relnote): """ Turn a release note dict into the data needed by GitHub for a release. """ - tag = f"coverage-{relnote['version']}" + tag = relnote['version'] return { "tag_name": tag, "name": tag, @@ -122,7 +122,7 @@ def update_github_releases(json_filename, repo): relnotes = json.load(jf) relnotes.sort(key=lambda rel: pkg_resources.parse_version(rel["version"])) for relnote in relnotes: - tag = "coverage-" + relnote["version"] + tag = relnote["version"] if not does_tag_exist(tag): continue exists = tag in releases diff --git a/coverage/version.py b/coverage/version.py index b17f4676..b7021539 100644 --- a/coverage/version.py +++ b/coverage/version.py @@ -25,7 +25,7 @@ def _make_url(major, minor, micro, releaselevel, serial): url = "https://coverage.readthedocs.io" if releaselevel != 'final': # For pre-releases, use a version-specific URL. - url += "/en/coverage-" + _make_version(major, minor, micro, releaselevel, serial) + url += "/en/" + _make_version(major, minor, micro, releaselevel, serial) return url diff --git a/doc/conf.py b/doc/conf.py index 249e123b..9d382c3d 100644 --- a/doc/conf.py +++ b/doc/conf.py @@ -75,7 +75,7 @@ release_date = "April 13, 2021" # CHANGEME rst_epilog = """ .. |release_date| replace:: {release_date} .. |coverage-equals-release| replace:: coverage=={release} -.. |doc-url| replace:: https://coverage.readthedocs.io/en/coverage-{release} +.. |doc-url| replace:: https://coverage.readthedocs.io/en/{release} .. |br| raw:: html <br/> @@ -229,7 +229,7 @@ linkcheck_ignore = [ r"https://github.com/nedbat/coveragepy/(issues|pull)/\d+", # When publishing a new version, the docs will refer to the version before # the docs have been published. So don't check those links. - r"https://coverage.readthedocs.io/en/coverage-{}$".format(release), + r"https://coverage.readthedocs.io/en/{}$".format(release), ] # https://github.com/executablebooks/sphinx-tabs/pull/54 @@ -55,7 +55,7 @@ - upload kits: $ make kit_upload - Tag the tree - $ git tag coverage-3.0.1 + $ git tag 3.0.1 $ git push --tags - Bump version: - coverage/version.py diff --git a/tests/test_version.py b/tests/test_version.py index 00d65624..eb810d5d 100644 --- a/tests/test_version.py +++ b/tests/test_version.py @@ -30,5 +30,5 @@ class VersionTest(CoverageTest): def test_make_url(self): assert _make_url(4, 0, 0, 'final', 0) == "https://coverage.readthedocs.io" - expected = "https://coverage.readthedocs.io/en/coverage-4.1.2b3" + expected = "https://coverage.readthedocs.io/en/4.1.2b3" assert _make_url(4, 1, 2, 'beta', 3) == expected |