diff options
| author | Ned Batchelder <ned@nedbatchelder.com> | 2015-08-22 19:57:45 -0400 |
|---|---|---|
| committer | Ned Batchelder <ned@nedbatchelder.com> | 2015-08-22 19:57:45 -0400 |
| commit | c785781218ba72f128948e35b97d3f80b28cc990 (patch) | |
| tree | 0eba48c6bd65fe6a0c6c2a1ecd49a7f524d8c76f | |
| parent | ee89c7ba77f75019be9081cf4d05f3571bed32a4 (diff) | |
| download | python-coveragepy-git-c785781218ba72f128948e35b97d3f80b28cc990.tar.gz | |
Bump version to 4.0rc1, and fix the logic for rc releases.
| -rw-r--r-- | coverage/version.py | 5 | ||||
| -rw-r--r-- | tests/test_misc.py | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/coverage/version.py b/coverage/version.py index f9923511..61b0423b 100644 --- a/coverage/version.py +++ b/coverage/version.py @@ -5,7 +5,7 @@ # This file is exec'ed in setup.py, don't import anything! # Same semantics as sys.version_info. -version_info = (4, 0, 0, 'beta', 2) +version_info = (4, 0, 0, 'candidate', 1) def _make_version(major, minor, micro, releaselevel, serial): @@ -15,7 +15,8 @@ def _make_version(major, minor, micro, releaselevel, serial): if micro: version += ".%d" % (micro,) if releaselevel != 'final': - version += "%s%d" % (releaselevel[0], serial) + short = {'alpha': 'a', 'beta': 'b', 'candidate': 'rc'}[releaselevel] + version += "%s%d" % (short, serial) return version diff --git a/tests/test_misc.py b/tests/test_misc.py index b5957b24..931e0bc5 100644 --- a/tests/test_misc.py +++ b/tests/test_misc.py @@ -79,7 +79,7 @@ class VersionTest(CoverageTest): self.assertEqual(_make_version(4, 0, 0, 'final', 0), "4.0") self.assertEqual(_make_version(4, 1, 2, 'beta', 3), "4.1.2b3") self.assertEqual(_make_version(4, 1, 2, 'final', 0), "4.1.2") - self.assertEqual(_make_version(5, 10, 2, 'candidate', 7), "5.10.2c7") + self.assertEqual(_make_version(5, 10, 2, 'candidate', 7), "5.10.2rc7") def test_make_url(self): self.assertEqual( |