release-engineering/tito
1
0
Fork 0
mirror of https://github.com/rpm-software-management/tito.git synced 2025-02-23 12:12:47 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #285 from evgeni/release-tagger-use-version-support

Browse source 
ReleaseTagger --use-version support
This commit is contained in:
Devan Goodwin 2017-05-26 08:09:37 -03:00 • committed by GitHub
commit 895890a7a2
2 changed files with 18 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/tito/tagger/main.py
View file

@ -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)

14
test/functional/multiproject_tests.py
View file

@ -128,6 +128,20 @@ 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)
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')