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

Unit Test Workflow, Dockerfile, and Other Improvements

Browse Source
This commit is contained in:
Layla
2023-07-22 04:46:03 -04:00
committed by Layla
parent 62ea63618b
commit ce271b6ce9
9 changed files with 121 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
semver/__init__.py
View File

@ -27,19 +27,19 @@ def main():
"""Main entry point for the application"""
parser = argparse.ArgumentParser(description="Bump Semantic Version.")
parser.add_argument(
"-n", "--no-push", help="Do not try to push", action="store_false", dest="push"
"-n", "--no-push", help="do not try to push", action="store_false", dest="push"
)
parser.add_argument(
"-g",
"--global-user",
help="Set git user at a global level, helps in jenkins",
help="set git user at a global level",
action="store_true",
dest="global_user",
)
parser.add_argument(
"-D",
"--debug",
help="Sets logging level to DEBUG",
help="sets logging level to DEBUG",
action="store_true",
dest="debug",
default=False,

8
semver/get_version.py
View File

@ -11,14 +11,14 @@ def main():
parser.add_argument(
"-d",
"--dot",
help="Switch out / for . to be used in docker tag",
help="switch out / for . to be used in docker tag",
action="store_true",
dest="dot",
)
parser.add_argument(
"-D",
"--debug",
help="Sets logging level to DEBUG",
help="sets logging level to DEBUG",
action="store_true",
dest="debug",
default=False,
@ -26,12 +26,12 @@ def main():
parser.add_argument(
"-f",
"--format",
help="Format for pre-release version syntax",
help="format for pre-release version syntax",
choices=["npm", "maven", "docker"],
default=None,
)
parser.add_argument(
"-b", "--build-number", help="Build number, used in pre-releases", default=0
"-b", "--build-number", help="build number, used in pre-releases", default=0
)
args = parser.parse_args()

14
semver/scm/git.py
View File

@ -1,7 +1,7 @@
import re
import subprocess
from typing import Union, List
from functools import cache
from functools import lru_cache
import toml
@ -29,7 +29,7 @@ class Git(SCM):
def _run_command(
self, *args: str, throwExceptions: bool = True
) -> subprocess.CompletedProcess[str]:
) -> subprocess.CompletedProcess:
return subprocess.run(
args,
capture_output=True,
@ -82,13 +82,17 @@ class Git(SCM):
f"Error getting latest tagged git version: {str(e.stderr).rstrip()}"
)
if len(tagged_versions) > 0 and tagged_versions[-1] != "":
if (
tagged_versions is not None
and len(tagged_versions) > 0
and tagged_versions[-1] != ""
):
version = tagged_versions[-1]
logger.debug(f"Tag Version: {version}")
return version
@cache
@lru_cache(maxsize=None)
def get_branch(self) -> str:
"""
Get the main branch
@ -97,7 +101,7 @@ class Git(SCM):
proc = self._run_command(self.git_bin, "rev-parse", "--abbrev-ref", "HEAD")
return proc.stdout.rstrip()
@cache
@lru_cache(maxsize=None)
def get_merge_branch(self) -> Union[str, None]:
"""
Get the branches involved in the merge

49
semver/scm/perforce.py
View File

@ -1,49 +0,0 @@
import subprocess
from typing import Union, List
import toml
from semver.scm import SCM
from semver.logger import logger
class Perforce(SCM):
def __init__(self) -> None:
super().__init__()
def get_tag_version(self) -> str:
"""
Get the latest tagged version from Perforce labels
:return: The latest tagged version
"""
config: dict = toml.load("./.bumpversion.cfg")
tag_expression: str = config["bumpversion"]["tag_name"].replace(
"{new_version}", "[0-9]*.[0-9]*.[0-9]*"
)
logger.debug("Tag expression: " + str(tag_expression))
# Default version is `0.0.0` or what is found in
version = self.get_file_version(config)
# If a version is found in Perforce labels, use that the latest labeled version
labeled_versions: Union[List[str], None] = None
try:
proc = subprocess.run(
["p4", "labels", "-e", tag_expression, "-m1"],
capture_output=True,
text=True,
check=True,
)
labeled_versions = proc.stdout.rstrip().split("\n")
except subprocess.CalledProcessError as e:
raise RuntimeError(
f"Error getting latest labeled Perforce version: {str(e.stderr).rstrip()}"
)
if len(labeled_versions) > 0 and labeled_versions[-1] != "":
version = labeled_versions[-1]
logger.debug("Label Version: " + str(version))
return version

4
semver/tests/test_semver.py
View File

@ -67,10 +67,8 @@ class TestSemVer(unittest.TestCase):
@mock.patch("toml.load")
@mock.patch("pathlib.Path.is_file")
@mock.patch("builtins.open", mock.mock_open())
@mock.patch("semver.logger.warning")
def test_update_file_version(
self,
mock_logger: mock.Mock,
mock_path_is_file: mock.Mock,
mock_toml_load: mock.Mock,
):
@ -83,11 +81,9 @@ class TestSemVer(unittest.TestCase):
}
mock_path_is_file.return_value = True
self.semver._update_file_version("1.0.1", "1.0.0")
mock_logger.assert_not_called()
mock_path_is_file.return_value = False
self.semver._update_file_version("1.0.1", "1.0.0")
mock_logger.assert_called_once()
@mock.patch("semver.semver.SemVer._version_repo", mock.MagicMock())
def test_run_ok(self):

4
semver/utils.py
View File

@ -1,6 +1,6 @@
from typing import List
from pathlib import Path
from functools import cache
from functools import lru_cache
import configparser
import toml
@ -8,7 +8,7 @@ import toml
from semver.exceptions import SemverException
@cache
@lru_cache(maxsize=None)
def get_settings() -> dict:
"""
Get the settings from the config file