Merge pull request 'fix: project username' (#14) from dev into master

Reviewed-on: https://chacha.ddns.net/gitea/chacha/pygitversionhelper/pulls/14
new-tag: 1.0.0

Jenkinsfile

@@ -6,8 +6,6 @@
 // You should have received a copy of the license along with this
 // work.  If not, see <https://creativecommons.org/licenses/by-nc-sa/4.0/>.
 
-
-
 // configurable settings:
 // use to send email if workflow problem
 def _MaintainerName		     = "CHACHA"
@@ -101,7 +99,7 @@ pipeline {
 	
 		stage("Prepare") {
 			steps {
-				script {
+				script{
 					if (_bFullRebuilt) {
 						// start by cleaning the workspace (not using cleanWs() because we want to keep the directory itself)
 						// => this is needed to fetch it again with custom options 
@@ -110,7 +108,8 @@ pipeline {
 					else {
 						sh("find ~/. -name . ! -path './TEST_ENV/*' ! -path './BUILD_ENV/*'  -o -prune -exec rm -rf -- {} +")
 					}
-                    if(_GIT_BRANCH!="master") {
+                    if(_GIT_BRANCH!="master")
+                    {
                         _bPreRelease = true
                     }
 				}
@@ -136,27 +135,23 @@ pipeline {
 
                 sh("git config --global user.email $_MaintainerEmail")
                 sh("git config --global user.name  $_MaintainerName")	
-
 			}
 		}
-        
+
 		stage("GetCode") {
 			steps {
 				dir("gitrepo") {
-					// manually checkout the repository, with All branches and tags 
+					// manually checkout the repository, with All branches and tags
 					// => because we might need them for version and changelog computing
                     checkout([ $class: "GitSCM", 
                                branches: [[name: GIT_BRANCH]], 
                                extensions: [[$class: "CloneOption", noTags: false, shallow: false, depth: 0, reference: '']], 
                                userRemoteConfigs: [[credentialsId: _SCMCredentials, url: GIT_URL]]])
-                    script {
-
-                        withCredentials([usernamePassword(credentialsId: _SCMCredentials, passwordVariable: 'GIT_PASSWORD', usernameVariable: 'GIT_USERNAME')]) {
-                            sh("git remote set-url origin https://${GIT_USERNAME}:${GIT_PASSWORD}@chacha.ddns.net/gitea/${_PROJECT_USER_NAME}/${_PROJECT_NAME}.git")
-                        }
-                                      
-                        if(_GIT_BRANCH=="master") {
-                            if(sh(returnStdout:  true, script: "git tag --points-at HEAD").trim().isEmpty()) {
+                    script{
+                        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__'
@@ -173,32 +168,43 @@ pipeline {
                                                                  |__EOWRAPPER__
                                                               """.stripMargin(),
                                                                returnStdout: true).trim()
-                                if(BUMPED_VERSION.isEmpty()) {
+                                if(BUMPED_VERSION.isEmpty())
+                                {
                                     echo "master push/merge must have an explicit tag release number, stopping pipeline"
                                     currentBuild.getRawBuild().getExecutor().doStop()
                                 }
-                                else {
+                                else
+                                {
                                     echo "new-tag requested in commit message: $BUMPED_VERSION"
-
+                                    withCredentials([usernamePassword(credentialsId: _SCMCredentials, passwordVariable: 'GIT_PASSWORD', usernameVariable: 'GIT_USERNAME')]) {
+                                        sh("git remote set-url origin https://${GIT_USERNAME}:${GIT_PASSWORD}@chacha.ddns.net/gitea/${_PROJECT_USER_NAME}/${_PROJECT_NAME}.git")
+                                    }
                                     sh("git tag $BUMPED_VERSION")
                                     sh("git push origin --tags")
                                 }
                             }
                         }
-                                               
-                        latestTag = sh(script:   """#!/bin/sh -
-                                                     |. ~/TOOLS_ENV/bin/activate
-                                                     |exec python - << '__EOWRAPPER__'
-                                                     |
-                                                     |from pygitversionhelper import gitversionhelper
-                                                     |
-                                                     |print(gitversionhelper.tag.getLastTag(same_branch=True),end ="")
-                                                     |
-                                                     |__EOWRAPPER__
-                                                  """.stripMargin(),
-                                       returnStdout: true)
+                    
+                        // using git to get the latest tag on this branch 
+                        def latestTag = sh(returnStdout:  true, script: "git tag --sort=-creatordate | head -n 1").trim()
                         echo("latestTag:. . . . . . . . . . . . $latestTag  ")
-                        
+                                               
+                         sh(script:  """#!/bin/sh -
+                                         |. ~/TOOLS_ENV/bin/activate
+                                         |exec python - << '__EOWRAPPER__'
+                                         |
+                                         |from pygitversionhelper import gitversionhelper
+                                         |
+                                         |print(f"most recent repository tag: {gitversionhelper.tag.getLastTag()}")
+                                         |print(f"most recent repository tag: {gitversionhelper.tag.getLastTag(same_branch=True)}")
+                                         |print(f"number of commit since last tag: {gitversionhelper.tag.getDistanceFromTag()}")
+                                         |print(f"number of commit since last tag: {gitversionhelper.tag.getDistanceFromTag(same_branch=True)}")
+                                         |print(f"most recent repository version: {gitversionhelper.version.getLastVersion(formated_output=True)}")
+                                         |print(f'current repository version: {gitversionhelper.version.getCurrentVersion(formated_output=True,version_std="PEP440",bump_type="dev",bump_dev_strategy="post")}')
+                                         |
+                                         |__EOWRAPPER__
+                                      """.stripMargin())
+                                      
                         // get current (or bumped) version number from git history
                         PY_PROJECT_VERSION = sh(script:   """#!/bin/sh -
                                                              |. ~/TOOLS_ENV/bin/activate
@@ -214,16 +220,11 @@ pipeline {
                         echo("PY_PROJECT_VERSION: . . . . . . . . . $PY_PROJECT_VERSION")
                         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.
-                        if(latestTag!=PY_PROJECT_VERSION) {
-                            sh("git tag $PY_PROJECT_VERSION")
-                            sh("git push origin --tags")
-                        }
-                        
                         // specific handling to test the template itself 
                         // => little hacky... creating a new git repo with a commit/tag corresponding to HEAD of the official one
-                        if(_PROJECT_NAME=="pyChaChaDummyProject") { //specific case to test the template itself
+                        if(_PROJECT_NAME=="pyChaChaDummyProject")  //specific case to test the template itself
+                        {
+
 							sh("rm -Rf ~/_gitrepo  || true")
 							
                             sh(script:    """#!/bin/sh -
@@ -284,7 +285,7 @@ pipeline {
 			steps {
 				// no need for a build-env: setuptools is already creating one
 				dir("gitrepo") {
-					script {
+					script{
 						// actually doing the package build
 						sh(". ~/BUILD_ENV/bin/activate && python -m build .")
 					}
@@ -313,16 +314,16 @@ pipeline {
                 }
             }
             post {
-                always {      
-                    dir("gitrepo") {                              
-                    publishHTML([
-                                reportDir:              "helpers-results/quality_check",
-                                reportFiles:            "report.html",
-                                reportName:             "quality-report",
-                                allowMissing:           false,
-                                alwaysLinkToLastBuild:  true,
-                                keepAll:                true])    
-                   }         
+                    always {      
+                        dir("gitrepo") {                              
+                        publishHTML([
+                                    reportDir:              "helpers-results/quality_check",
+                                    reportFiles:            "report.html",
+                                    reportName:             "quality-report",
+                                    allowMissing:           false,
+                                    alwaysLinkToLastBuild:  true,
+                                    keepAll:                true])    
+                       }         
                 }
             }
         }
@@ -435,7 +436,8 @@ pipeline {
 				dir("gitrepo") {
 					script {
 						def CurrentDateTime=java.time.LocalDateTime.now()
-						withCredentials([string( credentialsId: _MkDocsWebCredentials,variable: 'MKDOCSTOKEN' )]) {
+						withCredentials([string( credentialsId: _MkDocsWebCredentials,variable: 'MKDOCSTOKEN' )]) 
+						{
                         sh(script:   """#!/bin/sh -
                                         |. ~/TOOLS_ENV/bin/activate
                                         |exec python - << '__EOWRAPPER__'

pyproject.toml

@@ -7,11 +7,13 @@
 # work.  If not, see <https://creativecommons.org/licenses/by-nc-sa/4.0/>.
 
 [build-system]
-requires = ["setuptools>=63", "wheel", "setuptools_scm"]
+requires = ["setuptools>=63", "wheel", "setuptools-git-versioning<2"]
 build-backend = "setuptools.build_meta"
 
-[tool.setuptools_scm]
-version_scheme= "post-release"
+[tool.setuptools-git-versioning]
+enabled = true
+dev_template    = "{tag}.post{ccount}"
+tag_filter      = "^\\d+\\.\\d+\\.\\d+$"
 
 [project]
 name = "pygitversionhelper"
@@ -49,8 +51,8 @@ where = ["src"]
 "pygitversionhelper.data" = ["*.*"]
 
 [project.urls]
-Homepage        = "https://chacha.ddns.net/gitea/chacha/pygitversionhelper/"
-Documentation   = "https://chacha.ddns.net/mkdocs-web/chacha/pygitversionhelper/master/latest/"
+Homepage        = "https://chacha.ddns.net/gitea/chacha/pygitversionhelper"
+Documentation   = "https://chacha.ddns.net/gitea/chacha/pygitversionhelper/wiki"
 Tracker         = "https://chacha.ddns.net/gitea/chacha/pygitversionhelper/issues"
 
 [project.optional-dependencies]