From a564e042190def9628eb89af51657c641c322658 Mon Sep 17 00:00:00 2001 From: cclecle Date: Sun, 19 Mar 2023 22:03:09 +0000 Subject: [PATCH 1/6] fix: remove setuptools-git-versioning stuff --- pyproject.toml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index ccbcdfe..5b70992 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -7,15 +7,9 @@ # work. If not, see . [build-system] -#requires = ["setuptools>=63", "wheel", "setuptools-git-versioning<2"] requires = ["setuptools>=63", "wheel", "setuptools_scm"] build-backend = "setuptools.build_meta" -#[tool.setuptools-git-versioning] -#enabled = true -#dev_template = "{tag}.post{ccount}" -#tag_filter = "^\\d+\\.\\d+\\.\\d+$" - [tool.setuptools_scm] version_scheme= "post-release" -- 2.47.3 From ab1a69b8f8711d408d31a55647c8e8935cd8efce Mon Sep 17 00:00:00 2001 From: cclecle Date: Sun, 19 Mar 2023 22:08:22 +0000 Subject: [PATCH 2/6] cleaning jenkins file updating documentation in toml --- Jenkinsfile | 38 +------------------------------------- pyproject.toml | 4 ++-- 2 files changed, 3 insertions(+), 39 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index f5c912c..161d547 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -152,26 +152,6 @@ pipeline { 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") } - - // 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()) { @@ -203,23 +183,7 @@ 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__' diff --git a/pyproject.toml b/pyproject.toml index 5b70992..a88db09 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -49,8 +49,8 @@ where = ["src"] "pygitversionhelper.data" = ["*.*"] [project.urls] -Homepage = "https://chacha.ddns.net/gitea/chacha/pygitversionhelper" -Documentation = "https://chacha.ddns.net/gitea/chacha/pygitversionhelper/wiki" +Homepage = "https://chacha.ddns.net/gitea/chacha/pygitversionhelper/" +Documentation = "https://chacha.ddns.net/mkdocs-web/chacha/pygitversionhelper/master/latest/" Tracker = "https://chacha.ddns.net/gitea/chacha/pygitversionhelper/issues" [project.optional-dependencies] -- 2.47.3 From 8b2b0ca07f60325834058b29d44c5c030ab9dac3 Mon Sep 17 00:00:00 2001 From: cclecle Date: Sun, 19 Mar 2023 22:31:15 +0000 Subject: [PATCH 3/6] update jenkinsfile --- Jenkinsfile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Jenkinsfile b/Jenkinsfile index 161d547..517bac1 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -6,6 +6,8 @@ // You should have received a copy of the license along with this // work. If not, see . + + // configurable settings: // use to send email if workflow problem def _MaintainerName = "CHACHA" -- 2.47.3 From d5e003c86c06a471820216d7fa6395614ec883db Mon Sep 17 00:00:00 2001 From: cclecle Date: Sun, 19 Mar 2023 22:40:38 +0000 Subject: [PATCH 4/6] update Jenkinsfile --- Jenkinsfile | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 517bac1..8683d0f 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -19,7 +19,7 @@ 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 = false //Not supported yet +def _bAutoChangelog = true //Not supported yet def _ReleaseContent_Title = "_CI/CD Automatic Release_" // full rebuild toogle def _bFullRebuilt = true @@ -440,13 +440,15 @@ pipeline { |. ~/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 + |from pygitversionhelper import gitversionhelper + | |from urllib.parse import urljoin | |class GiteaRepoCommits(Resource): -- 2.47.3 From 3751ef1c93be45f3c547c3e99c155aa50e8c8173 Mon Sep 17 00:00:00 2001 From: cclecle Date: Sun, 19 Mar 2023 22:55:23 +0000 Subject: [PATCH 5/6] test --- Jenkinsfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Jenkinsfile b/Jenkinsfile index 8683d0f..ae0d851 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -431,6 +431,7 @@ pipeline { environment { def GITEA_LOGIN_TOKEN=credentials("GiteaCHACHAPush") } + steps { dir("gitrepo") { script { -- 2.47.3 From f361a5189ae5c9fb4f2a8c1f0de267cc41e62d90 Mon Sep 17 00:00:00 2001 From: cclecle Date: Sun, 19 Mar 2023 23:09:25 +0000 Subject: [PATCH 6/6] test doc --- Jenkinsfile | 1 - 1 file changed, 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index ae0d851..8683d0f 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -431,7 +431,6 @@ pipeline { environment { def GITEA_LOGIN_TOKEN=credentials("GiteaCHACHAPush") } - steps { dir("gitrepo") { script { -- 2.47.3