From d786d27cd78b37743cbfa902d299f301ea92b391 Mon Sep 17 00:00:00 2001 From: cclecle Date: Mon, 20 Mar 2023 00:19:57 +0000 Subject: [PATCH 1/8] fix: ident --- Jenkinsfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 0e9b26d..c16f519 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -124,7 +124,7 @@ pipeline { echo("_PROJECT_NAME: . . . . . . . . . $_PROJECT_NAME") echo("_MaintainerEmail:. . . . . . . . $_MaintainerEmail") echo("_MaintainerName:. . . . . . . . $_MaintainerName") - + sh("virtualenv --pip=embed --setuptools=embed --wheel=embed --no-periodic-update --activators bash,python BUILD_ENV") sh("virtualenv --pip=embed --setuptools=embed --wheel=embed --no-periodic-update --activators bash,python TEST_ENV") sh("virtualenv --pip=embed --setuptools=embed --wheel=embed --no-periodic-update --activators bash,python TOOLS_ENV") @@ -133,10 +133,10 @@ pipeline { sh(". ~/TOOLS_ENV/bin/activate && pip install simple_rest_client requests") sh(". ~/TOOLS_ENV/bin/activate && pip install git+https://chacha.ddns.net/gitea/chacha/pygitversionhelper.git@master") - + sh("git config --global user.email $_MaintainerEmail") sh("git config --global user.name $_MaintainerName") - + } } -- 2.47.3 From 866e8ff7ff7d0f137160748a0002685eab0fbdfc Mon Sep 17 00:00:00 2001 From: cclecle Date: Mon, 20 Mar 2023 00:25:11 +0000 Subject: [PATCH 2/8] test --- Jenkinsfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index c16f519..14d5c20 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -96,9 +96,9 @@ pipeline { PY_PROJECT_VERSION = "__NOTSET__" PY_PROJECT_VERSION_STRIPPED = "__NOTSET__" } - + stages { - + stage("Prepare") { steps { script { -- 2.47.3 From c9df0e74097504f46e10dae988186c1da4e1d4af Mon Sep 17 00:00:00 2001 From: cclecle Date: Mon, 20 Mar 2023 00:28:19 +0000 Subject: [PATCH 3/8] fix: doc --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 65cb993..2b71a5b 100644 --- a/README.md +++ b/README.md @@ -24,8 +24,8 @@ Checkout [Latest Documentation](https://chacha.ddns.net/mkdocs-web/chacha/pygitv - restrict to same branch - both SemVer and PEP440 support - custom output format - - configurable default bump type major, minor, patch or dev - - configurable default bump type: post, pre-patch, pre-minor, pre-major + - configurable default bump type: major, minor, patch or dev + - configurable default bump strategy: post, pre-patch, pre-minor, pre-major - ignore non-version tag - force version format -- 2.47.3 From d15b495f0a8769decc4ef7886d5f5fac728f65f1 Mon Sep 17 00:00:00 2001 From: cclecle Date: Mon, 20 Mar 2023 01:07:14 +0000 Subject: [PATCH 4/8] test local gitversionhelper import --- Jenkinsfile | 29 ++++++++++++++++++++++++----- 1 file changed, 24 insertions(+), 5 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 14d5c20..35e4ff5 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -132,7 +132,10 @@ pipeline { sh(". ~/BUILD_ENV/bin/activate && pip install --upgrade setuptools build pip copier jinja2-slug toml") sh(". ~/TOOLS_ENV/bin/activate && pip install simple_rest_client requests") - sh(". ~/TOOLS_ENV/bin/activate && pip install git+https://chacha.ddns.net/gitea/chacha/pygitversionhelper.git@master") + + if(_PROJECT_NAME!="pygitversionhelper") { + sh(". ~/TOOLS_ENV/bin/activate && pip install git+https://chacha.ddns.net/gitea/chacha/pygitversionhelper.git@master") + } sh("git config --global user.email $_MaintainerEmail") sh("git config --global user.name $_MaintainerName") @@ -157,13 +160,18 @@ pipeline { if(_GIT_BRANCH=="master") { if(sh(returnStdout: true, script: "git tag --points-at HEAD").trim().isEmpty()) { + BUMPED_VERSION = sh(script: """#!/bin/sh - |. ~/TOOLS_ENV/bin/activate |exec python - << '__EOWRAPPER__' | - |from pygitversionhelper import gitversionhelper |import re | + |try: + | from pygitversionhelper import gitversionhelper + |except ImportError: + | from .src.pygitversionhelper import gitversionhelper + | |lastcommit=gitversionhelper.commit.getLast(same_branch=True) |msg=gitversionhelper.commit.getMessage(lastcommit) | @@ -173,6 +181,7 @@ pipeline { |__EOWRAPPER__ """.stripMargin(), returnStdout: true).trim() + if(BUMPED_VERSION.isEmpty()) { echo "master push/merge must have an explicit tag release number, stopping pipeline" currentBuild.getRawBuild().getExecutor().doStop() @@ -190,7 +199,10 @@ pipeline { |. ~/TOOLS_ENV/bin/activate |exec python - << '__EOWRAPPER__' | - |from pygitversionhelper import gitversionhelper + |try: + | from pygitversionhelper import gitversionhelper + |except ImportError: + | from .src.pygitversionhelper import gitversionhelper | |print(gitversionhelper.tag.getLastTag(same_branch=True),end ="") | @@ -204,7 +216,10 @@ pipeline { |. ~/TOOLS_ENV/bin/activate |exec python - << '__EOWRAPPER__' | - |from pygitversionhelper import gitversionhelper + |try: + | from pygitversionhelper import gitversionhelper + |except ImportError: + | from .src.pygitversionhelper import gitversionhelper | |print(gitversionhelper.version.getCurrentVersion(formated_output=True,version_std="PEP440",bump_type="dev",bump_dev_strategy="post"),end ="") | @@ -447,7 +462,11 @@ pipeline { | |from simple_rest_client.api import API |from simple_rest_client.resource import Resource - |from pygitversionhelper import gitversionhelper + | + |try: + | from pygitversionhelper import gitversionhelper + |except ImportError: + | from .src.pygitversionhelper import gitversionhelper | |from urllib.parse import urljoin | -- 2.47.3 From 6dfe0682d7039d32c5677303058398e7817585f6 Mon Sep 17 00:00:00 2001 From: cclecle Date: Mon, 20 Mar 2023 01:09:32 +0000 Subject: [PATCH 5/8] fix jenkins script --- Jenkinsfile | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 35e4ff5..f4ac80c 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -133,10 +133,11 @@ pipeline { sh(". ~/TOOLS_ENV/bin/activate && pip install simple_rest_client requests") - if(_PROJECT_NAME!="pygitversionhelper") { - sh(". ~/TOOLS_ENV/bin/activate && pip install git+https://chacha.ddns.net/gitea/chacha/pygitversionhelper.git@master") + script { + if(_PROJECT_NAME!="pygitversionhelper") { + sh(". ~/TOOLS_ENV/bin/activate && pip install git+https://chacha.ddns.net/gitea/chacha/pygitversionhelper.git@master") + } } - sh("git config --global user.email $_MaintainerEmail") sh("git config --global user.name $_MaintainerName") @@ -170,7 +171,7 @@ pipeline { |try: | from pygitversionhelper import gitversionhelper |except ImportError: - | from .src.pygitversionhelper import gitversionhelper + | from src.pygitversionhelper import gitversionhelper | |lastcommit=gitversionhelper.commit.getLast(same_branch=True) |msg=gitversionhelper.commit.getMessage(lastcommit) @@ -202,7 +203,7 @@ pipeline { |try: | from pygitversionhelper import gitversionhelper |except ImportError: - | from .src.pygitversionhelper import gitversionhelper + | from src.pygitversionhelper import gitversionhelper | |print(gitversionhelper.tag.getLastTag(same_branch=True),end ="") | @@ -219,7 +220,7 @@ pipeline { |try: | from pygitversionhelper import gitversionhelper |except ImportError: - | from .src.pygitversionhelper import gitversionhelper + | from src.pygitversionhelper import gitversionhelper | |print(gitversionhelper.version.getCurrentVersion(formated_output=True,version_std="PEP440",bump_type="dev",bump_dev_strategy="post"),end ="") | @@ -466,7 +467,7 @@ pipeline { |try: | from pygitversionhelper import gitversionhelper |except ImportError: - | from .src.pygitversionhelper import gitversionhelper + | from src.pygitversionhelper import gitversionhelper | |from urllib.parse import urljoin | -- 2.47.3 From 13a584c7d934325c22252953e0ea9fdb12f9994f Mon Sep 17 00:00:00 2001 From: cclecle Date: Mon, 20 Mar 2023 01:44:37 +0000 Subject: [PATCH 6/8] fix missing packaging --- Jenkinsfile | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/Jenkinsfile b/Jenkinsfile index f4ac80c..ba3de93 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -137,6 +137,11 @@ pipeline { if(_PROJECT_NAME!="pygitversionhelper") { sh(". ~/TOOLS_ENV/bin/activate && pip install git+https://chacha.ddns.net/gitea/chacha/pygitversionhelper.git@master") } + else + { + //TODO: need to install pygitversionhelper deps from a better way... + sh(". ~/TOOLS_ENV/bin/activate && pip install packaging") + } } sh("git config --global user.email $_MaintainerEmail") sh("git config --global user.name $_MaintainerName") -- 2.47.3 From 21fc9e7c527fadf9925a26053d793952855ac59c Mon Sep 17 00:00:00 2001 From: cclecle Date: Mon, 20 Mar 2023 01:49:01 +0000 Subject: [PATCH 7/8] fix: remove tag_regex from toml -> we want the full version --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 5747932..eaef86a 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -12,7 +12,7 @@ build-backend = "setuptools.build_meta" [tool.setuptools_scm] version_scheme= "post-release" -tag_regex="^(?:v)?(?P\\d+\\.\\d+\\.\\d+)([\\.\\-\\+])?(?:.*)?" +# tag_regex="^(?:v)?(?P\\d+\\.\\d+\\.\\d+)([\\.\\-\\+])?(?:.*)?" [project] name = "pygitversionhelper" -- 2.47.3 From d4545f999b01482535ab63749193db834fffd97c Mon Sep 17 00:00:00 2001 From: cclecle Date: Mon, 20 Mar 2023 09:04:41 +0000 Subject: [PATCH 8/8] test: fix doc --- test/test_gitversionhelper.py | 1 + 1 file changed, 1 insertion(+) diff --git a/test/test_gitversionhelper.py b/test/test_gitversionhelper.py index ed0af02..7ae1c57 100644 --- a/test/test_gitversionhelper.py +++ b/test/test_gitversionhelper.py @@ -97,6 +97,7 @@ class Test_gitversionhelper(unittest.TestCase): 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): -- 2.47.3