fix: ident

escape toml
test: tag_regex to extract verison only
2023-03-20 00:19:57 +00:00 · 2023-03-20 00:16:11 +00:00 · 2023-03-20 00:03:58 +00:00 · 2023-03-19 23:09:25 +00:00
2 changed files with 6 additions and 6 deletions
--- a/11
+++ b/11
@@ -124,19 +124,19 @@ 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")
 				
-				sh(". ~/BUILD_ENV/bin/activate && pip install --upgrade setuptools build pip copier jinja2-slug toml \"setuptools-git-versioning<2\"")
+				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")
-
+                
                sh("git config --global user.email $_MaintainerEmail")
                sh("git config --global user.name  $_MaintainerName")	
-
+                
 			}
 		}
        
@@ -215,7 +215,7 @@ pipeline {
                        PY_PROJECT_VERSION_STRIPPED=ExtractBaseVersion(PY_PROJECT_VERSION)
                        
                        // Manually pushing a new tag with version string guessed by gitversionhelper 
-                        // because setuptools-git-versioning cant fing tag on other branches, so will guess a wring version without this tag.
+                        // because setuptools-git-versioning / setuptools_scm cant fing tag on other branches, so will guess a wrong version without this tag.
                        if(latestTag!=PY_PROJECT_VERSION) {
                            sh("git tag $PY_PROJECT_VERSION")
                            sh("git push origin --tags")
@@ -431,7 +431,6 @@ pipeline {
 			environment {
 				def GITEA_LOGIN_TOKEN=credentials("GiteaCHACHAPush")
 			}
-			
 			steps {
 				dir("gitrepo") {
 					script {
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -12,6 +12,7 @@ build-backend = "setuptools.build_meta"

 [tool.setuptools_scm]
 version_scheme= "post-release"
+tag_regex="^(?:v)?(?P<version>\\d+\\.\\d+\\.\\d+)([\\.\\-\\+])?(?:.*)?"

 [project]
 name = "pygitversionhelper"
Author	SHA1	Message	Date
cclecle	d786d27cd7	fix: ident	2023-03-20 00:19:57 +00:00
cclecle	fb2f3eb412	escape toml	2023-03-20 00:16:11 +00:00
cclecle	d93fd3286c	test: tag_regex to extract verison only	2023-03-20 00:03:58 +00:00
cclecle	f361a5189a	test doc	2023-03-19 23:09:25 +00:00