diff --git a/helpers/__init__.py b/helpers/__init__.py index d2eaf8e..725cc2e 100644 --- a/helpers/__init__.py +++ b/helpers/__init__.py @@ -4,4 +4,4 @@ # Creative Commons Attribution-NonCommercial-ShareAlike 4.0 International Unported License. # # You should have received a copy of the license along with this -# work. If not, see . +# work. If not, see . \ No newline at end of file diff --git a/helpers/__main__.py b/helpers/__main__.py index 51d805c..8539d81 100644 --- a/helpers/__main__.py +++ b/helpers/__main__.py @@ -16,132 +16,89 @@ import os import logging import sys -if __package__ == "helpers": +if __package__=="helpers": # when calling the module from: > python -m helpers - from .types_check import types_check - from .quality_check import quality_check - from .unit_test import unit_test - from .doc_gen import doc_gen - from .changelog_gen import changelog_gen -else: + from .types_check import types_check + from .quality_check import quality_check + from .unit_test import unit_test + from .doc_gen import doc_gen + from .changelog_gen import changelog_gen +else: # when calling the __main__.py file (from IDE) - from helpers.types_check import types_check - from helpers.quality_check import quality_check - from helpers.unit_test import unit_test - from helpers.doc_gen import doc_gen - from helpers.changelog_gen import changelog_gen - + from helpers.types_check import types_check + from helpers.quality_check import quality_check + from helpers.unit_test import unit_test + from helpers.doc_gen import doc_gen + from helpers.changelog_gen import changelog_gen + logging.getLogger().setLevel(logging.INFO) if __name__ == "__main__": - project_rootdir_path = Path(__file__).parent.parent.absolute() + project_rootdir_path=Path(__file__).parent.parent.absolute() with open(project_rootdir_path / "pyproject.toml", mode="rb") as fp: pyproject = tomli.load(fp) + + parser = argparse.ArgumentParser( prog = 'continuous-integration-helper', + description = 'A tiny set of scripts to help continous integration on python') + + parser.add_argument('-tc', '--type-check', dest='typecheck', action='store_true', help='enable static typing check') + + parser.add_argument('-ut', '--unit-test', dest='unittest', action='store_true', help='enable unit-test') + parser.add_argument('-cc', '--coverage-check', dest='coveragecheck', action='store_true', help='enable unit-test coverage check (requires unit-test)') - parser = argparse.ArgumentParser( - prog="continuous-integration-helper", - description="A tiny set of scripts to help continous integration on python", - ) - - parser.add_argument( - "-tc", - "--type-check", - dest="typecheck", - action="store_true", - help="enable static typing check", - ) - - parser.add_argument( - "-ut", - "--unit-test", - dest="unittest", - action="store_true", - help="enable unit-test", - ) - parser.add_argument( - "-cc", - "--coverage-check", - dest="coveragecheck", - action="store_true", - help="enable unit-test coverage check (requires unit-test)", - ) - - parser.add_argument( - "-qc", - "--quality-check", - dest="qualitycheck", - action="store_true", - help="enable code quality check", - ) - - parser.add_argument( - "-dg", - "--doc-gen", - dest="docgen", - action="store_true", - help="enable documentation generation using MkDoc", - ) - parser.add_argument( - "-pdf", - "--doc-gen-pdf", - dest="docgenpdf", - action="store_true", - help="enable pdf documentation export (requires doc-gen)", - ) - - parser.add_argument( - "-clg", - "--changelog-gen", - dest="changeloggen", - action="store_true", - help="enable changelog generation", - ) - + parser.add_argument('-qc', '--quality-check', dest='qualitycheck', action='store_true', help='enable code quality check') + + parser.add_argument('-dg', '--doc-gen', dest='docgen', action='store_true', help='enable documentation generation using MkDoc') + parser.add_argument('-pdf', '--doc-gen-pdf', dest='docgenpdf', action='store_true', help='enable pdf documentation export (requires doc-gen)') + + parser.add_argument('-clg', '--changelog-gen', dest='changeloggen', action='store_true', help='enable changelog generation') + args = parser.parse_args() - + ################################## # Dev / Debug forced toogles # - # -------------------------------- + #-------------------------------- # - # args.typecheck = True - # args.qualitycheck = True - # args.unittest = True - # args.coveragecheck = True - # args.docgen = True - # args.docgenpdf = True - # args.changeloggen = True - + #args.typecheck = True + #args.qualitycheck = True + #args.unittest = True + #args.coveragecheck = True + #args.docgen = True + #args.docgenpdf = True + #args.changeloggen = True + helpers = [] - if args.typecheck == True: + if args.typecheck == True: helpers.append(types_check) - - if args.unittest == True: + + if args.unittest == True: helpers.append(unit_test) - - if args.coveragecheck == True: + + if args.coveragecheck == True: if args.unittest == True: unit_test.enable_coverage_check = True else: raise RuntimeError("unit-test is required to enable coverage-check") - - if args.qualitycheck == True: + + if args.qualitycheck == True: helpers.append(quality_check) - - if args.docgen == True: + + if args.docgen == True: helpers.append(doc_gen) - - if args.docgenpdf == True: + + if args.docgenpdf==True: if args.docgen == True: doc_gen.enable_gen_pdf = True else: raise RuntimeError("doc-gen is required to enable doc-gen-pdf") - - if args.changeloggen == True: + + if args.changeloggen == True: helpers.append(changelog_gen) - + for helper in helpers: - helper.set_context(project_rootdir_path, pyproject) + helper.set_context(project_rootdir_path,pyproject) helper.reset_result_dir() helper.do_job() + diff --git a/helpers/changelog_gen.py b/helpers/changelog_gen.py index f4a15cb..a0b5734 100644 --- a/helpers/changelog_gen.py +++ b/helpers/changelog_gen.py @@ -9,15 +9,16 @@ from __future__ import annotations from typing import TYPE_CHECKING -# from pathlib import Path -# import os -# import datetime +#from pathlib import Path +#import os +#import datetime from .helper_base import helper_base -class changelog_gen(helper_base): - @classmethod - def do_job(cls): - pass +class changelog_gen(helper_base): + + @classmethod + def do_job(cls): + pass \ No newline at end of file diff --git a/helpers/doc_gen.py b/helpers/doc_gen.py index 790cf27..05dcb38 100644 --- a/helpers/doc_gen.py +++ b/helpers/doc_gen.py @@ -17,7 +17,6 @@ from pathlib import Path from distutils.dir_util import copy_tree import yaml - try: from yaml import CLoader as Loader, CDumper as Dumper except ImportError: @@ -25,44 +24,35 @@ except ImportError: from .helper_base import helper_withresults_base - -class doc_gen(helper_withresults_base): +class doc_gen(helper_withresults_base): enable_gen_pdf: bool = False - - @classmethod - def do_job(cls): + + @classmethod + def do_job(cls): print(cls.project_rootdir_path) print() - + # create doc root dir - doc_path = cls.project_rootdir_path / "docs" + doc_path = cls.project_rootdir_path/"docs" cls._reset_dir(doc_path) - - site_path = cls.get_result_dir() / "site" + + site_path = cls.get_result_dir()/"site" cls._reset_dir(site_path) - + # copy files from main project dir - shutil.copyfile( - str(cls.project_rootdir_path / "README.md"), str(doc_path / "README.md") - ) - shutil.copyfile( - str(cls.project_rootdir_path / "LICENSE.md"), str(doc_path / "LICENSE.md") - ) - + shutil.copyfile(str(cls.project_rootdir_path/"README.md"),str(doc_path/"README.md")) + shutil.copyfile(str(cls.project_rootdir_path/"LICENSE.md"),str(doc_path/"LICENSE.md")) + # copy files from static-doc dir - copy_tree(str(cls.project_rootdir_path / "docs-static"), str(doc_path)) - + copy_tree(str(cls.project_rootdir_path/"docs-static"),str(doc_path)) + # generating API doc + nav from python docstrings reference_path = doc_path / "reference" cls._reset_dir(reference_path) - + for path in sorted((cls.project_rootdir_path / "src").rglob("*.py")): - module_path = path.relative_to( - cls.project_rootdir_path / "src" - ).with_suffix("") - doc_path = path.relative_to(cls.project_rootdir_path / "src").with_suffix( - ".md" - ) + module_path = path.relative_to(cls.project_rootdir_path/ "src").with_suffix("") + doc_path = path.relative_to(cls.project_rootdir_path/ "src").with_suffix(".md") full_doc_path = Path(reference_path, doc_path) parts = list(module_path.parts) @@ -71,60 +61,43 @@ class doc_gen(helper_withresults_base): parts = parts[:-1] elif parts[-1] == "__main__": continue - + cls._reset_dir(os.path.dirname(full_doc_path)) with open(full_doc_path, "w+") as fd: - identifier = "src." + ".".join(parts) + identifier = "src."+".".join(parts) print("::: " + identifier, file=fd) - - cmdopts = [ - f"{sys.executable}", - "-m", - "mkdocs", - "-v", - "build", - "--site-dir", - str(site_path), - "--clean", - ] - + + + cmdopts = [f"{sys.executable}","-m","mkdocs","-v","build","--site-dir",str(site_path),"--clean"] + # little hack here, to enable / disable pdf generation using own class config - # => reason is mkdocs seems to try loading the plugin even if we disable it, so we need to + # => reason is mkdocs seems to try loading the plugin even if we disable it, so we need to # manually process the configuration file. - mkdocsCfg = None - with open(cls.project_rootdir_path / "mkdocs.yml", "r") as mkdocsCfgFile: + mkdocsCfg=None + with open(cls.project_rootdir_path / "mkdocs.yml",'r') as mkdocsCfgFile: mkdocsCfg = yaml.load(mkdocsCfgFile, Loader=yaml.SafeLoader) - - if cls.enable_gen_pdf == True: - mkdocsCfg["plugins"].append( - { - "with-pdf": { - "cover_subtitle": "User Manual", - "cover_logo": str( - cls.project_rootdir_path / "docs-static" / "Library.jpg" - ), - "verbose": False, - "media_type": "print", - "headless_chrome_path": "chromium", - "exclude_pages": ["LICENSE"], - "output_path": str(site_path / "pdf" / "manual.pdf"), - } - } - ) + + if cls.enable_gen_pdf==True: + mkdocsCfg['plugins'].append({ 'with-pdf':{ + 'cover_subtitle': 'User Manual', + 'cover_logo': str(cls.project_rootdir_path / 'docs-static' / 'Library.jpg'), + 'verbose': False, + 'media_type': 'print', + 'exclude_pages': ['LICENSE'], + 'output_path': str(site_path / 'pdf' / 'manual.pdf') + }}) else: - for subelem in mkdocsCfg["plugins"]: - if isinstance(subelem, dict): - if "with-pdf" in subelem.keys(): - mkdocsCfg["plugins"].remove(subelem) - break - - with open(cls.project_rootdir_path / "mkdocs.yml", "w") as mkdocsCfgFile: - mkdocsCfgFile.write( - yaml.dump( - mkdocsCfg, Dumper=Dumper, default_flow_style=False, sort_keys=False - ) - ) - - res = cls.run_cmd(cmdopts) + for subelem in mkdocsCfg['plugins']: + if isinstance(subelem,dict) : + if 'with-pdf' in subelem.keys(): + mkdocsCfg['plugins'].remove(subelem) + break + + with open(cls.project_rootdir_path / "mkdocs.yml",'w') as mkdocsCfgFile: + mkdocsCfgFile.write(yaml.dump(mkdocsCfg, Dumper=Dumper,default_flow_style=False, sort_keys=False)) + + + res=cls.run_cmd(cmdopts) print(res.decode()) - print(" !! done") + print(' !! done') + diff --git a/helpers/helper_base.py b/helpers/helper_base.py index be2583b..74cf0e8 100644 --- a/helpers/helper_base.py +++ b/helpers/helper_base.py @@ -9,76 +9,64 @@ from __future__ import annotations from typing import TYPE_CHECKING -from abc import ABC, abstractmethod +from abc import ABC,abstractmethod import os from pathlib import Path import subprocess if TYPE_CHECKING: # Only imports the below statements during type checking - from typing import Union - + from typing import Union class helper_base(ABC): - project_rootdir_path: Union[Path, None] = None - pyproject: Union[dict, None] = None - current_dir: Union[Path, None] = None - - @classmethod - def set_context(cls, project_rootdir_path: Path, pyproject: dict): - cls.project_rootdir_path = project_rootdir_path - cls.pyproject = pyproject - cls.current_dir = Path(__file__).parent.absolute() - - @classmethod + project_rootdir_path: Union[Path,None] = None + pyproject: Union[dict,None] = None + current_dir: Union[Path,None] = None + + @classmethod + def set_context(cls,project_rootdir_path:Path, pyproject:dict): + cls.project_rootdir_path = project_rootdir_path + cls.pyproject = pyproject + cls.current_dir = Path(__file__).parent.absolute() + + @classmethod def get_result_dir(cls): return None - - @staticmethod - def _reset_dir(dirpath: Path): + + @staticmethod + def _reset_dir(dirpath:Path): dirpath = Path(dirpath) if not os.path.exists(dirpath): os.makedirs(dirpath) - [f.unlink() for f in Path(dirpath).glob("*") if f.is_file()] - - @classmethod + [f.unlink() for f in Path(dirpath).glob("*") if f.is_file()] + + @classmethod def reset_result_dir(cls): result_dir = cls.get_result_dir() if result_dir != None: cls._reset_dir(result_dir) - - @classmethod + + @classmethod @abstractmethod - def do_job(cls): + def do_job(cls): raise NotImplementedError() - @classmethod + @classmethod def run_cmd_(cls, cmdarray): - process = subprocess.run( - cmdarray, - stdout=subprocess.PIPE, - stderr=subprocess.PIPE, - shell=True, - check=True, - ) + process = subprocess.run(cmdarray, stdout=subprocess.PIPE, stderr=subprocess.PIPE, shell=True, check=True) return process.stdout - - @classmethod + + @classmethod def run_cmd(cls, cmdarray): p = subprocess.run(cmdarray, capture_output=True) print(p.stdout) print(p.stderr) return p.stdout - - + class helper_withresults_base(helper_base): - helper_results_dir: Union[Path, None] = None - - @classmethod + helper_results_dir: Union[Path,None] = None + + @classmethod def get_result_dir(cls): - if cls.helper_results_dir == None: - cls.helper_results_dir = cls.__name__ - return ( - Path(__file__).parent.parent.absolute() - / "helpers-results" - / cls.helper_results_dir - ) + if cls.helper_results_dir==None: + cls.helper_results_dir=cls.__name__ + return Path(__file__).parent.parent.absolute() / "helpers-results" / cls.helper_results_dir \ No newline at end of file diff --git a/helpers/quality_check.py b/helpers/quality_check.py index 7a36a87..7616d5f 100644 --- a/helpers/quality_check.py +++ b/helpers/quality_check.py @@ -25,289 +25,197 @@ import pylint_json2html from .helper_base import helper_withresults_base - class PyLintMetricNotFound(Warning): pass - -class quality_check(helper_withresults_base): - PylintMessageList = dict() - - @classmethod +class quality_check(helper_withresults_base): + PylintMessageList=dict() + + @classmethod def GetPylintMessageList(cls): - Messagelist = dict() - regex = r"^:([a-zA-Z-]+) \(([^\)]+)\)" - for line in cls.run_cmd( - [sys.executable, "-m", "pylint", "--list-msgs"] - ).splitlines(): - if res := re.search(regex, line.decode()): - Messagelist[res.group(1)] = res.group(2) + Messagelist=dict() + regex = r"^:([a-zA-Z-]+) \(([^\)]+)\)" + for line in cls.run_cmd([sys.executable,"-m","pylint","--list-msgs"]).splitlines(): + if res:=re.search(regex,line.decode()): + Messagelist[res.group(1)]=res.group(2) cls.PylintMessageList = Messagelist @staticmethod - def TryExtractPYReportMetric(line: str, tag: str): - regex = f"^(?:\|{tag}\s*\|)(\d+)(?=\s*|)" - if res := re.search(regex, line): + def TryExtractPYReportMetric(line: str,tag: str): + regex=f"^(?:\|{tag}\s*\|)(\d+)(?=\s*|)" + if res:=re.search(regex,line): return float(res.group(1)) raise PyLintMetricNotFound() - @classmethod - def do_job(cls): + @classmethod + def do_job(cls): print("checking code quality ...") cls.GetPylintMessageList() - - RES_all = dict() + + RES_all=dict() with StringIO() as StdOutput: - JsonContent = "" + JsonContent="" with redirect_stdout(StdOutput): - pylint_Run( - [ - "--output-format=json,parseable", - "--disable=invalid-name", - "--ignore=_version.py", - "--reports=y", - "--score=yes", - "--max-line-length=140", - "src." + cls.pyproject["project"]["name"], - ], - exit=False, - ) - - with open( - cls.get_result_dir() / "report.json", "w+", encoding="utf-8" - ) as Outfile: + pylint_Run(['--output-format=json,parseable', + '--disable=invalid-name', + '--ignore=_version.py', + '--reports=y', + '--score=yes', + '--max-line-length=140', + 'src.' + cls.pyproject['project']['name']], exit=False) + + with open(cls.get_result_dir()/"report.json","w+", encoding='utf-8') as Outfile: # hacky way of exctracting json + having overall score... class TScanState(Enum): - TEXT_REPORT = 1 - JSON_REPORT = 2 - OTHER_REPORT_START = 3 - OTHER_REPORT_STATISTICS = 4 - OTHER_REPORT_METRICS = 5 - OTHER_REPORT_DUPLICATION = 6 - OTHER_REPORT_MESSAGES_CAT = 7 - OTHER_REPORT_MESSAGES = 8 - OTHER_REPORT_END = 99 - - RES_all["Statistics"] = dict() - RES_all["RawMetrics"] = dict() - RES_all["RawMetricsPercent"] = dict() - RES_all["Duplication"] = dict() - RES_all["MessagesCat"] = dict() - RES_all["Messages"] = dict() - RES_all["GlobalScore"] = -999 - RES_all["NbAnalysedStatments"] = -999 - RES_all["NbAnalysedLines"] = -999 - + TEXT_REPORT = 1 + JSON_REPORT = 2 + OTHER_REPORT_START = 3 + OTHER_REPORT_STATISTICS = 4 + OTHER_REPORT_METRICS = 5 + OTHER_REPORT_DUPLICATION = 6 + OTHER_REPORT_MESSAGES_CAT = 7 + OTHER_REPORT_MESSAGES = 8 + OTHER_REPORT_END = 99 + + RES_all['Statistics'] = dict() + RES_all['RawMetrics'] = dict() + RES_all['RawMetricsPercent'] = dict() + RES_all['Duplication'] = dict() + RES_all['MessagesCat'] = dict() + RES_all['Messages'] = dict() + RES_all['GlobalScore'] = -999 + RES_all['NbAnalysedStatments'] = -999 + RES_all['NbAnalysedLines'] = -999 + ScanState = TScanState.TEXT_REPORT - for line in StdOutput.getvalue().split("\n"): - print(line) - if ScanState == TScanState.TEXT_REPORT: + for line in StdOutput.getvalue().split('\n'): + print(line) + if ScanState == TScanState.TEXT_REPORT: # ignoring this part, we need json - if line == "[": - JsonContent += line + if line=='[': + JsonContent+=line ScanState = TScanState.JSON_REPORT - elif line == "[]": - JsonContent += line + elif line=='[]': + JsonContent+=line ScanState = TScanState.OTHER_REPORT_START - - elif ScanState == TScanState.JSON_REPORT: - JsonContent += line - if line == "]": + + elif ScanState == TScanState.JSON_REPORT: + JsonContent+=line + if line==']': ScanState = TScanState.OTHER_REPORT_START - - elif ScanState == TScanState.OTHER_REPORT_START: - if res := re.search(r"^(\d+)(?= statements analysed.)", line): - RES_all["NbAnalysedStatments"] = float(res.group(1)) + + elif ScanState == TScanState.OTHER_REPORT_START: + if res:=re.search(r"^(\d+)(?= statements analysed.)",line): + RES_all['NbAnalysedStatments'] = float(res.group(1)) if line == "Statistics by type": ScanState = TScanState.OTHER_REPORT_STATISTICS - - elif ScanState == TScanState.OTHER_REPORT_STATISTICS: - if res := re.search( - r"^(\d+)(?= lines have been analyzed)", line - ): - RES_all["NbAnalysedLines"] = float(res.group(1)) + + elif ScanState == TScanState.OTHER_REPORT_STATISTICS: + if res:=re.search(r"^(\d+)(?= lines have been analyzed)",line): + RES_all['NbAnalysedLines' ]= float(res.group(1)) elif line == "Raw metrics": ScanState = TScanState.OTHER_REPORT_METRICS else: - with suppress(PyLintMetricNotFound): - RES_all["Statistics"][ - "module" - ] = cls.TryExtractPYReportMetric(line, "module") - with suppress(PyLintMetricNotFound): - RES_all["Statistics"][ - "class" - ] = cls.TryExtractPYReportMetric(line, "class") - with suppress(PyLintMetricNotFound): - RES_all["Statistics"][ - "method" - ] = cls.TryExtractPYReportMetric(line, "method") - with suppress(PyLintMetricNotFound): - RES_all["Statistics"][ - "function" - ] = cls.TryExtractPYReportMetric(line, "function") - - elif ScanState == TScanState.OTHER_REPORT_METRICS: + with suppress(PyLintMetricNotFound): RES_all['Statistics']['module'] = cls.TryExtractPYReportMetric(line,"module") + with suppress(PyLintMetricNotFound): RES_all['Statistics']['class'] = cls.TryExtractPYReportMetric(line,"class") + with suppress(PyLintMetricNotFound): RES_all['Statistics']['method'] = cls.TryExtractPYReportMetric(line,"method") + with suppress(PyLintMetricNotFound): RES_all['Statistics']['function'] = cls.TryExtractPYReportMetric(line,"function") + + elif ScanState == TScanState.OTHER_REPORT_METRICS: if line == "Duplication": - RES_all["RawMetricsPercent"]["code"] = ( - RES_all["RawMetrics"]["code"] - / RES_all["NbAnalysedLines"] - ) - RES_all["RawMetricsPercent"]["docstring"] = ( - RES_all["RawMetrics"]["docstring"] - / RES_all["NbAnalysedLines"] - ) - RES_all["RawMetricsPercent"]["comment"] = ( - RES_all["RawMetrics"]["comment"] - / RES_all["NbAnalysedLines"] - ) - RES_all["RawMetricsPercent"]["empty"] = ( - RES_all["RawMetrics"]["empty"] - / RES_all["NbAnalysedLines"] - ) + RES_all['RawMetricsPercent']['code'] = RES_all['RawMetrics']['code'] / RES_all['NbAnalysedLines' ] + RES_all['RawMetricsPercent']['docstring'] = RES_all['RawMetrics']['docstring'] / RES_all['NbAnalysedLines' ] + RES_all['RawMetricsPercent']['comment'] = RES_all['RawMetrics']['comment'] / RES_all['NbAnalysedLines' ] + RES_all['RawMetricsPercent']['empty'] = RES_all['RawMetrics']['empty'] / RES_all['NbAnalysedLines' ] ScanState = TScanState.OTHER_REPORT_DUPLICATION else: - with suppress(PyLintMetricNotFound): - RES_all["RawMetrics"][ - "code" - ] = cls.TryExtractPYReportMetric(line, "code") - with suppress(PyLintMetricNotFound): - RES_all["RawMetrics"][ - "docstring" - ] = cls.TryExtractPYReportMetric(line, "docstring") - with suppress(PyLintMetricNotFound): - RES_all["RawMetrics"][ - "comment" - ] = cls.TryExtractPYReportMetric(line, "comment") - with suppress(PyLintMetricNotFound): - RES_all["RawMetrics"][ - "empty" - ] = cls.TryExtractPYReportMetric(line, "empty") - - elif ScanState == TScanState.OTHER_REPORT_DUPLICATION: + with suppress(PyLintMetricNotFound): RES_all['RawMetrics']['code'] = cls.TryExtractPYReportMetric(line,"code") + with suppress(PyLintMetricNotFound): RES_all['RawMetrics']['docstring'] = cls.TryExtractPYReportMetric(line,"docstring") + with suppress(PyLintMetricNotFound): RES_all['RawMetrics']['comment'] = cls.TryExtractPYReportMetric(line,"comment") + with suppress(PyLintMetricNotFound): RES_all['RawMetrics']['empty'] = cls.TryExtractPYReportMetric(line,"empty") + + elif ScanState == TScanState.OTHER_REPORT_DUPLICATION: if line == "Messages by category": ScanState = TScanState.OTHER_REPORT_MESSAGES_CAT else: - with suppress(PyLintMetricNotFound): - RES_all["Duplication"][ - "NbDupLines" - ] = cls.TryExtractPYReportMetric( - line, "nb duplicated lines" - ) - with suppress(PyLintMetricNotFound): - RES_all["Duplication"][ - "PersentDuplicatedLines" - ] = cls.TryExtractPYReportMetric( - line, "percent duplicated lines" - ) - - elif ScanState == TScanState.OTHER_REPORT_MESSAGES_CAT: + with suppress(PyLintMetricNotFound): RES_all['Duplication']['NbDupLines'] = cls.TryExtractPYReportMetric(line,"nb duplicated lines") + with suppress(PyLintMetricNotFound): RES_all['Duplication']['PersentDuplicatedLines'] = cls.TryExtractPYReportMetric(line,"percent duplicated lines") + + elif ScanState == TScanState.OTHER_REPORT_MESSAGES_CAT: if line == "Messages": ScanState = TScanState.OTHER_REPORT_MESSAGES else: - with suppress(PyLintMetricNotFound): - RES_all["MessagesCat"][ - "Convention" - ] = cls.TryExtractPYReportMetric(line, "convention") - with suppress(PyLintMetricNotFound): - RES_all["MessagesCat"][ - "Refactor" - ] = cls.TryExtractPYReportMetric(line, "refactor") - with suppress(PyLintMetricNotFound): - RES_all["MessagesCat"][ - "Warning" - ] = cls.TryExtractPYReportMetric(line, "warning") - with suppress(PyLintMetricNotFound): - RES_all["MessagesCat"][ - "Error" - ] = cls.TryExtractPYReportMetric(line, "error") - - elif ScanState == TScanState.OTHER_REPORT_MESSAGES: + with suppress(PyLintMetricNotFound): RES_all['MessagesCat']['Convention'] = cls.TryExtractPYReportMetric(line,"convention") + with suppress(PyLintMetricNotFound): RES_all['MessagesCat']['Refactor'] = cls.TryExtractPYReportMetric(line,"refactor") + with suppress(PyLintMetricNotFound): RES_all['MessagesCat']['Warning'] = cls.TryExtractPYReportMetric(line,"warning") + with suppress(PyLintMetricNotFound): RES_all['MessagesCat']['Error'] = cls.TryExtractPYReportMetric(line,"error") + + elif ScanState == TScanState.OTHER_REPORT_MESSAGES: # approx match because the number of '-' depend on screen width.. if line.startswith("--------"): ScanState = TScanState.OTHER_REPORT_END else: for PylintMessage in cls.PylintMessageList.keys(): - with suppress(PyLintMetricNotFound): - RES_all["Messages"][ - PylintMessage - ] = cls.TryExtractPYReportMetric( - line, PylintMessage - ) - - elif ScanState == TScanState.OTHER_REPORT_END: - if res := re.search( - r"(?<=Your code has been rated at )(\d+(?:\.\d+)?)/10", line - ): - RES_all["GlobalScore"] = float(res.group(1)) - print(RES_all["GlobalScore"]) + with suppress(PyLintMetricNotFound): RES_all['Messages'][PylintMessage] = cls.TryExtractPYReportMetric(line,PylintMessage) + + elif ScanState == TScanState.OTHER_REPORT_END: + if res:=re.search(r"(?<=Your code has been rated at )(\d+(?:\.\d+)?)/10",line): + RES_all['GlobalScore']=float(res.group(1)) + print(RES_all['GlobalScore']) else: raise RuntimeError("Invalid ScanState") Outfile.write(JsonContent) - - with open(cls.get_result_dir() / "metrics.json", "w") as json_file: + + with open(cls.get_result_dir()/"metrics.json", 'w') as json_file: json.dump(RES_all, json_file) - - # exporting all Data in one csv, unused atm because jenkins seems not able to select columns from csv an keep displaying all... + + # exporting all Data in one csv, unused atm because jenkins seems not able to select columns from csv an keep displaying all... # => to export a working full csv we need to a 'flat' dict (no more nested dict) RES_all_trim = copy.deepcopy(RES_all) del RES_all_trim["Messages"] - flat_RES_all = pandas.json_normalize(RES_all_trim, sep="_").to_dict( - orient="records" - )[0] - - with open(cls.get_result_dir() / "metrics.csv", "w", newline="") as csv_file: - writer = csv.DictWriter(csv_file, fieldnames=flat_RES_all.keys()) + flat_RES_all=pandas.json_normalize(RES_all_trim, sep='_').to_dict(orient='records')[0] + + with open(cls.get_result_dir()/"metrics.csv", 'w', newline='') as csv_file: + writer = csv.DictWriter(csv_file,fieldnames=flat_RES_all.keys()) writer.writeheader() writer.writerow(flat_RES_all) - + # splited csv exports for jenkins plots: RawMetricsPercent RES_all_percent = RES_all["RawMetricsPercent"] - with open( - cls.get_result_dir() / "metrics_rawpercent.csv", "w", newline="" - ) as csv_file: - writer = csv.DictWriter(csv_file, fieldnames=RES_all_percent.keys()) + with open(cls.get_result_dir()/"metrics_rawpercent.csv", 'w', newline='') as csv_file: + writer = csv.DictWriter(csv_file,fieldnames=RES_all_percent.keys()) writer.writeheader() writer.writerow(RES_all_percent) # splited csv exports for jenkins plots: Statistics + Duplication + NbAnalysedStatments + NbAnalysedLines RES_all_stats = copy.deepcopy(RES_all["Statistics"]) - RES_all_stats["NbDupLines"] = RES_all["Duplication"]["NbDupLines"] - RES_all_stats["PersentDuplicatedLines"] = RES_all["Duplication"][ - "PersentDuplicatedLines" - ] - RES_all_stats["NbAnalysedStatments"] = RES_all["NbAnalysedStatments"] - RES_all_stats["NbAnalysedLines"] = RES_all["NbAnalysedLines"] - with open( - cls.get_result_dir() / "metrics_Statistics.csv", "w", newline="" - ) as csv_file: - writer = csv.DictWriter(csv_file, fieldnames=RES_all_stats.keys()) + RES_all_stats["NbDupLines"] = RES_all['Duplication']['NbDupLines'] + RES_all_stats["PersentDuplicatedLines"] = RES_all['Duplication']['PersentDuplicatedLines'] + RES_all_stats["NbAnalysedStatments"] = RES_all['NbAnalysedStatments' ] + RES_all_stats["NbAnalysedLines"] = RES_all['NbAnalysedLines' ] + with open(cls.get_result_dir()/"metrics_Statistics.csv", 'w', newline='') as csv_file: + writer = csv.DictWriter(csv_file,fieldnames=RES_all_stats.keys()) writer.writeheader() writer.writerow(RES_all_stats) - + # splited csv exports for jenkins plots: Statistics + Duplication - RES_all_MessagesCat = RES_all["MessagesCat"] - with open( - cls.get_result_dir() / "metrics_MessagesCat.csv", "w", newline="" - ) as csv_file: - writer = csv.DictWriter(csv_file, fieldnames=RES_all_MessagesCat.keys()) + RES_all_MessagesCat = RES_all['MessagesCat'] + with open(cls.get_result_dir()/"metrics_MessagesCat.csv", 'w', newline='') as csv_file: + writer = csv.DictWriter(csv_file,fieldnames=RES_all_MessagesCat.keys()) writer.writeheader() writer.writerow(RES_all_MessagesCat) - + # splited csv exports for jenkins plots: GlobalScore - RES_GlobalScore = {"GlobalScore": RES_all["GlobalScore"]} - with open( - cls.get_result_dir() / "metrics_GlobalScore.csv", "w", newline="" - ) as csv_file: - writer = csv.DictWriter(csv_file, fieldnames=RES_GlobalScore.keys()) + RES_GlobalScore = {'GlobalScore': RES_all['GlobalScore']} + with open(cls.get_result_dir()/"metrics_GlobalScore.csv", 'w', newline='') as csv_file: + writer = csv.DictWriter(csv_file,fieldnames=RES_GlobalScore.keys()) writer.writeheader() writer.writerow(RES_GlobalScore) - + # converting the report using pylint_json2html (/!\ internal API, but as their is no leading '_' ...) - with open( - cls.get_result_dir() / "report.html", "w+", encoding="utf-8" - ) as Outfile: + with open(cls.get_result_dir()/"report.html","w+", encoding='utf-8') as Outfile: raw_data = json.loads(JsonContent) - report = pylint_json2html.Report(raw_data) + report=pylint_json2html.Report( raw_data) Outfile.write(report.render()) - + print("Done") diff --git a/helpers/types_check.py b/helpers/types_check.py index 6179581..4816e0c 100644 --- a/helpers/types_check.py +++ b/helpers/types_check.py @@ -16,46 +16,36 @@ from mypy import api from .helper_base import helper_withresults_base -class types_check(helper_withresults_base): +class types_check(helper_withresults_base): JUnitReportName = "junit.xml" - - @classmethod - def do_job(cls): + + @classmethod + def do_job(cls): print("checking code typing ...") - result = api.run( - [ # project path - "-m", - "src." + str(cls.pyproject["project"]["name"]), - # analysis configuration - "--ignore-missing-imports", - "--strict-equality", - # reports generation - "--cobertura-xml-report", - str(cls.get_result_dir()), - "--html-report", - str(cls.get_result_dir()), - "--linecount-report", - str(cls.get_result_dir()), - "--linecoverage-report", - str(cls.get_result_dir()), - "--lineprecision-report", - str(cls.get_result_dir()), - "--txt-report", - str(cls.get_result_dir()), - "--xml-report", - str(cls.get_result_dir()), - "--junit-xml", - str(cls.get_result_dir()) + "/" + cls.JUnitReportName, - ] - ) - + result = api.run([ # project path + "-m", + "src." + str(cls.pyproject['project']['name']), + # analysis configuration + "--ignore-missing-imports", + "--strict-equality", + # reports generation + "--cobertura-xml-report", str(cls.get_result_dir()), + "--html-report", str(cls.get_result_dir()), + "--linecount-report", str(cls.get_result_dir()), + "--linecoverage-report", str(cls.get_result_dir()), + "--lineprecision-report", str(cls.get_result_dir()), + "--txt-report", str(cls.get_result_dir()), + "--xml-report", str(cls.get_result_dir()), + "--junit-xml", str(cls.get_result_dir()) + "/" + cls.JUnitReportName + ]) + if result[0]: - print("\nType checking report:\n") + print('\nType checking report:\n') print(result[0]) # stdout - + if result[1]: - print("\nError report:\n") + print('\nError report:\n') print(result[1]) # stderr - - print("\nExit status:", result[2]) - print("Done") + + print('\nExit status:', result[2]) + print("Done") \ No newline at end of file diff --git a/helpers/unit_test.py b/helpers/unit_test.py index 166fa5c..571f2da 100644 --- a/helpers/unit_test.py +++ b/helpers/unit_test.py @@ -21,41 +21,34 @@ from junit2htmlreport import parser as junit2html_parser from .helper_base import helper_withresults_base -class unit_test(helper_withresults_base): - enable_coverage_check: bool = False - enable_xml_export: bool = True +class unit_test(helper_withresults_base): + enable_coverage_check: bool = False + enable_xml_export: bool = True enable_full_xml_export: bool = True - FullReportName: str = "full_report" - CoverageReportName: str = "test_coverage" - - @classmethod - def do_job(cls): - if cls.enable_coverage_check == True: + FullReportName: str = "full_report" + CoverageReportName: str = "test_coverage" + + @classmethod + def do_job(cls): + if cls.enable_coverage_check==True: import coverage - + # preparing unittest framework test_loader = unittest.TestLoader() - + if cls.enable_coverage_check == True: - # we start coverage now because module files discovery is part of the coverage measurement - CoverageReportPath = Path(str(cls.get_result_dir()) + "_coverage") + #we start coverage now because module files discovery is part of the coverage measurement + CoverageReportPath = Path(str(cls.get_result_dir())+"_coverage") cls._reset_dir(CoverageReportPath) - cov = coverage.Coverage( - cover_pylib=False, - branch=True, - source_pkgs=["src." + cls.pyproject["project"]["name"]], - ) + cov = coverage.Coverage(cover_pylib=False,branch=True,source_pkgs=["src."+cls.pyproject['project']['name']]) cov.start() - - package_tests = test_loader.discover( - start_dir=str(cls.project_rootdir_path / "test"), - top_level_dir=str(cls.project_rootdir_path / "test"), - ) + + package_tests = test_loader.discover(start_dir=str(cls.project_rootdir_path / "test"),top_level_dir=str(cls.project_rootdir_path / "test")) if cls.enable_xml_export: testRunner = xmlrunner.XMLTestRunner(output=str(str(cls.get_result_dir()))) else: testRunner = unittest.TextTestRunner() - + # running the test testRunner.run(package_tests) @@ -64,33 +57,23 @@ class unit_test(helper_withresults_base): cov.stop() cov.save() cov.html_report(directory=str(CoverageReportPath)) - cov.xml_report( - outfile=(CoverageReportPath / f"{cls.CoverageReportName}.xml") - ) - + cov.xml_report(outfile=(CoverageReportPath/f"{cls.CoverageReportName}.xml")) + # computing results (Only if xml available) if cls.enable_full_xml_export == True: print("Full reports generation...") - FullReportPath = Path(str(cls.get_result_dir()) + "_full") + FullReportPath = Path(str(cls.get_result_dir())+"_full") cls._reset_dir(FullReportPath) - + FullJUnitReport = JUnitXml() - for fname in [ - fname - for fname in os.listdir(cls.get_result_dir()) - if fname.endswith(".xml") - ]: - FullJUnitReport += JUnitXml.fromfile(str(cls.get_result_dir() / fname)) - + for fname in [fname for fname in os.listdir(cls.get_result_dir()) if fname.endswith('.xml')]: + FullJUnitReport+=JUnitXml.fromfile(str(cls.get_result_dir() / fname)) + current_datetime = datetime.datetime.utcnow().strftime("%Y%m%dT%H%M%SZ") full_report_base_name = f'{cls.pyproject["project"]["name"]}-{cls.FullReportName}-{current_datetime}' - FullJUnitReport.write(str(FullReportPath / f"{full_report_base_name}.xml")) - report = junit2html_parser.Junit( - FullReportPath / f"{full_report_base_name}.xml" - ) + FullJUnitReport.write(str(FullReportPath / f'{full_report_base_name}.xml')) + report = junit2html_parser.Junit(FullReportPath/ f'{full_report_base_name}.xml') html = report.html() - with open( - FullReportPath / f"{full_report_base_name}.html", "wb" - ) as outfile: - outfile.write(html.encode("utf-8")) - print("Done") + with open(FullReportPath/ f'{full_report_base_name}.html', "wb") as outfile: + outfile.write(html.encode('utf-8')) + print("Done") \ No newline at end of file diff --git a/test/test_gitversionhelper.py b/test/test_gitversionhelper.py index 7ae1c57..1507609 100644 --- a/test/test_gitversionhelper.py +++ b/test/test_gitversionhelper.py @@ -16,33 +16,33 @@ import copy import time import subprocess -print(__name__) -print(__package__) - from src import pygitversionhelper -HelperRegex=r"^(?P\d+)\.(?P\d+)\.(?P\d+)([\.\-\+])?(?:.*)?" +HelperRegex = r"^(?P\d+)\.(?P\d+)\.(?P\d+)([\.\-\+])?(?:.*)?" + class Test_gitversionhelper(unittest.TestCase): def setUp(self): - self.TmpWorkingDir=tempfile.TemporaryDirectory() - self.TmpWorkingDirPath=pathlib.Path(self.TmpWorkingDir.name) + self.TmpWorkingDir = tempfile.TemporaryDirectory() + self.TmpWorkingDirPath = pathlib.Path(self.TmpWorkingDir.name) os.chdir(self.TmpWorkingDirPath) os.system("git init") os.system('git config --local user.name "john doe"') os.system('git config --local user.email "john@doe.org"') - - def _test_version_readback(self,tag:str,**kwargs): - with open("demofile.txt", "w+t") as tmpFile: + + def _test_version_readback(self, tag: str, **kwargs): + with open("demofile.txt", "w+t") as tmpFile: tmpFile.write("testvalue") os.system("git add .") - os.system("git commit -m \"first commit\"") + os.system('git commit -m "first commit"') os.system(f"git tag {tag}") _v = pygitversionhelper.gitversionhelper.version.getLastVersion(**kwargs) - - self.assertIsInstance(_v, pygitversionhelper.gitversionhelper.version.MetaVersion) + + self.assertIsInstance( + _v, pygitversionhelper.gitversionhelper.version.MetaVersion + ) self.assertIsInstance(_v.raw, str) self.assertEqual(_v.raw, tag) self.assertIsInstance(_v.major, int) @@ -50,161 +50,199 @@ class Test_gitversionhelper(unittest.TestCase): self.assertIsInstance(_v.patch, int) self.assertIsInstance(_v.pre_count, int) self.assertIsInstance(_v.post_count, int) - _m = re.match(HelperRegex, tag) - self.assertEqual(int(_m.group("MAJ")),_v.major) - self.assertEqual(int(_m.group("MIN")),_v.minor) - self.assertEqual(int(_m.group("PATCH")),_v.patch) - + self.assertEqual(int(_m.group("MAJ")), _v.major) + self.assertEqual(int(_m.group("MIN")), _v.minor) + self.assertEqual(int(_m.group("PATCH")), _v.patch) + return _v - - def _test_version_format(self,_v:pygitversionhelper.gitversionhelper.version.MetaVersion,tag:str,**kwargs): - _f=_v.doFormatVersion(**kwargs) - self.assertRegex(_f,HelperRegex) + + def _test_version_format( + self, + _v: pygitversionhelper.gitversionhelper.version.MetaVersion, + tag: str, + **kwargs, + ): + _f = _v.doFormatVersion(**kwargs) + self.assertRegex(_f, HelperRegex) self.assertEqual(_f, tag) - - def _test_version_readback_simple(self,tag:str,**kwargs): - _v=self._test_version_readback(tag,**kwargs) - self._test_version_format(_v,tag,**kwargs) + + def _test_version_readback_simple(self, tag: str, **kwargs): + _v = self._test_version_readback(tag, **kwargs) + self._test_version_format(_v, tag, **kwargs) def test_nominal__version__formated_output(self): - _v = pygitversionhelper.gitversionhelper.version.MetaVersion("PEP440", - 1, - 0, - 0, - 0, - 0, - "1.0.0") + _v = pygitversionhelper.gitversionhelper.version.MetaVersion( + "PEP440", 1, 0, 0, 0, 0, "1.0.0" + ) self.assertEqual("1.0.1", _v.bump(formated_output=True)) - self.assertEqual("2.0.0", _v.bump(formated_output=True,bump_type="major")) - + self.assertEqual("2.0.0", _v.bump(formated_output=True, bump_type="major")) + def test_nominal__version__auto_1(self): self._test_version_readback_simple("0.0.1") + def test_nominal__version__auto_2(self): self._test_version_readback_simple("0.0.2") + def test_nominal__version__auto_3(self): self._test_version_readback_simple("0.1.0") + def test_nominal__version__auto_4(self): self._test_version_readback_simple("0.1.1") + def test_nominal__version__auto_5(self): self._test_version_readback_simple("1.0.0") + def test_nominal__version__auto_6(self): self._test_version_readback_simple("1.1.0") + def test_nominal__version__auto_7(self): self._test_version_readback_simple("1.2.0") + def test_nominal__version__auto_8(self): self._test_version_readback_simple("1.1.1") + def test_nominal__version__auto_9(self): self._test_version_readback_simple("1.2.1") - + def test_nominal__version__auto_PEP440_post(self): self._test_version_readback_simple("1.2.1.post1") + def test_nominal__version__auto_PEP440_pre(self): self._test_version_readback_simple("1.2.1.pre1") + def test_nominal__version__auto_PEP440_post_2(self): self._test_version_readback_simple("1.2.1.post10") + def test_nominal__version__auto_PEP440_pre_2(self): self._test_version_readback_simple("1.2.1.pre10") - + def test_nominal__version__auto_SemVer_post(self): self._test_version_readback_simple("1.2.1+post.1") + def test_nominal__version__auto_SemVer_pre(self): self._test_version_readback_simple("1.2.1-pre.1") + def test_nominal__version__auto_SemVer_post_2(self): self._test_version_readback_simple("1.2.1+post.10") + def test_nominal__version__auto_Semver_pre_2(self): self._test_version_readback_simple("1.2.1-pre.10") def test_nominal__version__PEP440_1(self): - self._test_version_readback_simple("0.0.1",version_std="PEP440") + self._test_version_readback_simple("0.0.1", version_std="PEP440") + def test_nominal__version__PEP440_2(self): - self._test_version_readback_simple("0.0.2",version_std="PEP440") + self._test_version_readback_simple("0.0.2", version_std="PEP440") + def test_nominal__version__PEP440_3(self): - self._test_version_readback_simple("0.1.0",version_std="PEP440") + self._test_version_readback_simple("0.1.0", version_std="PEP440") + def test_nominal__version__PEP440_4(self): - self._test_version_readback_simple("0.1.1",version_std="PEP440") + self._test_version_readback_simple("0.1.1", version_std="PEP440") + def test_nominal__version__PEP440_5(self): - self._test_version_readback_simple("1.0.0",version_std="PEP440") + self._test_version_readback_simple("1.0.0", version_std="PEP440") + def test_nominal__version__PEP440_6(self): - self._test_version_readback_simple("1.1.0",version_std="PEP440") + self._test_version_readback_simple("1.1.0", version_std="PEP440") + def test_nominal__version__PEP440_7(self): - self._test_version_readback_simple("1.2.0",version_std="PEP440") + self._test_version_readback_simple("1.2.0", version_std="PEP440") + def test_nominal__version__PEP440_8(self): - self._test_version_readback_simple("1.1.1",version_std="PEP440") + self._test_version_readback_simple("1.1.1", version_std="PEP440") + def test_nominal__version__PEP440_9(self): - self._test_version_readback_simple("1.2.1",version_std="PEP440") + self._test_version_readback_simple("1.2.1", version_std="PEP440") + def test_nominal__version__PEP440_post(self): - self._test_version_readback_simple("1.2.1.post1",version_std="PEP440") + self._test_version_readback_simple("1.2.1.post1", version_std="PEP440") + def test_nominal__version__PEP440_pre(self): - self._test_version_readback_simple("1.2.1.pre1",version_std="PEP440") + self._test_version_readback_simple("1.2.1.pre1", version_std="PEP440") + def test_nominal__version__PEP440_post_2(self): - self._test_version_readback_simple("1.2.1.post10",version_std="PEP440") + self._test_version_readback_simple("1.2.1.post10", version_std="PEP440") + def test_nominal__version__PEP440_pre_2(self): - self._test_version_readback_simple("1.2.1.pre10",version_std="PEP440") + self._test_version_readback_simple("1.2.1.pre10", version_std="PEP440") def test_nominal__version__SemVer_1(self): - self._test_version_readback_simple("0.0.1",version_std="SemVer") + self._test_version_readback_simple("0.0.1", version_std="SemVer") + def test_nominal__version__SemVer_2(self): - self._test_version_readback_simple("0.0.2",version_std="SemVer") + self._test_version_readback_simple("0.0.2", version_std="SemVer") + def test_nominal__version__SemVer_3(self): - self._test_version_readback_simple("0.1.0",version_std="SemVer") + self._test_version_readback_simple("0.1.0", version_std="SemVer") + def test_nominal__version__SemVer_4(self): - self._test_version_readback_simple("0.1.1",version_std="SemVer") + self._test_version_readback_simple("0.1.1", version_std="SemVer") + def test_nominal__version__SemVer_5(self): - self._test_version_readback_simple("1.0.0",version_std="SemVer") + self._test_version_readback_simple("1.0.0", version_std="SemVer") + def test_nominal__version__SemVer_6(self): - self._test_version_readback_simple("1.1.0",version_std="SemVer") + self._test_version_readback_simple("1.1.0", version_std="SemVer") + def test_nominal__version__SemVer_7(self): - self._test_version_readback_simple("1.2.0",version_std="SemVer") + self._test_version_readback_simple("1.2.0", version_std="SemVer") + def test_nominal__version__SemVer_8(self): - self._test_version_readback_simple("1.1.1",version_std="SemVer") + self._test_version_readback_simple("1.1.1", version_std="SemVer") + def test_nominal__version__SemVer_9(self): - self._test_version_readback_simple("1.2.1",version_std="SemVer") + self._test_version_readback_simple("1.2.1", version_std="SemVer") + def test_nominal__version__SemVer_post(self): - self._test_version_readback_simple("1.2.1+post.1",version_std="SemVer") + self._test_version_readback_simple("1.2.1+post.1", version_std="SemVer") + def test_nominal__version__SemVer_pre(self): - self._test_version_readback_simple("1.2.1-pre.1",version_std="SemVer") + self._test_version_readback_simple("1.2.1-pre.1", version_std="SemVer") + def test_nominal__version__SemVer_post_2(self): - self._test_version_readback_simple("1.2.1+post.10",version_std="SemVer") + self._test_version_readback_simple("1.2.1+post.10", version_std="SemVer") + def test_nominal__version__SemVer_pre_2(self): - self._test_version_readback_simple("1.2.1-pre.10",version_std="SemVer") - + self._test_version_readback_simple("1.2.1-pre.10", version_std="SemVer") + def test_nominal__version__post_PEP440_to_SemVer(self): - _v=self._test_version_readback("1.2.1.post10",version_std="PEP440") - self._test_version_format(_v,"1.2.1+post.10",version_std="SemVer") - + _v = self._test_version_readback("1.2.1.post10", version_std="PEP440") + self._test_version_format(_v, "1.2.1+post.10", version_std="SemVer") + def test_nominal__version__post_SemVer_to_PEP440(self): - _v=self._test_version_readback("1.2.1+post.10",version_std="SemVer") - self._test_version_format(_v,"1.2.1.post10",version_std="PEP440") + _v = self._test_version_readback("1.2.1+post.10", version_std="SemVer") + self._test_version_format(_v, "1.2.1.post10", version_std="PEP440") def test_nominal__version__pre_PEP440_to_SemVer(self): - _v=self._test_version_readback("1.2.1.pre10",version_std="PEP440") - self._test_version_format(_v,"1.2.1-pre.10",version_std="SemVer") - + _v = self._test_version_readback("1.2.1.pre10", version_std="PEP440") + self._test_version_format(_v, "1.2.1-pre.10", version_std="SemVer") + def test_nominal__version__pre_SemVer_to_PEP440(self): - _v=self._test_version_readback("1.2.1-pre.10",version_std="SemVer") - self._test_version_format(_v,"1.2.1.pre10",version_std="PEP440") - + _v = self._test_version_readback("1.2.1-pre.10", version_std="SemVer") + self._test_version_format(_v, "1.2.1.pre10", version_std="PEP440") + def test_nominal__version__post_SemVer_nonum(self): - _v=self._test_version_readback("1.2.1+post",version_std="SemVer") - self._test_version_format(_v,"1.2.1+post.1",version_std="SemVer") - + _v = self._test_version_readback("1.2.1+post", version_std="SemVer") + self._test_version_format(_v, "1.2.1+post.1", version_std="SemVer") + def test_nominal__version__post_SemVer_nonum_random(self): - _v=self._test_version_readback("1.2.1+toto",version_std="SemVer") - self._test_version_format(_v,"1.2.1+post.1",version_std="SemVer") - + _v = self._test_version_readback("1.2.1+toto", version_std="SemVer") + self._test_version_format(_v, "1.2.1+post.1", version_std="SemVer") + def test_nominal__version__pre_SemVer_nonum(self): - _v=self._test_version_readback("1.2.1-pre",version_std="SemVer") - self._test_version_format(_v,"1.2.1-pre.1",version_std="SemVer") - + _v = self._test_version_readback("1.2.1-pre", version_std="SemVer") + self._test_version_format(_v, "1.2.1-pre.1", version_std="SemVer") + def test_nominal__version__pre_SemVer_nonum_random(self): - _v=self._test_version_readback("1.2.1-toto",version_std="SemVer") - self._test_version_format(_v,"1.2.1-pre.1",version_std="SemVer") - + _v = self._test_version_readback("1.2.1-toto", version_std="SemVer") + self._test_version_format(_v, "1.2.1-pre.1", version_std="SemVer") + def test_nominal__version___pump_SemVer(self): - _v = self._test_version_readback("1.0.0",version_std="SemVer") - + _v = self._test_version_readback("1.0.0", version_std="SemVer") + _v = _v.bump() self.assertIsInstance(_v.raw, str) self.assertIsInstance(_v.major, int) @@ -219,7 +257,7 @@ class Test_gitversionhelper(unittest.TestCase): self.assertEqual(_v.pre_count, 0) self.assertEqual(_v.post_count, 0) self.assertEqual(_v.doFormatVersion(), "1.0.1") - + _v = _v.bump(bump_type="patch") self.assertEqual(_v.raw, "1.0.2") self.assertEqual(_v.major, 1) @@ -228,7 +266,7 @@ class Test_gitversionhelper(unittest.TestCase): self.assertEqual(_v.pre_count, 0) self.assertEqual(_v.post_count, 0) self.assertEqual(_v.doFormatVersion(), "1.0.2") - + _v = _v.bump(bump_type="minor") self.assertEqual(_v.raw, "1.1.2") self.assertEqual(_v.major, 1) @@ -237,7 +275,7 @@ class Test_gitversionhelper(unittest.TestCase): self.assertEqual(_v.pre_count, 0) self.assertEqual(_v.post_count, 0) self.assertEqual(_v.doFormatVersion(), "1.1.2") - + _v = _v.bump(bump_type="major") self.assertEqual(_v.raw, "2.1.2") self.assertEqual(_v.major, 2) @@ -246,7 +284,7 @@ class Test_gitversionhelper(unittest.TestCase): self.assertEqual(_v.pre_count, 0) self.assertEqual(_v.post_count, 0) self.assertEqual(_v.doFormatVersion(), "2.1.2") - + _v = _v.bump(bump_type="dev") self.assertEqual(_v.raw, "2.1.2+post.1") self.assertEqual(_v.major, 2) @@ -255,7 +293,7 @@ class Test_gitversionhelper(unittest.TestCase): self.assertEqual(_v.pre_count, 0) self.assertEqual(_v.post_count, 1) self.assertEqual(_v.doFormatVersion(), "2.1.2+post.1") - + _v = _v.bump(bump_type="dev") self.assertEqual(_v.raw, "2.1.2+post.2") self.assertEqual(_v.major, 2) @@ -264,7 +302,7 @@ class Test_gitversionhelper(unittest.TestCase): self.assertEqual(_v.pre_count, 0) self.assertEqual(_v.post_count, 2) self.assertEqual(_v.doFormatVersion(), "2.1.2+post.2") - + _v = _v.bump(bump_type="patch") self.assertEqual(_v.raw, "2.1.3") self.assertEqual(_v.major, 2) @@ -272,9 +310,9 @@ class Test_gitversionhelper(unittest.TestCase): self.assertEqual(_v.patch, 3) self.assertEqual(_v.pre_count, 0) self.assertEqual(_v.post_count, 0) - self.assertEqual(_v.doFormatVersion(), "2.1.3") - - _v = _v.bump(bump_type="dev",bump_dev_strategy="pre-patch") + self.assertEqual(_v.doFormatVersion(), "2.1.3") + + _v = _v.bump(bump_type="dev", bump_dev_strategy="pre-patch") self.assertEqual(_v.raw, "2.1.4-pre.1") self.assertEqual(_v.major, 2) self.assertEqual(_v.minor, 1) @@ -282,8 +320,8 @@ class Test_gitversionhelper(unittest.TestCase): self.assertEqual(_v.pre_count, 1) self.assertEqual(_v.post_count, 0) self.assertEqual(_v.doFormatVersion(), "2.1.4-pre.1") - - _v = _v.bump(bump_type="dev",bump_dev_strategy="pre-patch") + + _v = _v.bump(bump_type="dev", bump_dev_strategy="pre-patch") self.assertEqual(_v.raw, "2.1.4-pre.2") self.assertEqual(_v.major, 2) self.assertEqual(_v.minor, 1) @@ -291,8 +329,8 @@ class Test_gitversionhelper(unittest.TestCase): self.assertEqual(_v.pre_count, 2) self.assertEqual(_v.post_count, 0) self.assertEqual(_v.doFormatVersion(), "2.1.4-pre.2") - - _v = _v.bump(bump_type="dev",bump_dev_strategy="post") + + _v = _v.bump(bump_type="dev", bump_dev_strategy="post") self.assertEqual(_v.raw, "2.1.4-pre.3") self.assertEqual(_v.major, 2) self.assertEqual(_v.minor, 1) @@ -300,7 +338,7 @@ class Test_gitversionhelper(unittest.TestCase): self.assertEqual(_v.pre_count, 3) self.assertEqual(_v.post_count, 0) self.assertEqual(_v.doFormatVersion(), "2.1.4-pre.3") - + _v = _v.bump(bump_type="patch") self.assertEqual(_v.raw, "2.1.5") self.assertEqual(_v.major, 2) @@ -308,9 +346,9 @@ class Test_gitversionhelper(unittest.TestCase): self.assertEqual(_v.patch, 5) self.assertEqual(_v.pre_count, 0) self.assertEqual(_v.post_count, 0) - self.assertEqual(_v.doFormatVersion(), "2.1.5") - - _v = _v.bump(bump_type="dev",bump_dev_strategy="post") + self.assertEqual(_v.doFormatVersion(), "2.1.5") + + _v = _v.bump(bump_type="dev", bump_dev_strategy="post") self.assertEqual(_v.raw, "2.1.5+post.1") self.assertEqual(_v.major, 2) self.assertEqual(_v.minor, 1) @@ -318,8 +356,8 @@ class Test_gitversionhelper(unittest.TestCase): self.assertEqual(_v.pre_count, 0) self.assertEqual(_v.post_count, 1) self.assertEqual(_v.doFormatVersion(), "2.1.5+post.1") - - _v = _v.bump(bump_type="dev",bump_dev_strategy="pre-patch") + + _v = _v.bump(bump_type="dev", bump_dev_strategy="pre-patch") self.assertEqual(_v.raw, "2.1.5+post.2") self.assertEqual(_v.major, 2) self.assertEqual(_v.minor, 1) @@ -329,8 +367,8 @@ class Test_gitversionhelper(unittest.TestCase): self.assertEqual(_v.doFormatVersion(), "2.1.5+post.2") def test_nominal__version___pump_PEP440(self): - _v = self._test_version_readback("1.0.0",version_std="PEP440") - + _v = self._test_version_readback("1.0.0", version_std="PEP440") + _v = _v.bump() self.assertIsInstance(_v.raw, str) self.assertIsInstance(_v.major, int) @@ -345,7 +383,7 @@ class Test_gitversionhelper(unittest.TestCase): self.assertEqual(_v.pre_count, 0) self.assertEqual(_v.post_count, 0) self.assertEqual(_v.doFormatVersion(), "1.0.1") - + _v = _v.bump(bump_type="patch") self.assertEqual(_v.raw, "1.0.2") self.assertEqual(_v.major, 1) @@ -354,7 +392,7 @@ class Test_gitversionhelper(unittest.TestCase): self.assertEqual(_v.pre_count, 0) self.assertEqual(_v.post_count, 0) self.assertEqual(_v.doFormatVersion(), "1.0.2") - + _v = _v.bump(bump_type="minor") self.assertEqual(_v.raw, "1.1.2") self.assertEqual(_v.major, 1) @@ -363,7 +401,7 @@ class Test_gitversionhelper(unittest.TestCase): self.assertEqual(_v.pre_count, 0) self.assertEqual(_v.post_count, 0) self.assertEqual(_v.doFormatVersion(), "1.1.2") - + _v = _v.bump(bump_type="major") self.assertEqual(_v.raw, "2.1.2") self.assertEqual(_v.major, 2) @@ -372,7 +410,7 @@ class Test_gitversionhelper(unittest.TestCase): self.assertEqual(_v.pre_count, 0) self.assertEqual(_v.post_count, 0) self.assertEqual(_v.doFormatVersion(), "2.1.2") - + _v = _v.bump(bump_type="dev") self.assertEqual(_v.raw, "2.1.2.post1") self.assertEqual(_v.major, 2) @@ -381,7 +419,7 @@ class Test_gitversionhelper(unittest.TestCase): self.assertEqual(_v.pre_count, 0) self.assertEqual(_v.post_count, 1) self.assertEqual(_v.doFormatVersion(), "2.1.2.post1") - + _v = _v.bump(bump_type="dev") self.assertEqual(_v.raw, "2.1.2.post2") self.assertEqual(_v.major, 2) @@ -390,7 +428,7 @@ class Test_gitversionhelper(unittest.TestCase): self.assertEqual(_v.pre_count, 0) self.assertEqual(_v.post_count, 2) self.assertEqual(_v.doFormatVersion(), "2.1.2.post2") - + _v = _v.bump(bump_type="patch") self.assertEqual(_v.raw, "2.1.3") self.assertEqual(_v.major, 2) @@ -398,9 +436,9 @@ class Test_gitversionhelper(unittest.TestCase): self.assertEqual(_v.patch, 3) self.assertEqual(_v.pre_count, 0) self.assertEqual(_v.post_count, 0) - self.assertEqual(_v.doFormatVersion(), "2.1.3") - - _v = _v.bump(bump_type="dev",bump_dev_strategy="pre-patch") + self.assertEqual(_v.doFormatVersion(), "2.1.3") + + _v = _v.bump(bump_type="dev", bump_dev_strategy="pre-patch") self.assertEqual(_v.raw, "2.1.4.pre1") self.assertEqual(_v.major, 2) self.assertEqual(_v.minor, 1) @@ -408,8 +446,8 @@ class Test_gitversionhelper(unittest.TestCase): self.assertEqual(_v.pre_count, 1) self.assertEqual(_v.post_count, 0) self.assertEqual(_v.doFormatVersion(), "2.1.4.pre1") - - _v = _v.bump(bump_type="dev",bump_dev_strategy="pre-patch") + + _v = _v.bump(bump_type="dev", bump_dev_strategy="pre-patch") self.assertEqual(_v.raw, "2.1.4.pre2") self.assertEqual(_v.major, 2) self.assertEqual(_v.minor, 1) @@ -417,8 +455,8 @@ class Test_gitversionhelper(unittest.TestCase): self.assertEqual(_v.pre_count, 2) self.assertEqual(_v.post_count, 0) self.assertEqual(_v.doFormatVersion(), "2.1.4.pre2") - - _v = _v.bump(bump_type="dev",bump_dev_strategy="post") + + _v = _v.bump(bump_type="dev", bump_dev_strategy="post") self.assertEqual(_v.raw, "2.1.4.pre3") self.assertEqual(_v.major, 2) self.assertEqual(_v.minor, 1) @@ -426,7 +464,7 @@ class Test_gitversionhelper(unittest.TestCase): self.assertEqual(_v.pre_count, 3) self.assertEqual(_v.post_count, 0) self.assertEqual(_v.doFormatVersion(), "2.1.4.pre3") - + _v = _v.bump(bump_type="patch") self.assertEqual(_v.raw, "2.1.5") self.assertEqual(_v.major, 2) @@ -434,9 +472,9 @@ class Test_gitversionhelper(unittest.TestCase): self.assertEqual(_v.patch, 5) self.assertEqual(_v.pre_count, 0) self.assertEqual(_v.post_count, 0) - self.assertEqual(_v.doFormatVersion(), "2.1.5") - - _v = _v.bump(bump_type="dev",bump_dev_strategy="post") + self.assertEqual(_v.doFormatVersion(), "2.1.5") + + _v = _v.bump(bump_type="dev", bump_dev_strategy="post") self.assertEqual(_v.raw, "2.1.5.post1") self.assertEqual(_v.major, 2) self.assertEqual(_v.minor, 1) @@ -444,8 +482,8 @@ class Test_gitversionhelper(unittest.TestCase): self.assertEqual(_v.pre_count, 0) self.assertEqual(_v.post_count, 1) self.assertEqual(_v.doFormatVersion(), "2.1.5.post1") - - _v = _v.bump(bump_type="dev",bump_dev_strategy="pre-patch") + + _v = _v.bump(bump_type="dev", bump_dev_strategy="pre-patch") self.assertEqual(_v.raw, "2.1.5.post2") self.assertEqual(_v.major, 2) self.assertEqual(_v.minor, 1) @@ -453,244 +491,290 @@ class Test_gitversionhelper(unittest.TestCase): self.assertEqual(_v.pre_count, 0) self.assertEqual(_v.post_count, 2) self.assertEqual(_v.doFormatVersion(), "2.1.5.post2") - + def test_nominal__version___SemVer_zeroRev(self): - _v=self._test_version_readback("0.0.0",version_std="SemVer") - self._test_version_format(_v,"0.0.0",version_std="SemVer") - + _v = self._test_version_readback("0.0.0", version_std="SemVer") + self._test_version_format(_v, "0.0.0", version_std="SemVer") + def test_nominal__version___PEP440_zeroRev(self): - _v=self._test_version_readback("0.0.0",version_std="PEP440") - self._test_version_format(_v,"0.0.0",version_std="PEP440") - + _v = self._test_version_readback("0.0.0", version_std="PEP440") + self._test_version_format(_v, "0.0.0", version_std="PEP440") def test_nominal__version___PEP440_noRev_noTag(self): - with open("demofile.txt", "w+t") as tmpFile: + with open("demofile.txt", "w+t") as tmpFile: tmpFile.write("testvalue") os.system("git add .") - os.system("git commit -m \"first commit\"") - - _v = pygitversionhelper.gitversionhelper.version.getLastVersion(version_std="PEP440") - - self.assertIsInstance(_v, pygitversionhelper.gitversionhelper.version.MetaVersion) - self._test_version_format(_v,"0.1.0",version_std="PEP440") + os.system('git commit -m "first commit"') + + _v = pygitversionhelper.gitversionhelper.version.getLastVersion( + version_std="PEP440" + ) + + self.assertIsInstance( + _v, pygitversionhelper.gitversionhelper.version.MetaVersion + ) + self._test_version_format(_v, "0.1.0", version_std="PEP440") self.assertEqual(_v.raw, "0.1.0") - self.assertEqual(_v.major,0) - self.assertEqual(_v.minor,1) - self.assertEqual(_v.patch,0) - + self.assertEqual(_v.major, 0) + self.assertEqual(_v.minor, 1) + self.assertEqual(_v.patch, 0) + def test_nominal__version___SemVer_noRev_noTag(self): - with open("demofile.txt", "w+t") as tmpFile: + with open("demofile.txt", "w+t") as tmpFile: tmpFile.write("testvalue") os.system("git add .") - os.system("git commit -m \"first commit\"") - - _v = pygitversionhelper.gitversionhelper.version.getLastVersion(version_std="SemVer") - - self.assertIsInstance(_v, pygitversionhelper.gitversionhelper.version.MetaVersion) - self._test_version_format(_v,"0.1.0",version_std="SemVer") + os.system('git commit -m "first commit"') + + _v = pygitversionhelper.gitversionhelper.version.getLastVersion( + version_std="SemVer" + ) + + self.assertIsInstance( + _v, pygitversionhelper.gitversionhelper.version.MetaVersion + ) + self._test_version_format(_v, "0.1.0", version_std="SemVer") self.assertEqual(_v.raw, "0.1.0") - self.assertEqual(_v.major,0) - self.assertEqual(_v.minor,1) - self.assertEqual(_v.patch,0) - + self.assertEqual(_v.major, 0) + self.assertEqual(_v.minor, 1) + self.assertEqual(_v.patch, 0) + def test_nominal__version___AUTO_noRev_noTag(self): - with open("demofile.txt", "w+t") as tmpFile: + with open("demofile.txt", "w+t") as tmpFile: tmpFile.write("testvalue") os.system("git add .") - os.system("git commit -m \"first commit\"") - + os.system('git commit -m "first commit"') + _v = pygitversionhelper.gitversionhelper.version.getLastVersion() - - self.assertIsInstance(_v, pygitversionhelper.gitversionhelper.version.MetaVersion) - self._test_version_format(_v,"0.1.0") + + self.assertIsInstance( + _v, pygitversionhelper.gitversionhelper.version.MetaVersion + ) + self._test_version_format(_v, "0.1.0") self.assertEqual(_v.raw, "0.1.0") - self.assertEqual(_v.major,0) - self.assertEqual(_v.minor,1) - self.assertEqual(_v.patch,0) + self.assertEqual(_v.major, 0) + self.assertEqual(_v.minor, 1) + self.assertEqual(_v.patch, 0) def test_nominal__version___AUTO_bump_commits(self): - with open("demofile.txt", "w+t") as tmpFile: + with open("demofile.txt", "w+t") as tmpFile: tmpFile.write("testvalue") os.system("git add .") - os.system("git commit -m \"first commit\"") + os.system('git commit -m "first commit"') os.system(f"git tag 0.2.0") - + _v = pygitversionhelper.gitversionhelper.version.getCurrentVersion() - - self.assertIsInstance(_v, pygitversionhelper.gitversionhelper.version.MetaVersion) - self._test_version_format(_v,"0.2.0") + + self.assertIsInstance( + _v, pygitversionhelper.gitversionhelper.version.MetaVersion + ) + self._test_version_format(_v, "0.2.0") self.assertEqual(_v.raw, "0.2.0") - self.assertEqual(_v.major,0) - self.assertEqual(_v.minor,2) - self.assertEqual(_v.patch,0) - self.assertEqual(_v.pre_count,0) - self.assertEqual(_v.post_count,0) - - with open("demofile.txt", "w+t") as tmpFile: - tmpFile.write("testvalue22") + self.assertEqual(_v.major, 0) + self.assertEqual(_v.minor, 2) + self.assertEqual(_v.patch, 0) + self.assertEqual(_v.pre_count, 0) + self.assertEqual(_v.post_count, 0) + + with open("demofile.txt", "w+t") as tmpFile: + tmpFile.write("testvalue22") os.system("git add .") - os.system("git commit -m \"2nd commit\"") + os.system('git commit -m "2nd commit"') _v = pygitversionhelper.gitversionhelper.version.getCurrentVersion() - - self.assertIsInstance(_v, pygitversionhelper.gitversionhelper.version.MetaVersion) - self._test_version_format(_v,"0.2.1") + + self.assertIsInstance( + _v, pygitversionhelper.gitversionhelper.version.MetaVersion + ) + self._test_version_format(_v, "0.2.1") self.assertEqual(_v.raw, "0.2.1") - self.assertEqual(_v.major,0) - self.assertEqual(_v.minor,2) - self.assertEqual(_v.patch,1) - self.assertEqual(_v.pre_count,0) - self.assertEqual(_v.post_count,0) + self.assertEqual(_v.major, 0) + self.assertEqual(_v.minor, 2) + self.assertEqual(_v.patch, 1) + self.assertEqual(_v.pre_count, 0) + self.assertEqual(_v.post_count, 0) - with open("demofile.txt", "w+t") as tmpFile: - tmpFile.write("testvalue223") + with open("demofile.txt", "w+t") as tmpFile: + tmpFile.write("testvalue223") os.system("git add .") - os.system("git commit -m \"3rd commit\"") - - with open("demofile.txt", "w+t") as tmpFile: - tmpFile.write("testvalue224") + os.system('git commit -m "3rd commit"') + + with open("demofile.txt", "w+t") as tmpFile: + tmpFile.write("testvalue224") os.system("git add .") - os.system("git commit -m \"4th commit\"") - + os.system('git commit -m "4th commit"') + _v = pygitversionhelper.gitversionhelper.version.getCurrentVersion() - - self.assertIsInstance(_v, pygitversionhelper.gitversionhelper.version.MetaVersion) - self._test_version_format(_v,"0.2.3") - self.assertEqual(_v.raw, "0.2.3") - self.assertEqual(_v.major,0) - self.assertEqual(_v.minor,2) - self.assertEqual(_v.patch,3) - self.assertEqual(_v.pre_count,0) - self.assertEqual(_v.post_count,0) - - with open("demofile.txt", "w+t") as tmpFile: - tmpFile.write("testvalue225") - os.system("git add .") - os.system("git commit -m \"5th commit\"") - - _v = pygitversionhelper.gitversionhelper.version.getCurrentVersion(bump_type="dev") - - self.assertIsInstance(_v, pygitversionhelper.gitversionhelper.version.MetaVersion) - self.assertIsInstance(_v.raw, str) - self._test_version_format(_v,"0.2.0+post.4") - self.assertEqual(_v.raw, "0.2.0+post.4") - self.assertEqual(_v.major,0) - self.assertEqual(_v.minor,2) - self.assertEqual(_v.patch,0) - self.assertEqual(_v.pre_count,0) - self.assertEqual(_v.post_count,4) - - _v = pygitversionhelper.gitversionhelper.version.getCurrentVersion(bump_type="dev",bump_dev_strategy="pre-patch") - - self.assertIsInstance(_v, pygitversionhelper.gitversionhelper.version.MetaVersion) - self._test_version_format(_v,"0.2.1-pre.4") - self.assertEqual(_v.raw, "0.2.1-pre.4") - self.assertEqual(_v.major,0) - self.assertEqual(_v.minor,2) - self.assertEqual(_v.patch,1) - self.assertEqual(_v.pre_count,4) - self.assertEqual(_v.post_count,0) - - _v = pygitversionhelper.gitversionhelper.version.getCurrentVersion(bump_type="dev",bump_dev_strategy="pre-minor") - - self.assertIsInstance(_v, pygitversionhelper.gitversionhelper.version.MetaVersion) - self._test_version_format(_v,"0.3.0-pre.4") - self.assertEqual(_v.raw, "0.3.0-pre.4") - self.assertEqual(_v.major,0) - self.assertEqual(_v.minor,3) - self.assertEqual(_v.patch,0) - self.assertEqual(_v.pre_count,4) - self.assertEqual(_v.post_count,0) - - _v = pygitversionhelper.gitversionhelper.version.getCurrentVersion(bump_type="dev",bump_dev_strategy="pre-major") - - self.assertIsInstance(_v, pygitversionhelper.gitversionhelper.version.MetaVersion) - self._test_version_format(_v,"1.0.0-pre.4") - self.assertEqual(_v.raw, "1.0.0-pre.4") - self.assertEqual(_v.major,1) - self.assertEqual(_v.minor,0) - self.assertEqual(_v.patch,0) - self.assertEqual(_v.pre_count,4) - self.assertEqual(_v.post_count,0) - - def test_nominal__version___custom_format(self): - _v=self._test_version_readback("0.1.1",version_std="PEP440") - - self.assertEqual("V_0_1_1____",_v.doFormatVersion(output_format="V_{major}_{minor}_{patch}____{revcount}")) - self.assertEqual("V_0_1",_v.doFormatVersion(output_format="V_{major}_{minor}")) - - with open("demofile.txt", "w+t") as tmpFile: - tmpFile.write("testvalue225") - os.system("git add .") - os.system("git commit -m \"5th commit\"") - - self.assertEqual("V_1_0",pygitversionhelper.gitversionhelper.version.getCurrentVersion(bump_type="dev",bump_dev_strategy="pre-major").doFormatVersion(output_format="V_{major}_{minor}")) - self.assertEqual("V_1_0",pygitversionhelper.gitversionhelper.version.getCurrentVersion(bump_type="dev",bump_dev_strategy="pre-major",output_format="V_{major}_{minor}",formated_output=True)) + self.assertIsInstance( + _v, pygitversionhelper.gitversionhelper.version.MetaVersion + ) + self._test_version_format(_v, "0.2.3") + self.assertEqual(_v.raw, "0.2.3") + self.assertEqual(_v.major, 0) + self.assertEqual(_v.minor, 2) + self.assertEqual(_v.patch, 3) + self.assertEqual(_v.pre_count, 0) + self.assertEqual(_v.post_count, 0) + + with open("demofile.txt", "w+t") as tmpFile: + tmpFile.write("testvalue225") + os.system("git add .") + os.system('git commit -m "5th commit"') + + _v = pygitversionhelper.gitversionhelper.version.getCurrentVersion( + bump_type="dev" + ) + + self.assertIsInstance( + _v, pygitversionhelper.gitversionhelper.version.MetaVersion + ) + self.assertIsInstance(_v.raw, str) + self._test_version_format(_v, "0.2.0+post.4") + self.assertEqual(_v.raw, "0.2.0+post.4") + self.assertEqual(_v.major, 0) + self.assertEqual(_v.minor, 2) + self.assertEqual(_v.patch, 0) + self.assertEqual(_v.pre_count, 0) + self.assertEqual(_v.post_count, 4) + + _v = pygitversionhelper.gitversionhelper.version.getCurrentVersion( + bump_type="dev", bump_dev_strategy="pre-patch" + ) + + self.assertIsInstance( + _v, pygitversionhelper.gitversionhelper.version.MetaVersion + ) + self._test_version_format(_v, "0.2.1-pre.4") + self.assertEqual(_v.raw, "0.2.1-pre.4") + self.assertEqual(_v.major, 0) + self.assertEqual(_v.minor, 2) + self.assertEqual(_v.patch, 1) + self.assertEqual(_v.pre_count, 4) + self.assertEqual(_v.post_count, 0) + + _v = pygitversionhelper.gitversionhelper.version.getCurrentVersion( + bump_type="dev", bump_dev_strategy="pre-minor" + ) + + self.assertIsInstance( + _v, pygitversionhelper.gitversionhelper.version.MetaVersion + ) + self._test_version_format(_v, "0.3.0-pre.4") + self.assertEqual(_v.raw, "0.3.0-pre.4") + self.assertEqual(_v.major, 0) + self.assertEqual(_v.minor, 3) + self.assertEqual(_v.patch, 0) + self.assertEqual(_v.pre_count, 4) + self.assertEqual(_v.post_count, 0) + + _v = pygitversionhelper.gitversionhelper.version.getCurrentVersion( + bump_type="dev", bump_dev_strategy="pre-major" + ) + + self.assertIsInstance( + _v, pygitversionhelper.gitversionhelper.version.MetaVersion + ) + self._test_version_format(_v, "1.0.0-pre.4") + self.assertEqual(_v.raw, "1.0.0-pre.4") + self.assertEqual(_v.major, 1) + self.assertEqual(_v.minor, 0) + self.assertEqual(_v.patch, 0) + self.assertEqual(_v.pre_count, 4) + self.assertEqual(_v.post_count, 0) + + def test_nominal__version___custom_format(self): + _v = self._test_version_readback("0.1.1", version_std="PEP440") + + self.assertEqual( + "V_0_1_1____", + _v.doFormatVersion(output_format="V_{major}_{minor}_{patch}____{revcount}"), + ) + self.assertEqual("V_0_1", _v.doFormatVersion(output_format="V_{major}_{minor}")) + + with open("demofile.txt", "w+t") as tmpFile: + tmpFile.write("testvalue225") + os.system("git add .") + os.system('git commit -m "5th commit"') + + self.assertEqual( + "V_1_0", + pygitversionhelper.gitversionhelper.version.getCurrentVersion( + bump_type="dev", bump_dev_strategy="pre-major" + ).doFormatVersion(output_format="V_{major}_{minor}"), + ) + self.assertEqual( + "V_1_0", + pygitversionhelper.gitversionhelper.version.getCurrentVersion( + bump_type="dev", + bump_dev_strategy="pre-major", + output_format="V_{major}_{minor}", + formated_output=True, + ), + ) def test_nominal__git__emptyrepo(self): _v = pygitversionhelper.gitversionhelper.version.getCurrentVersion() - self.assertIsInstance(_v, pygitversionhelper.gitversionhelper.version.MetaVersion) - self._test_version_format(_v,"0.1.0") + self.assertIsInstance( + _v, pygitversionhelper.gitversionhelper.version.MetaVersion + ) + self._test_version_format(_v, "0.1.0") self.assertEqual(_v.raw, "0.1.0") - - self.assertEqual(_v.major,0) - self.assertEqual(_v.minor,1) - self.assertEqual(_v.patch,0) - self.assertEqual(_v.pre_count,0) - self.assertEqual(_v.post_count,0) - + + self.assertEqual(_v.major, 0) + self.assertEqual(_v.minor, 1) + self.assertEqual(_v.patch, 0) + self.assertEqual(_v.pre_count, 0) + self.assertEqual(_v.post_count, 0) + def test_defect__git__dirty(self): - _v=self._test_version_readback("0.1.1",version_std="PEP440") - - with open("demofile.txt", "w+t") as tmpFile: - tmpFile.write("testvalue225") - - with self.assertRaises(pygitversionhelper.gitversionhelper.repository.repositoryDirty) : + _v = self._test_version_readback("0.1.1", version_std="PEP440") + + with open("demofile.txt", "w+t") as tmpFile: + tmpFile.write("testvalue225") + + with self.assertRaises( + pygitversionhelper.gitversionhelper.repository.repositoryDirty + ): pygitversionhelper.gitversionhelper.version.getCurrentVersion() - def test_defect__version_post_and_pre_output(self): - _v = pygitversionhelper.gitversionhelper.version.MetaVersion("PEP440", - 0, - 0, - 1, - 1, - 1, - "0.0.1.pre1.post1") - with self.assertRaises(pygitversionhelper.gitversionhelper.version.PreAndPostVersionUnsupported) : + _v = pygitversionhelper.gitversionhelper.version.MetaVersion( + "PEP440", 0, 0, 1, 1, 1, "0.0.1.pre1.post1" + ) + with self.assertRaises( + pygitversionhelper.gitversionhelper.version.PreAndPostVersionUnsupported + ): _v.doFormatVersion() - - _v = pygitversionhelper.gitversionhelper.version.MetaVersion("SemVer", - 0, - 0, - 1, - 1, - 1, - "0.0.1-pre.1+post.1") - with self.assertRaises(pygitversionhelper.gitversionhelper.version.PreAndPostVersionUnsupported) : + + _v = pygitversionhelper.gitversionhelper.version.MetaVersion( + "SemVer", 0, 0, 1, 1, 1, "0.0.1-pre.1+post.1" + ) + with self.assertRaises( + pygitversionhelper.gitversionhelper.version.PreAndPostVersionUnsupported + ): _v.doFormatVersion() - + def test_defect__version_post_and_pre_parse(self): - with self.assertRaises(pygitversionhelper.gitversionhelper.version.PreAndPostVersionUnsupported) : + with self.assertRaises( + pygitversionhelper.gitversionhelper.version.PreAndPostVersionUnsupported + ): pygitversionhelper.gitversionhelper.version._parseTag("0.0.1.pre1.post1") - def test_defect__git__wrongargument_sortargs(self): - with self.assertRaises(pygitversionhelper.gitversionhelper.wrongArguments) : + with self.assertRaises(pygitversionhelper.gitversionhelper.wrongArguments): pygitversionhelper.gitversionhelper.tag.getTags(sort="toto") - + def test_defect__git__notagfound(self): - with open("demofile.txt", "w+t") as tmpFile: + with open("demofile.txt", "w+t") as tmpFile: tmpFile.write("testvalue") os.system("git add .") - os.system("git commit -m \"first commit\"") - with self.assertRaises(pygitversionhelper.gitversionhelper.tag.tagNotFound) : + os.system('git commit -m "first commit"') + with self.assertRaises(pygitversionhelper.gitversionhelper.tag.tagNotFound): pygitversionhelper.gitversionhelper.tag.getLastTag() - + """ This test is impossible to do because current implementation can only return one tag def test_defect__git_multipletagsfound(self): with open("demofile.txt", "w+t") as tmpFile: @@ -704,198 +788,230 @@ class Test_gitversionhelper(unittest.TestCase): """ def test_defect__wrongargument_bump_type(self): - _v=self._test_version_readback("0.1.1",version_std="PEP440") - with self.assertRaises(pygitversionhelper.gitversionhelper.wrongArguments) : - pygitversionhelper.gitversionhelper.version.getCurrentVersion(bump_type="toto") + _v = self._test_version_readback("0.1.1", version_std="PEP440") + with self.assertRaises(pygitversionhelper.gitversionhelper.wrongArguments): + pygitversionhelper.gitversionhelper.version.getCurrentVersion( + bump_type="toto" + ) def test_defect__wrongargument_bump_dev_strategy(self): - _v=self._test_version_readback("0.1.1",version_std="PEP440") - with self.assertRaises(pygitversionhelper.gitversionhelper.wrongArguments) : - pygitversionhelper.gitversionhelper.version.getCurrentVersion(bump_dev_strategy="toto") + _v = self._test_version_readback("0.1.1", version_std="PEP440") + with self.assertRaises(pygitversionhelper.gitversionhelper.wrongArguments): + pygitversionhelper.gitversionhelper.version.getCurrentVersion( + bump_dev_strategy="toto" + ) def test_nominal__tag__getDistanceFromTag(self): - with open("demofile.txt", "w+t") as tmpFile: + with open("demofile.txt", "w+t") as tmpFile: tmpFile.write("testvalue") os.system("git add .") - os.system("git commit -m \"commit\"") + os.system('git commit -m "commit"') os.system(f"git tag 0.2.0") - - with open("demofile.txt", "w+t") as tmpFile: + + with open("demofile.txt", "w+t") as tmpFile: tmpFile.write("testvalue1") os.system("git add .") - os.system("git commit -m \"commit\"") - - with open("demofile.txt", "w+t") as tmpFile: + os.system('git commit -m "commit"') + + with open("demofile.txt", "w+t") as tmpFile: tmpFile.write("testvalue2") os.system("git add .") - os.system("git commit -m \"commit\"") + os.system('git commit -m "commit"') os.system(f"git tag 0.3.0") - - with open("demofile.txt", "w+t") as tmpFile: + + with open("demofile.txt", "w+t") as tmpFile: tmpFile.write("testvalue3") os.system("git add .") - os.system("git commit -m \"commit\"") - - with open("demofile.txt", "w+t") as tmpFile: + os.system('git commit -m "commit"') + + with open("demofile.txt", "w+t") as tmpFile: tmpFile.write("testvalue4") os.system("git add .") - os.system("git commit -m \"commit\"") - - self.assertEqual(2,pygitversionhelper.gitversionhelper.tag.getDistanceFromTag()) - self.assertEqual(4,pygitversionhelper.gitversionhelper.tag.getDistanceFromTag("0.2.0")) - + os.system('git commit -m "commit"') + + self.assertEqual( + 2, pygitversionhelper.gitversionhelper.tag.getDistanceFromTag() + ) + self.assertEqual( + 4, pygitversionhelper.gitversionhelper.tag.getDistanceFromTag("0.2.0") + ) + def test_nominal__tag__getTags(self): - with open("demofile.txt", "w+t") as tmpFile: + with open("demofile.txt", "w+t") as tmpFile: tmpFile.write("testvalue") os.system("git add .") - os.system("git commit -m \"commit\"") + os.system('git commit -m "commit"') os.system(f"git tag 0.2.0") - - with open("demofile.txt", "w+t") as tmpFile: + + with open("demofile.txt", "w+t") as tmpFile: tmpFile.write("testvalue1") os.system("git add .") - os.system("git commit -m \"commit\"") - - with open("demofile.txt", "w+t") as tmpFile: + os.system('git commit -m "commit"') + + with open("demofile.txt", "w+t") as tmpFile: tmpFile.write("testvalue2") os.system("git add .") - os.system("git commit -m \"commit\"") + os.system('git commit -m "commit"') os.system(f"git tag 0.3.0") - - with open("demofile.txt", "w+t") as tmpFile: + + with open("demofile.txt", "w+t") as tmpFile: tmpFile.write("testvalue3") os.system("git add .") - os.system("git commit -m \"commit\"") - - with open("demofile.txt", "w+t") as tmpFile: + os.system('git commit -m "commit"') + + with open("demofile.txt", "w+t") as tmpFile: tmpFile.write("testvalue4") os.system("git add .") - os.system("git commit -m \"commit\"") - - with open("demofile.txt", "w+t") as tmpFile: + os.system('git commit -m "commit"') + + with open("demofile.txt", "w+t") as tmpFile: tmpFile.write("testvalue5") os.system("git add .") - os.system("git commit -m \"commit\"") + os.system('git commit -m "commit"') os.system(f"git tag 0.3.1") - - self.assertEqual(set(["0.3.0","0.2.0","0.3.1"]),set(pygitversionhelper.gitversionhelper.tag.getTags())) - + + self.assertEqual( + set(["0.3.0", "0.2.0", "0.3.1"]), + set(pygitversionhelper.gitversionhelper.tag.getTags()), + ) + def test_nominal__tag__getTags_two_branch(self): - with open("demofile.txt", "w+t") as tmpFile: + with open("demofile.txt", "w+t") as tmpFile: tmpFile.write("testvalue") os.system("git add .") - os.system("git commit -m \"commit\"") + os.system('git commit -m "commit"') os.system(f"git tag 0.2.0") - - with open("demofile.txt", "w+t") as tmpFile: + + with open("demofile.txt", "w+t") as tmpFile: tmpFile.write("testvalue1") os.system("git add .") - os.system("git commit -m \"commit\"") - - with open("demofile.txt", "w+t") as tmpFile: + os.system('git commit -m "commit"') + + with open("demofile.txt", "w+t") as tmpFile: tmpFile.write("testvalue2") os.system("git add .") - os.system("git commit -m \"commit\"") + os.system('git commit -m "commit"') os.system(f"git tag 0.3.0") - + os.system("git checkout -b dev") - - with open("demofile.txt", "w+t") as tmpFile: + + with open("demofile.txt", "w+t") as tmpFile: tmpFile.write("testvalue3") os.system("git add .") - os.system("git commit -m \"commit\"") - - with open("demofile.txt", "w+t") as tmpFile: + os.system('git commit -m "commit"') + + with open("demofile.txt", "w+t") as tmpFile: tmpFile.write("testvalue4") os.system("git add .") - os.system("git commit -m \"commit\"") - - with open("demofile.txt", "w+t") as tmpFile: + os.system('git commit -m "commit"') + + with open("demofile.txt", "w+t") as tmpFile: tmpFile.write("testvalue5") os.system("git add .") - os.system("git commit -m \"commit\"") + os.system('git commit -m "commit"') os.system(f"git tag 0.3.1") - - self.assertEqual(set(["0.3.0","0.2.0","0.3.1"]),set(pygitversionhelper.gitversionhelper.tag.getTags())) - + + self.assertEqual( + set(["0.3.0", "0.2.0", "0.3.1"]), + set(pygitversionhelper.gitversionhelper.tag.getTags()), + ) + def test_nominal__tag__getTags_two_branch_samebranch(self): - with open("demofile.txt", "w+t") as tmpFile: + with open("demofile.txt", "w+t") as tmpFile: tmpFile.write("testvalue") os.system("git add .") - os.system("git commit -m \"commit\"") + os.system('git commit -m "commit"') os.system(f"git tag 0.2.0") - - with open("demofile.txt", "w+t") as tmpFile: + + with open("demofile.txt", "w+t") as tmpFile: tmpFile.write("testvalue1") os.system("git add .") - os.system("git commit -m \"commit\"") - - with open("demofile.txt", "w+t") as tmpFile: + os.system('git commit -m "commit"') + + with open("demofile.txt", "w+t") as tmpFile: tmpFile.write("testvalue2") os.system("git add .") - os.system("git commit -m \"commit\"") + os.system('git commit -m "commit"') os.system(f"git tag 0.3.0") - + os.system("git checkout -b dev") - - with open("demofile.txt", "w+t") as tmpFile: + + with open("demofile.txt", "w+t") as tmpFile: tmpFile.write("testvalue3") os.system("git add .") - os.system("git commit -m \"commit\"") - - with open("demofile.txt", "w+t") as tmpFile: + os.system('git commit -m "commit"') + + with open("demofile.txt", "w+t") as tmpFile: tmpFile.write("testvalue4") os.system("git add .") - os.system("git commit -m \"commit\"") - - with open("demofile.txt", "w+t") as tmpFile: + os.system('git commit -m "commit"') + + with open("demofile.txt", "w+t") as tmpFile: tmpFile.write("testvalue5") os.system("git add .") - os.system("git commit -m \"commit\"") + os.system('git commit -m "commit"') os.system(f"git tag 0.3.1") - - self.assertEqual(set(["0.3.0","0.2.0","0.3.1"]),set(pygitversionhelper.gitversionhelper.tag.getTags(same_branch=True))) - + + self.assertEqual( + set(["0.3.0", "0.2.0", "0.3.1"]), + set(pygitversionhelper.gitversionhelper.tag.getTags(same_branch=True)), + ) + os.system("git switch master") - - self.assertEqual(set(["0.3.0","0.2.0"]),set(pygitversionhelper.gitversionhelper.tag.getTags(same_branch=True))) - + + self.assertEqual( + set(["0.3.0", "0.2.0"]), + set(pygitversionhelper.gitversionhelper.tag.getTags(same_branch=True)), + ) + os.system("git switch dev") - - with open("demofile.txt", "w+t") as tmpFile: + + with open("demofile.txt", "w+t") as tmpFile: tmpFile.write("testvalue4") os.system("git add .") - os.system("git commit -m \"commit\"") + os.system('git commit -m "commit"') os.system(f"git tag 0.3.2") - - self.assertEqual(set(["0.3.0","0.2.0","0.3.1","0.3.2"]),set(pygitversionhelper.gitversionhelper.tag.getTags(same_branch=True))) - self.assertEqual(set(["0.3.0","0.2.0","0.3.1","0.3.2"]),set(pygitversionhelper.gitversionhelper.tag.getTags())) - + + self.assertEqual( + set(["0.3.0", "0.2.0", "0.3.1", "0.3.2"]), + set(pygitversionhelper.gitversionhelper.tag.getTags(same_branch=True)), + ) + self.assertEqual( + set(["0.3.0", "0.2.0", "0.3.1", "0.3.2"]), + set(pygitversionhelper.gitversionhelper.tag.getTags()), + ) + os.system("git switch master") - - self.assertEqual(set(["0.3.0","0.2.0"]),set(pygitversionhelper.gitversionhelper.tag.getTags(same_branch=True))) - self.assertEqual(set(["0.3.0","0.2.0","0.3.1","0.3.2"]),set(pygitversionhelper.gitversionhelper.tag.getTags())) - + + self.assertEqual( + set(["0.3.0", "0.2.0"]), + set(pygitversionhelper.gitversionhelper.tag.getTags(same_branch=True)), + ) + self.assertEqual( + set(["0.3.0", "0.2.0", "0.3.1", "0.3.2"]), + set(pygitversionhelper.gitversionhelper.tag.getTags()), + ) + def test_nominal__tag__getLastTag_two_branches(self): - with open("demofile.txt", "w+t") as tmpFile: + with open("demofile.txt", "w+t") as tmpFile: tmpFile.write("testvalue") os.system("git add .") - os.system("git commit -m \"first commit\"") - - with open("demofile.txt", "w+t") as tmpFile: + os.system('git commit -m "first commit"') + + with open("demofile.txt", "w+t") as tmpFile: tmpFile.write("testvalue1") os.system("git add .") - os.system("git commit -m \"2nd commit\"") + os.system('git commit -m "2nd commit"') os.system(f"git tag 0.1.0") - + os.system("git checkout -b dev") - - with open("demofile.txt", "w+t") as tmpFile: + + with open("demofile.txt", "w+t") as tmpFile: tmpFile.write("testvalue2") os.system("git add .") - os.system("git commit -m \"3rd commit\"") + os.system('git commit -m "3rd commit"') os.system(f"git tag 0.2.0") - + """ print("===") os.system(f"git status") @@ -911,427 +1027,517 @@ class Test_gitversionhelper(unittest.TestCase): os.system(f"git describe --tags") print("===") """ - - _v = pygitversionhelper.gitversionhelper.version.getLastVersion(version_std="PEP440") - self.assertIsInstance(_v, pygitversionhelper.gitversionhelper.version.MetaVersion) - self._test_version_format(_v,"0.2.0",version_std="PEP440") + + _v = pygitversionhelper.gitversionhelper.version.getLastVersion( + version_std="PEP440" + ) + self.assertIsInstance( + _v, pygitversionhelper.gitversionhelper.version.MetaVersion + ) + self._test_version_format(_v, "0.2.0", version_std="PEP440") self.assertEqual(_v.raw, "0.2.0") - self.assertEqual(_v.major,0) - self.assertEqual(_v.minor,2) - self.assertEqual(_v.patch,0) - - with open("demofile.txt", "w+t") as tmpFile: + self.assertEqual(_v.major, 0) + self.assertEqual(_v.minor, 2) + self.assertEqual(_v.patch, 0) + + with open("demofile.txt", "w+t") as tmpFile: tmpFile.write("testvalue3") os.system("git add .") - os.system("git commit -m \"3rd commit\"") + os.system('git commit -m "3rd commit"') os.system(f"git tag 0.3.0") - - _v = pygitversionhelper.gitversionhelper.version.getLastVersion(version_std="PEP440") - self.assertIsInstance(_v, pygitversionhelper.gitversionhelper.version.MetaVersion) - self._test_version_format(_v,"0.3.0",version_std="PEP440") + + _v = pygitversionhelper.gitversionhelper.version.getLastVersion( + version_std="PEP440" + ) + self.assertIsInstance( + _v, pygitversionhelper.gitversionhelper.version.MetaVersion + ) + self._test_version_format(_v, "0.3.0", version_std="PEP440") self.assertEqual(_v.raw, "0.3.0") - self.assertEqual(_v.major,0) - self.assertEqual(_v.minor,3) - self.assertEqual(_v.patch,0) - + self.assertEqual(_v.major, 0) + self.assertEqual(_v.minor, 3) + self.assertEqual(_v.patch, 0) + os.system("git switch master") - - _v = pygitversionhelper.gitversionhelper.version.getLastVersion(version_std="PEP440") - self.assertIsInstance(_v, pygitversionhelper.gitversionhelper.version.MetaVersion) - self._test_version_format(_v,"0.3.0",version_std="PEP440") + + _v = pygitversionhelper.gitversionhelper.version.getLastVersion( + version_std="PEP440" + ) + self.assertIsInstance( + _v, pygitversionhelper.gitversionhelper.version.MetaVersion + ) + self._test_version_format(_v, "0.3.0", version_std="PEP440") self.assertEqual(_v.raw, "0.3.0") - self.assertEqual(_v.major,0) - self.assertEqual(_v.minor,3) - self.assertEqual(_v.patch,0) - - _v = pygitversionhelper.gitversionhelper.version.getLastVersion(version_std="PEP440",same_branch=True) - self.assertIsInstance(_v, pygitversionhelper.gitversionhelper.version.MetaVersion) - self._test_version_format(_v,"0.1.0",version_std="PEP440") + self.assertEqual(_v.major, 0) + self.assertEqual(_v.minor, 3) + self.assertEqual(_v.patch, 0) + + _v = pygitversionhelper.gitversionhelper.version.getLastVersion( + version_std="PEP440", same_branch=True + ) + self.assertIsInstance( + _v, pygitversionhelper.gitversionhelper.version.MetaVersion + ) + self._test_version_format(_v, "0.1.0", version_std="PEP440") self.assertEqual(_v.raw, "0.1.0") - self.assertEqual(_v.major,0) - self.assertEqual(_v.minor,1) - self.assertEqual(_v.patch,0) - - os.system("git merge --no-ff dev -m \"merge dev into master\"") - - _v = pygitversionhelper.gitversionhelper.version.getLastVersion(version_std="PEP440",same_branch=True) - self.assertIsInstance(_v, pygitversionhelper.gitversionhelper.version.MetaVersion) - self._test_version_format(_v,"0.1.0",version_std="PEP440") + self.assertEqual(_v.major, 0) + self.assertEqual(_v.minor, 1) + self.assertEqual(_v.patch, 0) + + os.system('git merge --no-ff dev -m "merge dev into master"') + + _v = pygitversionhelper.gitversionhelper.version.getLastVersion( + version_std="PEP440", same_branch=True + ) + self.assertIsInstance( + _v, pygitversionhelper.gitversionhelper.version.MetaVersion + ) + self._test_version_format(_v, "0.1.0", version_std="PEP440") self.assertEqual(_v.raw, "0.1.0") - self.assertEqual(_v.major,0) - self.assertEqual(_v.minor,1) - self.assertEqual(_v.patch,0) - - _v = pygitversionhelper.gitversionhelper.version.getLastVersion(version_std="PEP440") - self.assertIsInstance(_v, pygitversionhelper.gitversionhelper.version.MetaVersion) - self._test_version_format(_v,"0.3.0",version_std="PEP440") + self.assertEqual(_v.major, 0) + self.assertEqual(_v.minor, 1) + self.assertEqual(_v.patch, 0) + + _v = pygitversionhelper.gitversionhelper.version.getLastVersion( + version_std="PEP440" + ) + self.assertIsInstance( + _v, pygitversionhelper.gitversionhelper.version.MetaVersion + ) + self._test_version_format(_v, "0.3.0", version_std="PEP440") self.assertEqual(_v.raw, "0.3.0") - self.assertEqual(_v.major,0) - self.assertEqual(_v.minor,3) - self.assertEqual(_v.patch,0) - + self.assertEqual(_v.major, 0) + self.assertEqual(_v.minor, 3) + self.assertEqual(_v.patch, 0) + os.system(f"git tag 0.4.0") - - _v = pygitversionhelper.gitversionhelper.version.getLastVersion(version_std="PEP440",same_branch=True) - self.assertIsInstance(_v, pygitversionhelper.gitversionhelper.version.MetaVersion) - self._test_version_format(_v,"0.4.0",version_std="PEP440") + + _v = pygitversionhelper.gitversionhelper.version.getLastVersion( + version_std="PEP440", same_branch=True + ) + self.assertIsInstance( + _v, pygitversionhelper.gitversionhelper.version.MetaVersion + ) + self._test_version_format(_v, "0.4.0", version_std="PEP440") self.assertEqual(_v.raw, "0.4.0") - self.assertEqual(_v.major,0) - self.assertEqual(_v.minor,4) - self.assertEqual(_v.patch,0) - - _v = pygitversionhelper.gitversionhelper.version.getLastVersion(version_std="PEP440") - self.assertIsInstance(_v, pygitversionhelper.gitversionhelper.version.MetaVersion) - self._test_version_format(_v,"0.4.0",version_std="PEP440") + self.assertEqual(_v.major, 0) + self.assertEqual(_v.minor, 4) + self.assertEqual(_v.patch, 0) + + _v = pygitversionhelper.gitversionhelper.version.getLastVersion( + version_std="PEP440" + ) + self.assertIsInstance( + _v, pygitversionhelper.gitversionhelper.version.MetaVersion + ) + self._test_version_format(_v, "0.4.0", version_std="PEP440") self.assertEqual(_v.raw, "0.4.0") - self.assertEqual(_v.major,0) - self.assertEqual(_v.minor,4) - self.assertEqual(_v.patch,0) - + self.assertEqual(_v.major, 0) + self.assertEqual(_v.minor, 4) + self.assertEqual(_v.patch, 0) + def test_defect__tag__invalidtag(self): - with open("demofile.txt", "w+t") as tmpFile: + with open("demofile.txt", "w+t") as tmpFile: tmpFile.write("testvalue1") os.system("git add .") - os.system("git commit -m \"2nd commit\"") + os.system('git commit -m "2nd commit"') os.system(f"git tag INVALIDTAG") - - with self.assertRaises(pygitversionhelper.gitversionhelper.version.noValidVersion) : + + with self.assertRaises( + pygitversionhelper.gitversionhelper.version.noValidVersion + ): _v = pygitversionhelper.gitversionhelper.version.getLastVersion() - - - with self.assertRaises(pygitversionhelper.gitversionhelper.version.noValidVersion) : - _v = pygitversionhelper.gitversionhelper.version.getLastVersion(ignore_unknown_tags=True) + + with self.assertRaises( + pygitversionhelper.gitversionhelper.version.noValidVersion + ): + _v = pygitversionhelper.gitversionhelper.version.getLastVersion( + ignore_unknown_tags=True + ) def test_defect__tag__invalidtag_inbetween(self): - with open("demofile.txt", "w+t") as tmpFile: + with open("demofile.txt", "w+t") as tmpFile: tmpFile.write("testvalue1") os.system("git add .") - os.system("git commit -m \"commit\"") + os.system('git commit -m "commit"') os.system(f"git tag 0.0.1") - - with open("demofile.txt", "w+t") as tmpFile: + + with open("demofile.txt", "w+t") as tmpFile: tmpFile.write("testvalue2") os.system("git add .") - os.system("git commit -m \"commit\"") + os.system('git commit -m "commit"') os.system(f"git tag INVALIDTAG") - - with self.assertRaises(pygitversionhelper.gitversionhelper.version.noValidVersion) : + + with self.assertRaises( + pygitversionhelper.gitversionhelper.version.noValidVersion + ): _v = pygitversionhelper.gitversionhelper.version.getLastVersion() - - _v = pygitversionhelper.gitversionhelper.version.getLastVersion(ignore_unknown_tags=True) - self.assertIsInstance(_v, pygitversionhelper.gitversionhelper.version.MetaVersion) - self._test_version_format(_v,"0.0.1",version_std="PEP440") + + _v = pygitversionhelper.gitversionhelper.version.getLastVersion( + ignore_unknown_tags=True + ) + self.assertIsInstance( + _v, pygitversionhelper.gitversionhelper.version.MetaVersion + ) + self._test_version_format(_v, "0.0.1", version_std="PEP440") self.assertEqual(_v.raw, "0.0.1") - self.assertEqual(_v.major,0) - self.assertEqual(_v.minor,0) - self.assertEqual(_v.patch,1) - - with open("demofile.txt", "w+t") as tmpFile: + self.assertEqual(_v.major, 0) + self.assertEqual(_v.minor, 0) + self.assertEqual(_v.patch, 1) + + with open("demofile.txt", "w+t") as tmpFile: tmpFile.write("testvalue3") os.system("git add .") - os.system("git commit -m \"commit\"") + os.system('git commit -m "commit"') os.system(f"git tag INVALIDTAG2") - - with open("demofile.txt", "w+t") as tmpFile: + + with open("demofile.txt", "w+t") as tmpFile: tmpFile.write("testvalue4") os.system("git add .") - os.system("git commit -m \"commit\"") + os.system('git commit -m "commit"') os.system(f"git tag INVALIDTA3") - - with open("demofile.txt", "w+t") as tmpFile: + + with open("demofile.txt", "w+t") as tmpFile: tmpFile.write("testvalue4") os.system("git add .") - os.system("git commit -m \"commit\"") + os.system('git commit -m "commit"') os.system(f"git tag INVALIDTA4") - - with self.assertRaises(pygitversionhelper.gitversionhelper.version.noValidVersion) : + + with self.assertRaises( + pygitversionhelper.gitversionhelper.version.noValidVersion + ): _v = pygitversionhelper.gitversionhelper.version.getLastVersion() - - _v = pygitversionhelper.gitversionhelper.version.getLastVersion(ignore_unknown_tags=True) - self.assertIsInstance(_v, pygitversionhelper.gitversionhelper.version.MetaVersion) - self._test_version_format(_v,"0.0.1",version_std="PEP440") + + _v = pygitversionhelper.gitversionhelper.version.getLastVersion( + ignore_unknown_tags=True + ) + self.assertIsInstance( + _v, pygitversionhelper.gitversionhelper.version.MetaVersion + ) + self._test_version_format(_v, "0.0.1", version_std="PEP440") self.assertEqual(_v.raw, "0.0.1") - self.assertEqual(_v.major,0) - self.assertEqual(_v.minor,0) - self.assertEqual(_v.patch,1) - - with open("demofile.txt", "w+t") as tmpFile: + self.assertEqual(_v.major, 0) + self.assertEqual(_v.minor, 0) + self.assertEqual(_v.patch, 1) + + with open("demofile.txt", "w+t") as tmpFile: tmpFile.write("testvalue5") os.system("git add .") - os.system("git commit -m \"commit\"") + os.system('git commit -m "commit"') os.system(f"git tag 0.1.2") _v = pygitversionhelper.gitversionhelper.version.getLastVersion() - self.assertIsInstance(_v, pygitversionhelper.gitversionhelper.version.MetaVersion) - self._test_version_format(_v,"0.1.2",version_std="PEP440") + self.assertIsInstance( + _v, pygitversionhelper.gitversionhelper.version.MetaVersion + ) + self._test_version_format(_v, "0.1.2", version_std="PEP440") self.assertEqual(_v.raw, "0.1.2") - self.assertEqual(_v.major,0) - self.assertEqual(_v.minor,1) - self.assertEqual(_v.patch,2) - - _v = pygitversionhelper.gitversionhelper.version.getLastVersion(ignore_unknown_tags=True) - self.assertIsInstance(_v, pygitversionhelper.gitversionhelper.version.MetaVersion) - self._test_version_format(_v,"0.1.2",version_std="PEP440") - self.assertEqual(_v.raw, "0.1.2") - self.assertEqual(_v.major,0) - self.assertEqual(_v.minor,1) - self.assertEqual(_v.patch,2) + self.assertEqual(_v.major, 0) + self.assertEqual(_v.minor, 1) + self.assertEqual(_v.patch, 2) - with open("demofile.txt", "w+t") as tmpFile: + _v = pygitversionhelper.gitversionhelper.version.getLastVersion( + ignore_unknown_tags=True + ) + self.assertIsInstance( + _v, pygitversionhelper.gitversionhelper.version.MetaVersion + ) + self._test_version_format(_v, "0.1.2", version_std="PEP440") + self.assertEqual(_v.raw, "0.1.2") + self.assertEqual(_v.major, 0) + self.assertEqual(_v.minor, 1) + self.assertEqual(_v.patch, 2) + + with open("demofile.txt", "w+t") as tmpFile: tmpFile.write("testvalue6") os.system("git add .") - os.system("git commit -m \"commit\"") + os.system('git commit -m "commit"') os.system(f"git tag INVALIDTA5") - with self.assertRaises(pygitversionhelper.gitversionhelper.version.noValidVersion) : + with self.assertRaises( + pygitversionhelper.gitversionhelper.version.noValidVersion + ): _v = pygitversionhelper.gitversionhelper.version.getLastVersion() - - _v = pygitversionhelper.gitversionhelper.version.getLastVersion(ignore_unknown_tags=True) - self.assertIsInstance(_v, pygitversionhelper.gitversionhelper.version.MetaVersion) - self._test_version_format(_v,"0.1.2",version_std="PEP440") + + _v = pygitversionhelper.gitversionhelper.version.getLastVersion( + ignore_unknown_tags=True + ) + self.assertIsInstance( + _v, pygitversionhelper.gitversionhelper.version.MetaVersion + ) + self._test_version_format(_v, "0.1.2", version_std="PEP440") self.assertEqual(_v.raw, "0.1.2") - self.assertEqual(_v.major,0) - self.assertEqual(_v.minor,1) - self.assertEqual(_v.patch,2) - - with open("demofile.txt", "w+t") as tmpFile: + self.assertEqual(_v.major, 0) + self.assertEqual(_v.minor, 1) + self.assertEqual(_v.patch, 2) + + with open("demofile.txt", "w+t") as tmpFile: tmpFile.write("testvalue7") os.system("git add .") - os.system("git commit -m \"commit\"") + os.system('git commit -m "commit"') os.system(f"git tag 0.1.3") - + _v = pygitversionhelper.gitversionhelper.version.getLastVersion() - self.assertIsInstance(_v, pygitversionhelper.gitversionhelper.version.MetaVersion) - self._test_version_format(_v,"0.1.3",version_std="PEP440") + self.assertIsInstance( + _v, pygitversionhelper.gitversionhelper.version.MetaVersion + ) + self._test_version_format(_v, "0.1.3", version_std="PEP440") self.assertEqual(_v.raw, "0.1.3") - self.assertEqual(_v.major,0) - self.assertEqual(_v.minor,1) - self.assertEqual(_v.patch,3) - - _v = pygitversionhelper.gitversionhelper.version.getLastVersion(ignore_unknown_tags=True) - self.assertIsInstance(_v, pygitversionhelper.gitversionhelper.version.MetaVersion) - self._test_version_format(_v,"0.1.3",version_std="PEP440") + self.assertEqual(_v.major, 0) + self.assertEqual(_v.minor, 1) + self.assertEqual(_v.patch, 3) + + _v = pygitversionhelper.gitversionhelper.version.getLastVersion( + ignore_unknown_tags=True + ) + self.assertIsInstance( + _v, pygitversionhelper.gitversionhelper.version.MetaVersion + ) + self._test_version_format(_v, "0.1.3", version_std="PEP440") self.assertEqual(_v.raw, "0.1.3") - self.assertEqual(_v.major,0) - self.assertEqual(_v.minor,1) - self.assertEqual(_v.patch,3) - + self.assertEqual(_v.major, 0) + self.assertEqual(_v.minor, 1) + self.assertEqual(_v.patch, 3) + def test_nominal__commit_getLast(self): # sleeps are needed because commit date have a 1-sec accuracy :-/ - with open("demofile.txt", "w+t") as tmpFile: + with open("demofile.txt", "w+t") as tmpFile: tmpFile.write("testvalue") os.system("git add .") - os.system("git commit -m \"commit\"") + os.system('git commit -m "commit"') time.sleep(1) initial_commit = pygitversionhelper.gitversionhelper.commit.getLast() - - with open("demofile.txt", "w+t") as tmpFile: + + with open("demofile.txt", "w+t") as tmpFile: tmpFile.write("testvalue2") os.system("git add .") - os.system("git commit -m \"commit\"") + os.system('git commit -m "commit"') time.sleep(1) - + second_commit = pygitversionhelper.gitversionhelper.commit.getLast() - - self.assertNotEqual(initial_commit,second_commit) - - with open("demofile.txt", "w+t") as tmpFile: + + self.assertNotEqual(initial_commit, second_commit) + + with open("demofile.txt", "w+t") as tmpFile: tmpFile.write("testvalue3") os.system("git add .") - os.system("git commit -m \"commit\"") + os.system('git commit -m "commit"') time.sleep(1) - + third_commit = pygitversionhelper.gitversionhelper.commit.getLast() - - self.assertNotEqual(initial_commit,third_commit) - self.assertNotEqual(second_commit,third_commit) - - + + self.assertNotEqual(initial_commit, third_commit) + self.assertNotEqual(second_commit, third_commit) + os.system("git checkout -b dev") - with open("demofile.txt", "w+t") as tmpFile: + with open("demofile.txt", "w+t") as tmpFile: tmpFile.write("testvalue4") os.system("git add .") - os.system("git commit -m \"commit\"") + os.system('git commit -m "commit"') time.sleep(1) - + fourth_commit = pygitversionhelper.gitversionhelper.commit.getLast() - - self.assertNotEqual(initial_commit,fourth_commit) - self.assertNotEqual(second_commit,fourth_commit) - self.assertNotEqual(third_commit,fourth_commit) - + + self.assertNotEqual(initial_commit, fourth_commit) + self.assertNotEqual(second_commit, fourth_commit) + self.assertNotEqual(third_commit, fourth_commit) + os.system("git switch master") - + fourth2_commit = pygitversionhelper.gitversionhelper.commit.getLast() - self.assertEqual(fourth2_commit,fourth_commit) - - fourth3_commit = pygitversionhelper.gitversionhelper.commit.getLast(same_branch=True) - - self.assertNotEqual(fourth3_commit,fourth_commit) - self.assertEqual(fourth3_commit,third_commit) - - with open("demofile.txt", "w+t") as tmpFile: + self.assertEqual(fourth2_commit, fourth_commit) + + fourth3_commit = pygitversionhelper.gitversionhelper.commit.getLast( + same_branch=True + ) + + self.assertNotEqual(fourth3_commit, fourth_commit) + self.assertEqual(fourth3_commit, third_commit) + + with open("demofile.txt", "w+t") as tmpFile: tmpFile.write("testvalue5") os.system("git add .") - os.system("git commit -m \"commit\"") + os.system('git commit -m "commit"') time.sleep(1) - + fifth_commit = pygitversionhelper.gitversionhelper.commit.getLast() - self.assertNotEqual(fifth_commit,fourth3_commit) - + self.assertNotEqual(fifth_commit, fourth3_commit) + os.system("git switch dev") - + fifth2_commit = pygitversionhelper.gitversionhelper.commit.getLast() - self.assertEqual(fifth2_commit,fifth_commit) - - fifth2_commit = pygitversionhelper.gitversionhelper.commit.getLast(same_branch=True) - self.assertEqual(fifth2_commit,fourth_commit) - + self.assertEqual(fifth2_commit, fifth_commit) + + fifth2_commit = pygitversionhelper.gitversionhelper.commit.getLast( + same_branch=True + ) + self.assertEqual(fifth2_commit, fourth_commit) + def test_defect__commit_notfound(self): - - with self.assertRaises(pygitversionhelper.gitversionhelper.commit.commitNotFound) : + + with self.assertRaises( + pygitversionhelper.gitversionhelper.commit.commitNotFound + ): pygitversionhelper.gitversionhelper.commit.getLast() - - with self.assertRaises(pygitversionhelper.gitversionhelper.commit.commitNotFound) : + + with self.assertRaises( + pygitversionhelper.gitversionhelper.commit.commitNotFound + ): pygitversionhelper.gitversionhelper.commit.getLast(same_branch=True) - + def test_nominal__commit_getFromTag(self): - with open("demofile.txt", "w+t") as tmpFile: + with open("demofile.txt", "w+t") as tmpFile: tmpFile.write("testvalue") os.system("git add .") - os.system("git commit -m \"commit\"") + os.system('git commit -m "commit"') initial_commit = pygitversionhelper.gitversionhelper.commit.getLast() - - with open("demofile.txt", "w+t") as tmpFile: + + with open("demofile.txt", "w+t") as tmpFile: tmpFile.write("testvalue2") os.system("git add .") - os.system("git commit -m \"commit2\"") + os.system('git commit -m "commit2"') os.system(f"git tag TAG") second_commit = pygitversionhelper.gitversionhelper.commit.getLast() - self.assertNotEqual(second_commit,initial_commit) + self.assertNotEqual(second_commit, initial_commit) second_commit2 = pygitversionhelper.gitversionhelper.commit.getFromTag("TAG") - self.assertEqual(second_commit,second_commit2) - self.assertNotEqual(second_commit2,initial_commit) - + self.assertEqual(second_commit, second_commit2) + self.assertNotEqual(second_commit2, initial_commit) + def test_defect__commit_notfound2(self): - - with self.assertRaises(pygitversionhelper.gitversionhelper.commit.commitNotFound) : + + with self.assertRaises( + pygitversionhelper.gitversionhelper.commit.commitNotFound + ): pygitversionhelper.gitversionhelper.commit.getFromTag("TAG") - - with open("demofile.txt", "w+t") as tmpFile: + + with open("demofile.txt", "w+t") as tmpFile: tmpFile.write("testvalue") os.system("git add .") - os.system("git commit -m \"commit\"") - - with self.assertRaises(pygitversionhelper.gitversionhelper.commit.commitNotFound) : + os.system('git commit -m "commit"') + + with self.assertRaises( + pygitversionhelper.gitversionhelper.commit.commitNotFound + ): pygitversionhelper.gitversionhelper.commit.getFromTag("TAG") - + os.system(f"git tag OTHER_TAG") - - with self.assertRaises(pygitversionhelper.gitversionhelper.commit.commitNotFound) : + + with self.assertRaises( + pygitversionhelper.gitversionhelper.commit.commitNotFound + ): pygitversionhelper.gitversionhelper.commit.getFromTag("TAG") - + def test_nominal__commit_getMessage(self): - commit_message="AAAABBB CCCCDDDD".replace('\r\n','\n').replace('\n','\r\n') - with open("demofile.txt", "w+t") as tmpFile: + commit_message = "AAAABBB CCCCDDDD".replace("\r\n", "\n").replace("\n", "\r\n") + with open("demofile.txt", "w+t") as tmpFile: tmpFile.write("testvalue") os.system("git add .") - os.system(f"git commit -m \"{commit_message}\"") + os.system(f'git commit -m "{commit_message}"') commit = pygitversionhelper.gitversionhelper.commit.getLast() message = pygitversionhelper.gitversionhelper.commit.getMessage(commit) - self.assertEqual(message,commit_message) - - def test_nominal__commit_getMessage2(self): - commit_message="""AAAABBB - CCCCDDDD - -f dfsds dfsdfs $""".replace('\r\n','\n').replace('\n','\r\n') + self.assertEqual(message, commit_message) - with open("demofile.txt", "w+t") as tmpFile: + def test_nominal__commit_getMessage2(self): + commit_message = """AAAABBB + CCCCDDDD + -f dfsds dfsdfs $""".replace( + "\r\n", "\n" + ).replace( + "\n", "\r\n" + ) + + with open("demofile.txt", "w+t") as tmpFile: tmpFile.write("testvalue") os.system("git add .") - + cmd = "git commit -m".split() cmd.append(commit_message) - subprocess.run(cmd,text=True,check=True) - + subprocess.run(cmd, text=True, check=True) + commit = pygitversionhelper.gitversionhelper.commit.getLast() message = pygitversionhelper.gitversionhelper.commit.getMessage(commit) - self.assertEqual(message,commit_message) - + self.assertEqual(message, commit_message) + def test_nominal__commit_getMessagesSinceLastTag(self): - commit_message1="1.1 update this"+ os.linesep+\ - "1.1 fix that" + os.linesep+\ - "1.1 test" - commit_message1=commit_message1.replace('\r\n','\n').replace('\n','\r\n') - with open("demofile.txt", "w+t") as tmpFile: + commit_message1 = ( + "1.1 update this" + os.linesep + "1.1 fix that" + os.linesep + "1.1 test" + ) + commit_message1 = commit_message1.replace("\r\n", "\n").replace("\n", "\r\n") + with open("demofile.txt", "w+t") as tmpFile: tmpFile.write("testvalue") os.system("git add .") - + cmd = "git commit -m".split() cmd.append(commit_message1) - subprocess.run(cmd,text=True,check=True) + subprocess.run(cmd, text=True, check=True) os.system(f"git tag 0.1.1") - - commit_message2="2.1 update this"+ os.linesep+\ - "2.1 fix that" + os.linesep+\ - "2.1 test" - commit_message2=commit_message2.replace('\r\n','\n').replace('\n','\r\n') - with open("demofile.txt", "w+t") as tmpFile: + + commit_message2 = ( + "2.1 update this" + os.linesep + "2.1 fix that" + os.linesep + "2.1 test" + ) + commit_message2 = commit_message2.replace("\r\n", "\n").replace("\n", "\r\n") + with open("demofile.txt", "w+t") as tmpFile: tmpFile.write("testvalue2") os.system("git add .") - + cmd = "git commit -m".split() cmd.append(commit_message2) - subprocess.run(cmd,text=True,check=True) - - commit_message3="3.1 update this"+ os.linesep+\ - "3.1 fix that" + os.linesep+\ - "3.1 test" - commit_message3=commit_message3.replace('\r\n','\n').replace('\n','\r\n') - with open("demofile.txt", "w+t") as tmpFile: + subprocess.run(cmd, text=True, check=True) + + commit_message3 = ( + "3.1 update this" + os.linesep + "3.1 fix that" + os.linesep + "3.1 test" + ) + commit_message3 = commit_message3.replace("\r\n", "\n").replace("\n", "\r\n") + with open("demofile.txt", "w+t") as tmpFile: tmpFile.write("testvalue3") os.system("git add .") - + cmd = "git commit -m".split() cmd.append(commit_message3) - subprocess.run(cmd,text=True,check=True) + subprocess.run(cmd, text=True, check=True) - commit_message4="4.1 update this" + os.linesep+\ - "4.1 fix that" + os.linesep+\ - "4.1 test" - commit_message4=commit_message4.replace('\r\n','\n').replace('\n','\r\n') - with open("demofile.txt", "w+t") as tmpFile: + commit_message4 = ( + "4.1 update this" + os.linesep + "4.1 fix that" + os.linesep + "4.1 test" + ) + commit_message4 = commit_message4.replace("\r\n", "\n").replace("\n", "\r\n") + with open("demofile.txt", "w+t") as tmpFile: tmpFile.write("testvalue4") os.system("git add .") - + cmd = "git commit -m".split() cmd.append(commit_message4) - subprocess.run(cmd,text=True,check=True) + subprocess.run(cmd, text=True, check=True) res = pygitversionhelper.gitversionhelper.commit.getMessagesSinceTag("0.1.1") - self.assertEqual( [commit_message4,commit_message3,commit_message2],res) - - res = pygitversionhelper.gitversionhelper.commit.getMessagesSinceTag("0.1.1",merged_output=True) - self.assertEqual( os.linesep.join([commit_message4,commit_message3,commit_message2]),res) - - + self.assertEqual([commit_message4, commit_message3, commit_message2], res) + + res = pygitversionhelper.gitversionhelper.commit.getMessagesSinceTag( + "0.1.1", merged_output=True + ) + self.assertEqual( + os.linesep.join([commit_message4, commit_message3, commit_message2]), res + ) + def tearDown(self): os.chdir("/") - + + class Test_gitversionhelperNoRepo(unittest.TestCase): def setUp(self): - self.TmpWorkingDir=tempfile.TemporaryDirectory() - self.TmpWorkingDirPath=pathlib.Path(self.TmpWorkingDir.name) + self.TmpWorkingDir = tempfile.TemporaryDirectory() + self.TmpWorkingDirPath = pathlib.Path(self.TmpWorkingDir.name) os.chdir(self.TmpWorkingDirPath) def test_defect__norepo(self): - with self.assertRaises(pygitversionhelper.gitversionhelper.repository.notAGitRepository) : + with self.assertRaises( + pygitversionhelper.gitversionhelper.repository.notAGitRepository + ): _v = pygitversionhelper.gitversionhelper.version.getCurrentVersion() def tearDown(self): - os.chdir("/") \ No newline at end of file + os.chdir("/")