layla/auto-semver
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix if

Browse Source
This commit is contained in:
Derek DeJonghe
2020-06-16 15:38:05 -04:00
parent 20cf9b2b01
commit 022d577274
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
semver/get_version.py
View File

@ -31,7 +31,7 @@ def get_version(build=0,version_format=None,dot=False):
bump_output = p.stdout.read().decode('utf-8').rstrip() bump_output = p.stdout.read().decode('utf-8').rstrip()
next_version = re.search("new_version=([0-9]*.[0-9]*.[0-9]*)", bump_output).group(1) next_version = re.search("new_version=([0-9]*.[0-9]*.[0-9]*)", bump_output).group(1)
if version_format is 'npm' or 'docker': if version_format in ('npm','docker'i):
return "{}-{}.{}".format(next_version,branch.replace('/','-'),build) return "{}-{}.{}".format(next_version,branch.replace('/','-'),build)
if version_format == 'maven': if version_format == 'maven':
qualifier = 'SNAPSHOT' if build == 0 else build qualifier = 'SNAPSHOT' if build == 0 else build

2
semver/tests.py
View File

@ -69,7 +69,7 @@ class TestGetVersion(unittest.TestCase):
def test_branch_docker_pre_release(self): def test_branch_docker_pre_release(self):
create_git_environment() create_git_environment()
subprocess.call(['git', 'checkout', '-b', 'patch/branch']) subprocess.call(['git', 'checkout', '-b', 'patch/branch'])
branch = get_version.get_version(build=2,version_format='npm') branch = get_version.get_version(build=2,version_format='docker')
self.assertEqual(branch, "0.0.1-patch-branch.2") self.assertEqual(branch, "0.0.1-patch-branch.2")
def test_branch_maven_pre_release(self): def test_branch_maven_pre_release(self):
create_git_environment() create_git_environment()