Merge pull request 'dev' (#15) from dev into master

Reviewed-on: https://chacha.ddns.net/gitea/chacha/pygitversionhelper/pulls/15
new-tag:1.0.1

.gitignore

@@ -41,5 +41,3 @@ docs
 helpers-results
 .coverage
 /.mypy_cache/
-.coverage
-.mypy_cache

.project

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>pygitversionhelper</name>
+	<name>gitversionhelper</name>
 	<comment></comment>
 	<projects>
 	</projects>

.pydevproject

@@ -6,6 +6,7 @@
     <pydev_property name="org.python.pydev.PYTHON_PROJECT_VERSION">python interpreter</pydev_property>
         
     <pydev_pathproperty name="org.python.pydev.PROJECT_SOURCE_PATH">
+        <path>/${PROJECT_DIR_NAME}/src</path>
         <path>/${PROJECT_DIR_NAME}</path>
     </pydev_pathproperty>
     

Jenkinsfile

@@ -6,14 +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/>.
 
-import groovy.xml.XmlUtil
-import static javax.xml.xpath.XPathConstants.*
-import javax.xml.xpath.*
-import groovy.xml.DOMBuilder
-import groovy.xml.dom.DOMCategory
-import java.math.RoundingMode
-import java.math.BigDecimal
-
 // configurable settings:
 // use to send email if workflow problem
 def _MaintainerName		     = "CHACHA"
@@ -25,19 +17,12 @@ def _bPreRelease		     = false
 // toogle Draft flag on Gitea release system => If False, TAG is not created
 def _bDraft				     = false
 // release content / changelog management
-def _bAutoChangelog		     = true //Not supported yet
-def _ReleaseContent_Title	 = "# _CI/CD Automatic Release_"
-def bPushMasterOnPypi        = true
+def _bAutoChangelog		     = false //Not supported yet
+def _ReleaseContent_Title	 = "_CI/CD Automatic Release_"
 // full rebuild toogle
 def _bFullRebuilt		     = true
 def _MkDocsWebURL            = "dabauto--mkdocs-web.dmz.chacha.home/mkdocs-web/"
 def _MkDocsWebCredentials    = "2c5b684e-3787-4b37-8aca-b3dd4a383fe2" 
-def _PypiCredentials         = "Pypi"
-
-
-def badge_coverage          = addEmbeddableBadgeConfiguration(id: "coverage",   subject: "coverage")
-def badge_maintainability   = addEmbeddableBadgeConfiguration(id: "maintainability", subject: "maintainability")
-def badge_quality           = addEmbeddableBadgeConfiguration(id: "quality",    subject: "quality score")
 
 // commands Helper: /!\ Made for GITEA /!\
 String determineRepoUserName() {
@@ -74,46 +59,6 @@ String ExtractBaseVersion(inVersion) {
     return matcher[0][1]
 }
 
-int GetCoverageValue(String CoverageFilePath,String XPath)
-{ 
-  //File file = new File(CoverageFilePath)
-  //coverageReportRaw = file.getText('UTF-8')
-  coverageReportRaw = readFile(CoverageFilePath)
-  coverageReport = DOMBuilder.parse(new StringReader(coverageReportRaw), false, false)
-  coverageReportRoot = coverageReport.documentElement
-  
-  def xpath = XPathFactory.newInstance().newXPath()
-  res = xpath.evaluate(XPath,coverageReportRoot,NUMBER)
-  return res
-}
-
-String getColorScale(BigDecimal value)
-{
-  if( value >9)         { return "Goldenrod"}
-  else if( value >6)    { return "seagreen"}
-  else if( value >4)    { return "orange"}
-  else if( value >2)    { return "darkred"}
-  else                  { return "dimgrey"}
-}
-
-String getColorScale_reversed(BigDecimal value)
-{
-  if( value >9)         { return "dimgrey"}
-  else if( value >6)    { return "darkred"}
-  else if( value >4)    { return "orange"}
-  else if( value >2)    { return "seagreen"}
-  else                  { return "Goldenrod"}
-}
-
-int GetCoverageValue_lines_valid(String CoverageFilePath) { return GetCoverageValue(CoverageFilePath,"/coverage/@lines-valid") }
-int GetCoverageValue_lines_covered(String CoverageFilePath) { return GetCoverageValue(CoverageFilePath,"/coverage/@lines-covered") }
-int GetCoverageValue_line_rate(String CoverageFilePath) { return GetCoverageValue(CoverageFilePath,"/coverage/@line-rate") }
-int GetCoverageValue_branches_valid(String CoverageFilePath) { return GetCoverageValue(CoverageFilePath,"/coverage/@branches-valid") }
-int GetCoverageValue_branches_covered(String CoverageFilePath) { return GetCoverageValue(CoverageFilePath,"/coverage/@branches-covered") }
-int GetCoverageValue_branch_rate(String CoverageFilePath) { return GetCoverageValue(CoverageFilePath,"/coverage/@branch-rate") }
-int GetCoverageValue_complexity(String CoverageFilePath) { return GetCoverageValue(CoverageFilePath,"/coverage/@complexity") }
-
-
 pipeline {
 	
 	// for Docker based build (preferable)
@@ -148,14 +93,13 @@ pipeline {
 		PY_PROJECT_NAME                   = "__NOTSET__"
 		PY_PROJECT_VERSION                = "__NOTSET__"
         PY_PROJECT_VERSION_STRIPPED       = "__NOTSET__"
-        CHANGELOG                         = "__NOTSET__"
 	}
-    
+
 	stages {
-	   
+	
 		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 
@@ -164,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
                     }
 				}
@@ -178,34 +123,22 @@ 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")
-                sh(". ~/BUILD_ENV/bin/activate && pip install --upgrade 'copier==9.*' jinja2-slug toml")
-                 
-                sh(". ~/TEST_ENV/bin/activate && pip install --upgrade pip")
+				sh(". ~/BUILD_ENV/bin/activate && pip install --upgrade setuptools build pip copier jinja2-slug toml \"setuptools-git-versioning<2\"")
 				
-                sh(". ~/TOOLS_ENV/bin/activate && pip install --upgrade pip")
-                sh(". ~/TOOLS_ENV/bin/activate && pip install simple_rest_client requests twine packaging")
-                
-                script {
-                    if(_PROJECT_NAME!="pygitversionhelper") {
-                        sh(". ~/TOOLS_ENV/bin/activate && pip install pygitversionhelper")
-                    }
-                    if(_PROJECT_NAME!="pychangelogfactory") {
-                        sh(". ~/TOOLS_ENV/bin/activate && pip install pychangelogfactory")
-                    }
-                }
+                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")	
-                sh("git config --global init.defaultBranch master")
-                
+
 			}
 		}
-        
+
 		stage("GetCode") {
 			steps {
 				dir("gitrepo") {
@@ -215,52 +148,43 @@ pipeline {
                                branches: [[name: GIT_BRANCH]], 
                                extensions: [[$class: "CloneOption", noTags: false, shallow: false, depth: 0, reference: '']], 
                                userRemoteConfigs: [[credentialsId: _SCMCredentials, url: GIT_URL]]])
-                    script {
+                    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")
                         }
-                         
-                        CHANGELOG      = sh(script:  """#!/bin/sh -
-                                                         |. ~/TOOLS_ENV/bin/activate
-                                                         |exec python - << '__EOWRAPPER__'
-                                                         |
-                                                         |import re
-                                                         |
-                                                         |try:
-                                                         |    from pychangelogfactory import ChangelogFactory
-                                                         |except ImportError:
-                                                         |    from src.pychangelogfactory import ChangelogFactory
-                                                         |
-                                                         |try:
-                                                         |    from pygitversionhelper import gitversionhelper
-                                                         |except ImportError:
-                                                         |    from src.pygitversionhelper import gitversionhelper
-                                                         |
-                                                         |
-                                                         |LastTag=gitversionhelper.tag.getLastTag(same_branch=True)
-                                                         |CommitHistory=gitversionhelper.commit.getMessagesSinceTag(LastTag, merged_output=True, ignore_merged=True)
-                                                         |Changelog = ChangelogFactory(CommitHistory).RenderFullChangelog(include_unknown=True)
-                                                         |print(Changelog.replace("\\n","\\n\\n"))
-                                                         |
-                                                         |__EOWRAPPER__
-                                                      """.stripMargin(),
-                                                       returnStdout: true).trim()   
-                                      
-                        if(_GIT_BRANCH=="master") {
-                            if(sh(returnStdout:  true, script: "git tag --points-at HEAD").trim().isEmpty()) {
 
+                        // using git to get the latest tag on this branch (before processing)
+                        def latestTag_beforeProcessing = sh(returnStdout:  true, script: "git tag --sort=-creatordate | head -n 1").trim()
+                        echo("latestTag_beforeProcessing:. . . . . . . . . . . . $latestTag_beforeProcessing")
+                                               
+                        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())
+                                      
+                        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)
                                                                  |
@@ -270,12 +194,13 @@ 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"
 
                                     sh("git tag $BUMPED_VERSION")
@@ -283,15 +208,28 @@ pipeline {
                                 }
                             }
                         }
-                                               
+                        
+                        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())
+                        
                         latestTag = sh(script:   """#!/bin/sh -
                                                      |. ~/TOOLS_ENV/bin/activate
                                                      |exec python - << '__EOWRAPPER__'
                                                      |
-                                                     |try:
-                                                     |    from pygitversionhelper import gitversionhelper
-                                                     |except ImportError:
-                                                     |    from src.pygitversionhelper import gitversionhelper
+                                                     |from pygitversionhelper import gitversionhelper
                                                      |
                                                      |print(gitversionhelper.tag.getLastTag(same_branch=True),end ="")
                                                      |
@@ -305,10 +243,7 @@ pipeline {
                                                              |. ~/TOOLS_ENV/bin/activate
                                                              |exec python - << '__EOWRAPPER__'
                                                              |
-                                                             |try:
-                                                             |    from pygitversionhelper import gitversionhelper
-                                                             |except ImportError:
-                                                             |    from src.pygitversionhelper import gitversionhelper
+                                                             |from pygitversionhelper import gitversionhelper
                                                              |
                                                              |print(gitversionhelper.version.getCurrentVersion(formated_output=True,version_std="PEP440",bump_type="dev",bump_dev_strategy="post"),end ="")
                                                              |
@@ -319,15 +254,17 @@ pipeline {
                         PY_PROJECT_VERSION_STRIPPED=ExtractBaseVersion(PY_PROJECT_VERSION)
                         
                         // Manually pushing a new tag with version string guessed by gitversionhelper 
-                        // 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) {
+                        // 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 -
@@ -345,7 +282,7 @@ pipeline {
                                              |'''.strip()
                                              |
                                              |import copier
-                                             |copier.run_copy("./", "../_gitrepo",vcs_ref="HEAD",use_prereleases=True,defaults=True,cleanup_on_error=False,unsafe=True)
+                                             |copier.run_auto("./", "../_gitrepo",vcs_ref="HEAD",use_prereleases=True,defaults=True,cleanup_on_error=False)
                                              |
                                              |__EOWRAPPER__
                                           """.stripMargin())
@@ -388,7 +325,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 .")
 					}
@@ -404,7 +341,7 @@ pipeline {
 						def wheelPath = findFiles(glob: "**/dist/*.whl")[0]
 						echo "wheel artifact path: $wheelPath"
 						// install the package, with *test* optionnal packages, as user
-						sh(". ~/TEST_ENV/bin/activate && pip install --find-links dist/ ${PY_PROJECT_NAME} .[test,coverage-check,quality-check,type-check,doc-gen,complexity-check]")
+						sh(". ~/TEST_ENV/bin/activate && pip install --find-links dist/ ${PY_PROJECT_NAME} .[test,coverage-check,quality-check,type-check,doc-gen]")
 					}
 				}
 			}
@@ -413,45 +350,20 @@ pipeline {
         stage("CheckCode") {
             steps {
                 dir("gitrepo") {
-                    sh(". ~/TEST_ENV/bin/activate && python -m chacha_cicd_helper --typecheck --qualitycheck")
-                    script {
-                        def jsonObj = readJSON file: "helpers-results/cl_quality_check/metrics.json"
-                        quality_score = new BigDecimal(jsonObj["GlobalScore"])
-                        sz_quality_score = quality_score.setScale(2, RoundingMode.HALF_EVEN).toString()
-                        badge_quality.setStatus(sz_quality_score)
-                        badge_quality.setColor(getColorScale(quality_score))
-                    }
-                    sh(". ~/TEST_ENV/bin/activate && python -m chacha_cicd_helper --complexitycheck")
+                    sh(". ~/TEST_ENV/bin/activate && python -m helpers --type-check --quality-check")
                 }
             }
             post {
-                always {      
-                    dir("gitrepo") { 
-                        //publish coverage
-                        recordCoverage( sourceDirectories: [[path: 'src']],
-                                        tools: [[parser: 'COBERTURA', pattern: 'helpers-results/cl_types_check/cobertura.xml']],
-                                        id: 'COBERTURA', name: 'COBERTURA Coverage',
-                                        sourceCodeRetention: 'EVERY_BUILD',)
-                        
-                        //add type check to junit result set
-                        junit 'helpers-results/cl_types_check/junit.xml'    
-                        
-                        //publish html reports files
+                    always {      
+                        dir("gitrepo") {                              
                         publishHTML([
-                                    reportDir:              "helpers-results/cl_quality_check",
+                                    reportDir:              "helpers-results/quality_check",
                                     reportFiles:            "report.html",
                                     reportName:             "quality-report",
                                     allowMissing:           false,
                                     alwaysLinkToLastBuild:  true,
-                                    keepAll:                true])                 
-                        publishHTML([
-                                    reportDir:              "helpers-results/cl_types_check",
-                                    reportFiles:            "index.html",
-                                    reportName:             "types_check",
-                                    allowMissing:           false,
-                                    alwaysLinkToLastBuild:  true,
                                     keepAll:                true])    
-                   }         
+                       }         
                 }
             }
         }
@@ -459,7 +371,7 @@ pipeline {
             steps {
   
                  plot([ csvFileName: 'plot-df7f03dc-8146-11ed-a1eb-0242ac120002.csv',
-                        csvSeries: [[ file: 'gitrepo/helpers-results/cl_quality_check/metrics_GlobalScore.csv', inclusionFlag: 'OFF', url: '']],
+                        csvSeries: [[ file: 'gitrepo/helpers-results/quality_check/metrics_GlobalScore.csv', inclusionFlag: 'OFF', url: '']],
                         group: 'metrics',
                         title: 'code quality score',
                         style: 'line',
@@ -469,7 +381,7 @@ pipeline {
                         yaxisMinimum: '0'])
                               
                  plot([ csvFileName: 'plot-c731cc84-8145-11ed-a1eb-0242ac120002.csv',
-                        csvSeries: [[ file: 'gitrepo/helpers-results/cl_quality_check/metrics_rawpercent.csv', inclusionFlag: 'OFF', url: '']],
+                        csvSeries: [[ file: 'gitrepo/helpers-results/quality_check/metrics_rawpercent.csv', inclusionFlag: 'OFF', url: '']],
                         group: 'metrics',
                         title: 'code composition (%)',
                         style: 'stackedArea',
@@ -479,7 +391,7 @@ pipeline {
                         yaxisMinimum: '0'])
                         
                  plot([ csvFileName: 'plot-cac33982-8145-11ed-a1eb-0242ac120002.csv',
-                        csvSeries: [[ file: 'gitrepo/helpers-results/cl_quality_check/metrics_Statistics.csv', inclusionFlag: 'OFF', url: '']],
+                        csvSeries: [[ file: 'gitrepo/helpers-results/quality_check/metrics_Statistics.csv', inclusionFlag: 'OFF', url: '']],
                         group: 'metrics',
                         title: 'general statistics',
                         style: 'line',
@@ -487,68 +399,35 @@ pipeline {
                         numBuilds: ''])
                         
                  plot([ csvFileName: 'plot-cddaced2-8145-11ed-a1eb-0242ac120002.csv',
-                        csvSeries: [[ file: 'gitrepo/helpers-results/cl_quality_check/metrics_MessagesCat.csv', inclusionFlag: 'OFF', url: '']],
+                        csvSeries: [[ file: 'gitrepo/helpers-results/quality_check/metrics_MessagesCat.csv', inclusionFlag: 'OFF', url: '']],
                         group: 'metrics',
                         title: 'quality warnings',
                         style: 'stackedArea',
                         keepRecords: true,
                         numBuilds: ''])
-                        
-                 plot([ csvFileName: 'plot-4ceb9ee2-ca78-11ed-afa1-0242ac120002.csv',
-                        csvSeries: [[ file: 'gitrepo/helpers-results/cl_complexity_check/MI.csv', inclusionFlag: 'INCLUDE_BY_STRING',exclusionValues: 'MeanMaintainability', url: '']],
-                        group: 'metrics',
-                        title: 'maintainability',
-                        style: 'stackedArea',
-                        keepRecords: true,
-                        numBuilds: ''])
             }
         }
         
 		stage("RunUnitTests") {
 			steps {
                 dir("gitrepo") {
-                    sh(". ~/TEST_ENV/bin/activate && python -m chacha_cicd_helper --unittest --coveragecheck")
+                    sh(". ~/TEST_ENV/bin/activate && python -m helpers --unit-test --coverage-check")
                     script {
-                        unit_test_full_name__html=findFiles(glob: "helpers-results/cl_unit_test_full/*.html")[0].getName()
+                        unit_test_full_name__html=findFiles(glob: "helpers-results/unit_test_full/*.html")[0].getName()
                         println unit_test_full_name__html
-                        unit_test_full_name__xml=findFiles(glob:  "helpers-results/cl_unit_test_full/*.xml")[0].getName()
+                        unit_test_full_name__xml=findFiles(glob:  "helpers-results/unit_test_full/*.xml")[0].getName()
                         println unit_test_full_name__xml
-                        
-                        coverage_report_path = "helpers-results/cl_unit_test_coverage/test_coverage.xml"
-                        println GetCoverageValue_lines_valid(coverage_report_path)
-                        println GetCoverageValue_lines_covered(coverage_report_path)
-                        println GetCoverageValue_line_rate(coverage_report_path)
-                        println GetCoverageValue_branches_valid(coverage_report_path)
-                        println GetCoverageValue_branches_covered(coverage_report_path)
-                        println GetCoverageValue_branch_rate(coverage_report_path)
-                        println GetCoverageValue_complexity(coverage_report_path)
-                        
-                        full_rate = new BigDecimal( 10*(GetCoverageValue_line_rate(coverage_report_path) + GetCoverageValue_branch_rate(coverage_report_path)) / 2 )
-                        sz_full_rate = full_rate.setScale(2, RoundingMode.HALF_EVEN).toString()
-                        badge_coverage.setStatus(sz_full_rate)
-                        badge_coverage.setColor(getColorScale(full_rate))
-                                               
-                        //badge_maintainability
-                        records = readCSV file: 'helpers-results/cl_complexity_check/MI.csv'
-                        maintainability = records[1][1]
-                        badge_maintainability.setStatus(maintainability)
-                        
-                        if     ( maintainability == 'D')  { badge_maintainability.setColor(  "dimgrey")}
-                        else if( maintainability == 'C')  { badge_maintainability.setColor(  "darkred")}
-                        else if( maintainability == 'B')  { badge_maintainability.setColor(  "orange")}
-                        else if( maintainability == 'A')  { badge_maintainability.setColor(  "seagreen")}
-                        else if( maintainability == 'A+') { badge_maintainability.setColor(  "Goldenrod")} 
                     }
                 }
 			}
 			post {
 				always {
                     dir("gitrepo") {
-    				    junit 'helpers-results/cl_unit_test/*.xml'
+    				    junit 'helpers-results/unit_test/*.xml'
     				    // using cobertura format (= coverage xml format)
-    				    recordCoverage(tools: [[parser: 'COBERTURA', pattern: 'helpers-results/cl_unit_test_coverage/test_coverage.xml']])
+    				    publishCoverage adapters: [cobertura(mergeToOneReport: true, path: "helpers-results/unit_test_coverage/test_coverage.xml")]
     				    publishHTML([
-                                    reportDir:              "helpers-results/cl_unit_test_coverage",
+                                    reportDir:              "helpers-results/unit_test_coverage",
                                     reportFiles:            "index.html",
                                     reportName:             "coverage-report-html",
                                     allowMissing:           false,
@@ -556,7 +435,7 @@ pipeline {
                                     keepAll:                true])
 
                         publishHTML([
-                                    reportDir:              "helpers-results/cl_unit_test_full",
+                                    reportDir:              "helpers-results/unit_test_full",
                                     reportFiles:            unit_test_full_name__html,
                                     reportName:             "test-reports-full",
                                     allowMissing:           false,
@@ -570,14 +449,15 @@ pipeline {
         stage("GenDOC") {
             steps {
                 dir("gitrepo") {
-                    sh(". ~/TEST_ENV/bin/activate && python -m chacha_cicd_helper --docgen --docgenpdf")
+                    //--doc-gen-pdf
+                    sh(". ~/TEST_ENV/bin/activate && python -m helpers --doc-gen --doc-gen-pdf")
                 }
             }
             post {
                 always {
                     dir("gitrepo") {
                         publishHTML([
-                                    reportDir:              "helpers-results/cl_doc_gen/site",
+                                    reportDir:              "helpers-results/doc_gen/site",
                                     reportFiles:            "index.html",
                                     reportName:             "doc-html",
                                     allowMissing:           false,
@@ -596,25 +476,19 @@ 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__'
                                         |
+										|from simple_rest_client.api import API
+										|from simple_rest_client.resource import Resource
 										|import json
 										|import glob
 										|import requests
 										|import shutil
 										|
-                                        |from simple_rest_client.api import API
-                                        |from simple_rest_client.resource import Resource
-                                        |
-                                        |
-                                        |try:
-                                        |    from pygitversionhelper import gitversionhelper
-                                        |except ImportError:
-                                        |    from src.pygitversionhelper import gitversionhelper
-										|
 										|from urllib.parse import urljoin
 										|
 										|class GiteaRepoCommits(Resource):
@@ -656,13 +530,6 @@ pipeline {
 										|ReleaseContent  = "${_ReleaseContent_Title}" + "\\n" \\
 										|                + "\\n" \\
                                         |                + "Reference documentation: [mkdocs page](https://chacha.ddns.net/mkdocs-web/${_PROJECT_USER_NAME}/${PY_PROJECT_NAME}/${_GIT_BRANCH}/${PY_PROJECT_VERSION_STRIPPED}/) "
-										|
-										|Changelog='''${CHANGELOG}'''
-										|
-										|ReleaseContent = ReleaseContent + "\\n"+ "\\n"+ "## Changelog:\\n" + Changelog
-										|
-										|if not Changelog:
-										|    ReleaseContent = ReleaseContent + "code/project maintainance"
 										|
 										|data={
 										|    "body":				ReleaseContent,
@@ -682,11 +549,11 @@ pipeline {
                                         |
                                         |data = {
                                         | "name":     "Documentation (pdf)",
-                                        | 'attachment': ("${PY_PROJECT_NAME}_${PY_PROJECT_VERSION}_UserManual.pdf", open("helpers-results/cl_doc_gen/site/pdf/manual.pdf", 'rb')),
+                                        | 'attachment': ("${PY_PROJECT_NAME}_${PY_PROJECT_VERSION}_UserManual.pdf", open("helpers-results/doc_gen/site/pdf/manual.pdf", 'rb')),
                                         |} 
                                         |GiteaApi.assets.post("${_PROJECT_USER_NAME}","${PY_PROJECT_NAME}",new_release_id,files=data)
                                         |
-                                        |shutil.make_archive("doc", 'zip', "helpers-results/cl_doc_gen/site")
+                                        |shutil.make_archive("doc", 'zip', "helpers-results/doc_gen/site")
                                         |reqData={
                                         |   "SECRET":     "${MKDOCSTOKEN}",
                                         |   "USER":       "${_PROJECT_USER_NAME}",
@@ -702,14 +569,6 @@ pipeline {
                                         |__EOWRAPPER__
 									 """.stripMargin())
 									}
-                       if((_GIT_BRANCH=="master") && (bPushMasterOnPypi)) {
-                           withCredentials([usernamePassword( credentialsId: _PypiCredentials, passwordVariable: 'PYPI_PASSWORD', usernameVariable: 'PYPI_USERNAME')]) {
-                            sh(script:   """#!/bin/sh -
-                                            |. ~/TOOLS_ENV/bin/activate
-                                            |exec twine upload -u ${PYPI_USERNAME} -p ${PYPI_PASSWORD} --non-interactive --disable-progress-bar dist/*
-                                         """.stripMargin())
-						    }
-					    }
 					}
 				}
 			}

README.md

@@ -1,10 +1,5 @@
-![](https://chacha.ddns.net/jenkins/buildStatus/icon?subject=status&status=active&color=seagreen)
-![](https://chacha.ddns.net/jenkins/buildStatus/icon?subject=doc&status=MkDocs&color=blue)
 ![](https://chacha.ddns.net/jenkins/buildStatus/icon?subject=jenkins-unittest&job={{repository}}-{{branch}})
-![](https://chacha.ddns.net/jenkins/buildStatus/icon?job={{repository}}-{{branch}}&build=0&config=coverage)
-![](https://chacha.ddns.net/jenkins/buildStatus/icon?job={{repository}}-{{branch}}&build=0&config=maintainability)
-![](https://chacha.ddns.net/jenkins/buildStatus/icon?job={{repository}}-{{branch}}&build=0&config=quality)
-![](https://chacha.ddns.net/jenkins/buildStatus/icon?subject=licence&status=CC%20BY-NC-SA%204.0&color=teal)
+![](https://chacha.ddns.net/jenkins/buildStatus/icon?subject=licence&status=CC%20BY-NC-SA%204.0&color=blue)
 
 ![](docs-static/Library.jpg)
 
@@ -14,7 +9,8 @@ _A tiny library to help versioning management of git python projects_
 
 Because a good developer is a lazy developer and version management in CI/CD can be very time consuming.
 
-Checkout [Latest Documentation](https://chacha.ddns.net/mkdocs-web/chacha/pygitversionhelper/master/latest/).
+
+Checkout [Latest Documentation](https://chacha.ddns.net/mkdocs-web/chacha/pygitversionhelper/{{branch}}/latest/).
 
 ## Features
     - list tags
@@ -23,14 +19,13 @@ Checkout [Latest Documentation](https://chacha.ddns.net/mkdocs-web/chacha/pygitv
     - get current version (bumped)
     - convert / switch from SemVer to PEP440 (both ways)
     - automatic version format detection (SemVer by default)
-    - get commit message history
-
+    
 ## Options
     - restrict to same branch
     - both SemVer and PEP440 support
     - custom output format
-    - configurable default bump type: major, minor, patch or dev
-    - configurable default bump strategy: post, pre-patch, pre-minor, pre-major
+    - configurable default bump type major, minor, patch or dev
+    - configurable default bump type: post, pre-patch, pre-minor, pre-major
     - ignore non-version tag
     - force version format
 

RUN_complexity.launch

@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<launchConfiguration type="org.python.pydev.debug.regularLaunchConfigurationType">
-    <booleanAttribute key="org.eclipse.debug.core.ATTR_FORCE_SYSTEM_CONSOLE_ENCODING" value="false"/>
-    <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
-        <listEntry value="/pygitversionhelper/helpers_proxy"/>
-    </listAttribute>
-    <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
-        <listEntry value="2"/>
-    </listAttribute>
-    <stringAttribute key="org.eclipse.debug.ui.ATTR_CONSOLE_ENCODING" value="UTF-8"/>
-    <stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="${workspace_loc:pygitversionhelper/helpers_proxy}"/>
-    <stringAttribute key="org.eclipse.ui.externaltools.ATTR_OTHER_WORKING_DIRECTORY" value=""/>
-    <stringAttribute key="org.eclipse.ui.externaltools.ATTR_TOOL_ARGUMENTS" value="--complexitycheck"/>
-    <stringAttribute key="org.python.pydev.debug.ATTR_INTERPRETER" value="__default"/>
-    <stringAttribute key="org.python.pydev.debug.ATTR_PROJECT" value="pygitversionhelper"/>
-    <stringAttribute key="process_factory_id" value="org.python.pydev.debug.processfactory.PyProcessFactory"/>
-</launchConfiguration>

RUN_mkdocs.launch

@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<launchConfiguration type="org.python.pydev.debug.regularLaunchConfigurationType">
-    <booleanAttribute key="org.eclipse.debug.core.ATTR_FORCE_SYSTEM_CONSOLE_ENCODING" value="false"/>
-    <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
-        <listEntry value="/pygitversionhelper/helpers_proxy"/>
-    </listAttribute>
-    <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
-        <listEntry value="2"/>
-    </listAttribute>
-    <stringAttribute key="org.eclipse.debug.ui.ATTR_CONSOLE_ENCODING" value="UTF-8"/>
-    <stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="${workspace_loc:pygitversionhelper/helpers_proxy}"/>
-    <stringAttribute key="org.eclipse.ui.externaltools.ATTR_OTHER_WORKING_DIRECTORY" value=""/>
-    <stringAttribute key="org.eclipse.ui.externaltools.ATTR_TOOL_ARGUMENTS" value="--docgen --docgenpdf"/>
-    <stringAttribute key="org.python.pydev.debug.ATTR_INTERPRETER" value="__default"/>
-    <stringAttribute key="org.python.pydev.debug.ATTR_PROJECT" value="pygitversionhelper"/>
-    <stringAttribute key="process_factory_id" value="org.python.pydev.debug.processfactory.PyProcessFactory"/>
-</launchConfiguration>

RUN_quality.launch

@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<launchConfiguration type="org.python.pydev.debug.regularLaunchConfigurationType">
-    <booleanAttribute key="org.eclipse.debug.core.ATTR_FORCE_SYSTEM_CONSOLE_ENCODING" value="false"/>
-    <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
-        <listEntry value="/pygitversionhelper/helpers_proxy"/>
-    </listAttribute>
-    <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
-        <listEntry value="2"/>
-    </listAttribute>
-    <stringAttribute key="org.eclipse.debug.ui.ATTR_CONSOLE_ENCODING" value="UTF-8"/>
-    <stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="${workspace_loc:pygitversionhelper/helpers_proxy}"/>
-    <stringAttribute key="org.eclipse.ui.externaltools.ATTR_OTHER_WORKING_DIRECTORY" value=""/>
-    <stringAttribute key="org.eclipse.ui.externaltools.ATTR_TOOL_ARGUMENTS" value="--qualitycheck"/>
-    <stringAttribute key="org.python.pydev.debug.ATTR_INTERPRETER" value="__default"/>
-    <stringAttribute key="org.python.pydev.debug.ATTR_PROJECT" value="pygitversionhelper"/>
-    <stringAttribute key="process_factory_id" value="org.python.pydev.debug.processfactory.PyProcessFactory"/>
-</launchConfiguration>

RUN_types.launch

@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<launchConfiguration type="org.python.pydev.debug.regularLaunchConfigurationType">
-    <booleanAttribute key="org.eclipse.debug.core.ATTR_FORCE_SYSTEM_CONSOLE_ENCODING" value="false"/>
-    <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
-        <listEntry value="/pygitversionhelper/helpers_proxy"/>
-    </listAttribute>
-    <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
-        <listEntry value="2"/>
-    </listAttribute>
-    <stringAttribute key="org.eclipse.debug.ui.ATTR_CONSOLE_ENCODING" value="UTF-8"/>
-    <stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="${workspace_loc:pygitversionhelper/helpers_proxy}"/>
-    <stringAttribute key="org.eclipse.ui.externaltools.ATTR_OTHER_WORKING_DIRECTORY" value=""/>
-    <stringAttribute key="org.eclipse.ui.externaltools.ATTR_TOOL_ARGUMENTS" value="--typecheck"/>
-    <stringAttribute key="org.python.pydev.debug.ATTR_INTERPRETER" value="__default"/>
-    <stringAttribute key="org.python.pydev.debug.ATTR_PROJECT" value="pygitversionhelper"/>
-    <stringAttribute key="process_factory_id" value="org.python.pydev.debug.processfactory.PyProcessFactory"/>
-</launchConfiguration>

RUN_unittest.launch

@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<launchConfiguration type="org.python.pydev.debug.regularLaunchConfigurationType">
-    <booleanAttribute key="org.eclipse.debug.core.ATTR_FORCE_SYSTEM_CONSOLE_ENCODING" value="false"/>
-    <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
-        <listEntry value="/pygitversionhelper/helpers_proxy"/>
-    </listAttribute>
-    <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
-        <listEntry value="2"/>
-    </listAttribute>
-    <stringAttribute key="org.eclipse.debug.ui.ATTR_CONSOLE_ENCODING" value="UTF-8"/>
-    <stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="${workspace_loc:pygitversionhelper/helpers_proxy}"/>
-    <stringAttribute key="org.eclipse.ui.externaltools.ATTR_OTHER_WORKING_DIRECTORY" value=""/>
-    <stringAttribute key="org.eclipse.ui.externaltools.ATTR_TOOL_ARGUMENTS" value="--unittest --coveragecheck"/>
-    <stringAttribute key="org.python.pydev.debug.ATTR_INTERPRETER" value="__default"/>
-    <stringAttribute key="org.python.pydev.debug.ATTR_PROJECT" value="pygitversionhelper"/>
-    <stringAttribute key="process_factory_id" value="org.python.pydev.debug.processfactory.PyProcessFactory"/>
-</launchConfiguration>

docs-static/usage.md

@@ -2,33 +2,28 @@
 
 ## Installation
 
-From pypi repository (prefered):
-```console
-/> python -m pip install pygitversionhelper
-```   
- 
-From downloaded .whl file:
-```console
-/> python -m pip install pygitversionhelper-<VERSION>-py3-none-any.whl
-```  
+From master repository:
 
-From master git repository:
-```console
-/> python -m pip install git+https://chacha.ddns.net/gitea/chacha/pygitversionhelper.git@master
-```
+    python -m pip install git+https://chacha.ddns.net/gitea/chacha/pygitversionhelper.git@master
 
+From local .whl file:
 
+    python -m pip install pygitversionhelper-<VERSION>-py3-none-any.whl
+
+From public repository:
+
+    TBD
 
 ## Import in your project
 
 Add this line on the top of your python script:
-```py
-from pygitversionhelper import gitversionhelper
-```
+
+    #from pygitversionhelper import gitversionhelper
+
 [optionnal] If you need to catch exception from this module:
-```py
-from pygitversionhelper import gitversionhelperException
-```    
+
+    #from pygitversionhelper import gitversionhelperException
+    
 ## Basic API
 
 All the API commands are static so it is not needed to create instantiate any object.
@@ -36,105 +31,98 @@ All the API commands are static so it is not needed to create instantiate any ob
 They are all executed in the current active directory.
 
 One easy way to change directory:
-```py
-import os
-os.chdir("<YOUR DIRECTORY>")
-```
-### sub-lib: repository 
+
+    import os
+    os.chdir("<YOUR DIRECTORY>")
+
+### sublib: repository 
 
 To check if a repository is dirty:
-```py
-if gitversionhelper.repository.isDirty():
-    print("repository is dirty")
-```
-### sub-lib: tag 
+
+    if gitversionhelper.repository.isDirty():
+        print("repository is dirty")
+
+### sublib: tag 
 
 List all tags [default to taggerdate order]:
-```py
-for tag in gitversionhelper.tag.getTags():
-    print(f"found tag: {tag}")
-```    
+
+    for tag in gitversionhelper.tag.getTags():
+        print(f"found tag: {tag}")
+        
 List all tags [using git refname order]:
-```py
-for tag in gitversionhelper.tag.getTags("v:refname"):
-    print(f"found tag: {tag}")
-```
+
+    for tag in gitversionhelper.tag.getTags("v:refname"):
+        print(f"found tag: {tag}")
+
 Get the last tag:
-```py
-print(f"most recent repository tag: {gitversionhelper.tag.getLastTag()}")
-```
+
+    print(f"most recent repository tag: {gitversionhelper.tag.getLastTag()}")
+    
 Get the last tag [only on same branch]:
-```py
-print(f"most recent repository tag: {gitversionhelper.tag.getLastTag(same_branch=True)}")
-```
+
+    print(f"most recent repository tag: {gitversionhelper.tag.getLastTag(same_branch=True)}")
+
 
 Get the distance from HEAD to last tag:
-```py
-print(f"number of commit since last tag: {gitversionhelper.tag.getDistanceFromTag()}")
-```
+
+    print(f"number of commit since last tag: {gitversionhelper.tag.getDistanceFromTag()}")
+
 Get the distance from HEAD to last tag [only on same branch]:
-```py
-print(f"number of commit since last tag: {gitversionhelper.tag.getDistanceFromTag(same_branch=True)}")
-```
-### sub-lib: version 
+
+    print(f"number of commit since last tag: {gitversionhelper.tag.getDistanceFromTag(same_branch=True)}")
+    
+### sublib: version 
 
 Get the last found version in the repository [return MetaVersion object]:
-```py
-print(f"most recent repository version: {gitversionhelper.version.getLastVersion()}")
-```
+
+    print(f"most recent repository version: {gitversionhelper.version.getLastVersion()}")
+    
 Get the last found version in the repository [return formated string]:
-```py
-print(f"most recent repository version: {gitversionhelper.version.getLastVersion(formated_output=True)}")
-```
+
+    print(f"most recent repository version: {gitversionhelper.version.getLastVersion(formated_output=True)}")
+
 Others kwargs available to this function:
 
 * version_std: string to force a version standard for rendering ["PEP440" or "SemVer"]
 * same_branch: boolean to force searching on same branch
 * ignore\_unknown\_tags: boolean to allow unknown tag to be ignored
 
-Get the current version of the repository, automatically bump it if the last commit is not tagged [returns MetaVersion object]:
-```py
-print(f"current repository version: {gitversionhelper.version.getCurrentVersion()}")
-```
+Get the current version of the repository, automatically bump it if the last one is not tagged [returns MetaVersion object]:
+
+    print(f"current repository version: {gitversionhelper.version.getCurrentVersion()}")
+
 Or with formated output:
-```py
-print(f"current repository version: {gitversionhelper.version.getCurrentVersion(formated_output=True)}")
-```
+
+    print(f"current repository version: {gitversionhelper.version.getCurrentVersion(formated_output=True)}")
+    
 Typical usage in CI/CD env:
-```py
-bumped_version = gitversionhelper.version.getCurrentVersion(    formated_output=True,       \
-                                                                version_std="PEP440",       \
-                                                                bump_type="dev",            \
-                                                                bump_dev_strategy="post")
-print(f"current repository version: {bumped_version}")
-```
+    
+    bumped_version = gitversionhelper.version.getCurrentVersion(    formated_output=True,       \
+                                                                    version_std="PEP440",       \
+                                                                    bump_type="dev",            \
+                                                                    bump_dev_strategy="post")
+    print(f"current repository version: {bumped_version}")
+
 kwargs available to this function:
 
 * All same args as getLastVersion()
 * bump_type: if version need to be pump, allow to configure next release update type: __major, minor, patch, dev__
 * bump\_dev\_strategy: if bump\_type is dev, allow to choose dev update strategy: __post, pre-patch, pre-minor, pre-major__
 
-
 A version object can also be manually formated:
-```py
-_version = gitversionhelper.tag.getCurrentVersion()
-```
-Then;
-```py
-_version.doFormatVersion()
-```
-or;
-```py
-gitversionhelper.version.doFormatVersion(_version)
-```
-kwargs available to this function:
 
-- output_format: string to choose a rendering format ["Auto","PEP440" or "SemVer"]
+    _version = gitversionhelper.tag.getCurrentVersion()
+    _version.doFormatVersion()
+    #or
+    gitversionhelper.version.doFormatVersion(_version)
+
+kwargs available to those function:
+    - output_format: string to choose a rendering format ["Auto","PEP440" or "SemVer"]
 
 ## Limitations
 
 There is unfortunately some technical limitation :
 
-* MultiThreading and async behavior is not tested / supported.
+* MultiThreading and async behavior is not tested.
 * Multiple tag on the same commit is not supported.
 * Branch filter when searching for a version is only tested with -no-ff strategy

helpers/.gitignore

@@ -0,0 +1 @@
+/.mypy_cache/

helpers/__init__.py

@@ -0,0 +1,7 @@
+# pyChaChaDummyProject (c) by chacha
+#
+# pyChaChaDummyProject is licensed under a
+# 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 <https://creativecommons.org/licenses/by-nc-sa/4.0/>.

helpers/__main__.py

@@ -0,0 +1,104 @@
+# pyChaChaDummyProject (c) by chacha
+#
+# pyChaChaDummyProject is licensed under a
+# 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 <https://creativecommons.org/licenses/by-nc-sa/4.0/>.
+
+from __future__ import annotations
+from typing import TYPE_CHECKING
+
+from pathlib import Path
+import tomli
+import argparse
+import os
+import logging
+import sys
+
+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:  
+    # 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
+    
+logging.getLogger().setLevel(logging.INFO)
+
+if __name__ == "__main__":
+    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.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
+    
+    helpers = []
+    if  args.typecheck == True:
+        helpers.append(types_check)
+        
+    if  args.unittest == True:
+        helpers.append(unit_test)
+    
+    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:
+        helpers.append(quality_check)
+        
+    if  args.docgen == True:
+        helpers.append(doc_gen)
+    
+    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:
+        helpers.append(changelog_gen)
+    
+    for helper in helpers:
+        helper.set_context(project_rootdir_path,pyproject)
+        helper.reset_result_dir()
+        helper.do_job()
+        

helpers/changelog_gen.py

@@ -0,0 +1,24 @@
+# pyChaChaDummyProject (c) by chacha
+#
+# pyChaChaDummyProject is licensed under a
+# 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 <https://creativecommons.org/licenses/by-nc-sa/4.0/>.
+
+from __future__ import annotations
+from typing import TYPE_CHECKING
+
+#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

helpers/doc_gen.py

@@ -0,0 +1,103 @@
+# pyChaChaDummyProject (c) by chacha
+#
+# pyChaChaDummyProject is licensed under a
+# 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 <https://creativecommons.org/licenses/by-nc-sa/4.0/>.
+
+from __future__ import annotations
+from typing import TYPE_CHECKING
+
+import shutil
+import os
+import sys
+import subprocess
+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:
+    from yaml import Loader, Dumper
+
+from .helper_base import helper_withresults_base
+
+class doc_gen(helper_withresults_base): 
+    enable_gen_pdf: bool = False
+    
+    @classmethod  
+    def do_job(cls): 
+        print(cls.project_rootdir_path)
+        print()
+        
+        # create doc root dir
+        doc_path = cls.project_rootdir_path/"docs"
+        cls._reset_dir(doc_path)
+        
+        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"))
+        
+        # copy files from static-doc dir
+        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") 
+            full_doc_path = Path(reference_path, doc_path)
+
+            parts = list(module_path.parts)
+
+            if parts[-1] == "__init__":
+                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)
+                print("::: " + identifier, file=fd)
+  
+            
+        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 
+        # manually process the configuration file.
+        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',
+                                                    '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)
+        print(res.decode())
+        print(' !! done')
+        

helpers/helper_base.py

@@ -0,0 +1,72 @@
+# pyChaChaDummyProject (c) by chacha
+#
+# pyChaChaDummyProject is licensed under a
+# 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 <https://creativecommons.org/licenses/by-nc-sa/4.0/>.
+
+from __future__ import annotations
+from typing import TYPE_CHECKING
+
+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
+
+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    
+    def get_result_dir(cls):
+        return None
+ 
+    @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    
+    def reset_result_dir(cls):
+        result_dir = cls.get_result_dir()
+        if result_dir != None:
+            cls._reset_dir(result_dir)
+    
+    @classmethod 
+    @abstractmethod
+    def do_job(cls):  
+        raise NotImplementedError()
+
+    @classmethod  
+    def run_cmd_(cls, cmdarray):
+        process = subprocess.run(cmdarray, stdout=subprocess.PIPE, stderr=subprocess.PIPE, shell=True, check=True)
+        return process.stdout
+    
+    @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    
+    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

helpers/quality_check.py

@@ -0,0 +1,221 @@
+# pyChaChaDummyProject (c) by chacha
+#
+# pyChaChaDummyProject is licensed under a
+# 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 <https://creativecommons.org/licenses/by-nc-sa/4.0/>.
+
+from __future__ import annotations
+from typing import TYPE_CHECKING
+
+from contextlib import redirect_stdout
+from io import StringIO
+import re
+import json
+from enum import Enum
+from contextlib import suppress
+import sys
+import pandas
+import csv
+import copy
+
+from pylint.lint import Run as pylint_Run
+import pylint_json2html
+
+from .helper_base import helper_withresults_base
+
+class PyLintMetricNotFound(Warning):
+    pass
+
+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)
+        cls.PylintMessageList = Messagelist
+
+    @staticmethod
+    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):  
+        print("checking code quality ...")
+        cls.GetPylintMessageList()
+        
+        RES_all=dict()
+        with StringIO() as StdOutput:
+            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:
+                # 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
+                
+                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
+                            ScanState = TScanState.JSON_REPORT
+                        elif line=='[]':
+                            JsonContent+=line
+                            ScanState = TScanState.OTHER_REPORT_START
+                            
+                    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))
+                        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 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:
+                        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' ]
+                            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:
+                        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:
+                        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:
+                        # 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'])
+                    else:
+                        raise RuntimeError("Invalid ScanState")
+                Outfile.write(JsonContent)
+                
+        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...  
+        # => 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())
+            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())
+            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())
+            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())
+            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())
+            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:
+            raw_data = json.loads(JsonContent)
+            report=pylint_json2html.Report( raw_data)
+            Outfile.write(report.render())
+                
+        print("Done")

helpers/types_check.py

@@ -0,0 +1,51 @@
+# pyChaChaDummyProject (c) by chacha
+#
+# pyChaChaDummyProject is licensed under a
+# 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 <https://creativecommons.org/licenses/by-nc-sa/4.0/>.
+
+from __future__ import annotations
+from typing import TYPE_CHECKING
+
+from pathlib import Path
+
+from mypy import api
+
+from .helper_base import helper_withresults_base
+
+
+class types_check(helper_withresults_base): 
+    JUnitReportName = "junit.xml"
+    
+    @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
+                                ])
+        
+        if result[0]:
+            print('\nType checking report:\n')
+            print(result[0])  # stdout
+        
+        if result[1]:
+            print('\nError report:\n')
+            print(result[1])  # stderr
+        
+        print('\nExit status:', result[2])
+        print("Done")

helpers/unit_test.py

@@ -0,0 +1,79 @@
+# pyChaChaDummyProject (c) by chacha
+#
+# pyChaChaDummyProject is licensed under a
+# 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 <https://creativecommons.org/licenses/by-nc-sa/4.0/>.
+
+from __future__ import annotations
+from typing import TYPE_CHECKING
+
+from pathlib import Path
+import os
+import datetime
+
+import unittest
+import xmlrunner
+from junitparser import JUnitXml
+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
+    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:
+            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")
+            cls._reset_dir(CoverageReportPath)
+            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"))
+        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)
+
+        print("Test Finished")
+        if cls.enable_coverage_check == True:
+            cov.stop()
+            cov.save()
+            cov.html_report(directory=str(CoverageReportPath))
+            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")
+            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))
+                
+            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')
+            html = report.html()
+            with open(FullReportPath/ f'{full_report_base_name}.html', "wb") as outfile:
+                outfile.write(html.encode('utf-8'))
+            print("Done")

helpers_proxy/__main__.py

@@ -1,5 +0,0 @@
-from chacha_cicd_helper.__main__ import fct_main
-import sys
-
-if __name__ == "__main__":
-    fct_main(sys.argv[1:])

mkdocs.yml

@@ -1,11 +1,19 @@
+# pyChaChaDummyProject (c) by chacha
+#
+# pyChaChaDummyProject is licensed under a
+# 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 <https://creativecommons.org/licenses/by-nc-sa/4.0/>.
+
+
 docs_dir: docs
 site_name: pygitversionhelper
 site_url: https://chacha.ddns.net/mkdocs-web/chacha/pygitversionhelper/latest/
-site_description: A simple simple git version helper in python.
-site_author: prune
+site_description: pygitversionhelper
+site_author: chacha
 repo_url: https://chacha.ddns.net/gitea/chacha/pygitversionhelper
 use_directory_urls: false
-copyright: CC BY-NC-SA 4.0
 theme:
   name: material
   features:
@@ -13,13 +21,8 @@ theme:
   - navigation.tracking
   - navigation.tabs
   - navigation.tabs.sticky
-  - navigation.footer
-  - navigation.path
+  - toc.integrate
   - navigation.top
-  - navigation.section
-  - content.code.annotate
-  - navigation.expand
-  - toc.follow
   palette:
   - media: '(prefers-color-scheme: dark)'
     scheme: slate
@@ -37,85 +40,23 @@ theme:
       name: Switch to dark mode
 plugins:
 - search
-- markdownextradata
-- mermaid2
 - localsearch
+- autorefs
 - mkdocstrings:
     default_handler: python
     handlers:
       python:
-        path:
-        - src
-        options:
+        selection:
           filters:
-          - '!^_[^_]'
-          inherited_members: false
+          - '!^_(?!_init__)'
+          inherited_members: true
+        rendering:
+          show_root_heading: false
+          show_root_toc_entry: false
+          show_root_full_path: false
           show_if_no_docstring: true
           show_signature_annotations: true
           show_source: false
-          show_category_heading: true
-          group_by_category: true
-          show_root_full_path: false
-          merge_init_into_class: true
-          separate_signature: true
           heading_level: 2
-          docstring_section_style: spacy
-          show_root_toc_entry: false
-- with-pdf:
-    cover_subtitle: User Manual
-    cover_logo: C:\Users\chacha\git\pygitversionhelper\docs-static\Library.jpg
-    verbose: false
-    exclude_pages:
-    - LICENSE
-    output_path: C:\Users\chacha\git\pygitversionhelper\helpers-results\cl_doc_gen\site\pdf\manual.pdf
-markdown_extensions:
-- def_list
-- tables
-- attr_list
-- abbr
-- pymdownx.blocks.admonition:
-    types:
-    - new
-    - settings
-    - note
-    - abstract
-    - info
-    - tip
-    - success
-    - question
-    - warning
-    - failure
-    - danger
-    - bug
-    - example
-    - quote
-- pymdownx.blocks.definition
-- pymdownx.blocks.details
-- pymdownx.blocks.tab
-- pymdownx.blocks.html
-- pymdownx.betterem:
-    smart_enable: all
-- pymdownx.caret
-- pymdownx.critic
-- pymdownx.details
-- pymdownx.inlinehilite
-- pymdownx.snippets
-- pymdownx.highlight:
-    anchor_linenums: true
-    line_spans: __span
-    pygments_lang_class: true
-- pymdownx.keys
-- pymdownx.mark
-- pymdownx.progressbar
-- pymdownx.smartsymbols
-- pymdownx.tasklist:
-    custom_checkbox: true
-- pymdownx.tilde
-- footnotes
-- pymdownx.superfences
-- pymdownx.emoji:
-    emoji_index: !!python/name:materialx.emoji.twemoji ''
-    emoji_generator: !!python/name:materialx.emoji.to_svg ''
-extra:
-  branch: master
-  repository: pygitversionhelper
+          group_by_category: true
+          show_category_heading: true

pyproject.toml

@@ -7,15 +7,17 @@
 # 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"
-description = "A simple simple git version helper in python."
+description = "pygitversionhelper"
 readme = "README.md"
 requires-python = ">=3.9"
 keywords = ["chacha","chacha","template","pygitversionhelper"]
@@ -46,35 +48,20 @@ include-package-data = true
 where = ["src"]
 
 [tool.setuptools.package-data]
-"pysimpleini" = ["py.typed"]
-
-# [[tool.mypy.overrides]]
-# module = ""
-# ignore_missing_imports = true
-
-[tool.coverage.run]
-cover_pylib = false
-branch = true
-data_file="helpers-results/cl_unit_test_raw_coverage/.coverage"
-# debug = ["config","multiproc","process"]
-parallel = true
-concurrency = [
-    'thread'
-]
+"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]
-test              = ["chacha_cicd_helper"]
-coverage-check    = ["chacha_cicd_helper"]
-complexity-check  = ["chacha_cicd_helper"]
-quality-check     = ["chacha_cicd_helper"]
-type-check        = ["chacha_cicd_helper"]
-doc-gen           = ["chacha_cicd_helper"]
+test              = ["junitparser>=2.8","junit2html>=30.1","xmlrunner>=1.7","mypy>=0.99" ]
+coverage-check    = ["coverage>=7.0"]
+quality-check     = ["pylint>=2.15","pylint-json2html>=0.4","pandas>=1.5"]
+type-check        = ["mypy[reports]>=0.99" ]
+doc-gen           = ["mkdocs>=1.4.0", "mkdocs-material>=8.5", "mkdocs-localsearch>=0.9.0", "mkdocstrings[python]>=0.19", "mkdocs-with-pdf>=0.9.3","pyyaml>=6.0"]
 
-# [project.scripts]
-# my-script = "my_package.module:function"
+#[project.scripts]
+#my-script = "my_package.module:function"
 

src/pygitversionhelper/__init__.py

@@ -14,9 +14,8 @@ from importlib.metadata import version, PackageNotFoundError
 
 try:  # pragma: no cover
     __version__ = version("pygitversionhelper")
-except PackageNotFoundError:  # pragma: no cover
+except PackageNotFoundError: # pragma: no cover
     import warnings
-
     warnings.warn("can not read __version__, assuming local test context, setting it to ?.?.?")
     __version__ = "?.?.?"
 

src/pygitversionhelper/py.typed

@@ -1 +0,0 @@
-# PlaceHolder

test/__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 <https://creativecommons.org/licenses/by-nc-sa/4.0/>.
+# work.  If not, see <https://creativecommons.org/licenses/by-nc-sa/4.0/>.