From dfbf5027498d4ad647fcf9499683ce429ffeb882 Mon Sep 17 00:00:00 2001 From: Evgeni Golov Date: Mon, 22 May 2017 08:53:24 +0200 Subject: [PATCH 1/3] add test for ReleaseTagger together with --use-version --- test/functional/multiproject_tests.py | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/test/functional/multiproject_tests.py b/test/functional/multiproject_tests.py index 3b8dc33..5126307 100644 --- a/test/functional/multiproject_tests.py +++ b/test/functional/multiproject_tests.py @@ -128,6 +128,14 @@ class MultiProjectTests(TitoGitTestFixture): new_ver = get_latest_tagged_version(TEST_PKG_2) self.assertTrue(release_bumped(start_ver, new_ver)) + def test_release_tagger_use_version(self): + os.chdir(os.path.join(self.repo_dir, 'pkg2')) + start_ver = get_latest_tagged_version(TEST_PKG_2) + tito('tag --debug --accept-auto-changelog --use-version 1.3.37') + new_ver = get_latest_tagged_version(TEST_PKG_2) + self.assertFalse(release_bumped(start_ver, new_ver)) + self.assertEquals(new_ver, "1.3.37-1") + def test_build_tgz(self): os.chdir(os.path.join(self.repo_dir, 'pkg1')) artifacts = tito('build --tgz') From e4746a6838aba81fa849d01c6ccc6e2f2d8b1fd2 Mon Sep 17 00:00:00 2001 From: Evgeni Golov Date: Mon, 22 May 2017 09:05:33 +0200 Subject: [PATCH 2/3] also verify that ReleaseTagger supports --use-release --- test/functional/multiproject_tests.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/test/functional/multiproject_tests.py b/test/functional/multiproject_tests.py index 5126307..ff54886 100644 --- a/test/functional/multiproject_tests.py +++ b/test/functional/multiproject_tests.py @@ -128,6 +128,12 @@ class MultiProjectTests(TitoGitTestFixture): new_ver = get_latest_tagged_version(TEST_PKG_2) self.assertTrue(release_bumped(start_ver, new_ver)) + def test_release_tagger_use_release(self): + os.chdir(os.path.join(self.repo_dir, 'pkg2')) + tito('tag --debug --accept-auto-changelog --use-release 42') + new_ver = get_latest_tagged_version(TEST_PKG_2) + self.assertEquals(new_ver.split('-')[-1], "42") + def test_release_tagger_use_version(self): os.chdir(os.path.join(self.repo_dir, 'pkg2')) start_ver = get_latest_tagged_version(TEST_PKG_2) From c8d08743b4303b6e50a66071e1f9cafc9ff79659 Mon Sep 17 00:00:00 2001 From: Evgeni Golov Date: Mon, 22 May 2017 09:05:56 +0200 Subject: [PATCH 3/3] make ReleaseTagger honour --use-version Fixes: #274 --- src/tito/tagger/main.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/tito/tagger/main.py b/src/tito/tagger/main.py index c132cc2..a20fdab 100644 --- a/src/tito/tagger/main.py +++ b/src/tito/tagger/main.py @@ -654,7 +654,10 @@ class ReleaseTagger(VersionTagger): Tag a new release of the package. (i.e. x.y.z-r+1) """ self._make_changelog() - new_version = self._bump_version(release=True) + # the user might have passed --use-version + # so let's just bump the release if they did not + bump_release = not hasattr(self, '_use_version') + new_version = self._bump_version(release=bump_release) self._check_tag_does_not_exist(self._get_new_tag(new_version)) self._update_changelog(new_version)