From 6cb46d2366f0e9d0fff34180e2f6bde396a17615 Mon Sep 17 00:00:00 2001 From: Evan Sosenko Date: Sun, 12 Jun 2022 10:33:37 -0700 Subject: [PATCH 1/3] Allow release in version number --- .github/workflows/version.yml | 9 +++++++-- setup.cfg | 9 +++++++++ 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/.github/workflows/version.yml b/.github/workflows/version.yml index 6e3ffa1..342cc20 100644 --- a/.github/workflows/version.yml +++ b/.github/workflows/version.yml @@ -48,7 +48,12 @@ jobs: run: make test - name: Build run: make build - - name: Cut version + - name: Cut ${{ github.event.inputs.version }}${{ github.event.client_payload.version }} version run: | - poetry run bump2version --sign-tags ${{ github.event.inputs.version }}${{ github.event.client_payload.version }} + version="${{ github.event.inputs.version }}${{ github.event.client_payload.version }}" + if [[ "${version}" =~ [0-9] ]]; then + poetry run bump2version --sign-tags --new-version $version major + else + poetry run bump2version --sign-tags $version + fi git push && git push --tags diff --git a/setup.cfg b/setup.cfg index 23e657e..2f556e5 100644 --- a/setup.cfg +++ b/setup.cfg @@ -3,6 +3,15 @@ commit = True tag = True message = {new_version} current_version = 3.17.0 +parse = (?P\d+)\.(?P\d+)\.(?P\d+)((?P[a-z]+)(?P\d+))? +serialize = + {major}.{minor}.{patch}{release}{n} + {major}.{minor}.{patch} + +[bumpversion:part:release] +values = + b + rc [bumpversion:file:pyproject.toml] search = version = "{current_version}" From e8bfd69e385790e6dab5f6ca54e6af67f5b1eadd Mon Sep 17 00:00:00 2001 From: Evan Sosenko Date: Sun, 12 Jun 2022 17:57:54 +0000 Subject: [PATCH 2/3] 3.18.0rc0 --- pyproject.toml | 2 +- setup.cfg | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 5b672d3..666ddcb 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "makenew-pypackage" -version = "3.17.0" +version = "3.18.0rc0" description = "Package skeleton for a Python module." authors = ["Evan Sosenko "] license = "MIT" diff --git a/setup.cfg b/setup.cfg index 2f556e5..e60e6dc 100644 --- a/setup.cfg +++ b/setup.cfg @@ -2,7 +2,7 @@ commit = True tag = True message = {new_version} -current_version = 3.17.0 +current_version = 3.18.0rc0 parse = (?P\d+)\.(?P\d+)\.(?P\d+)((?P[a-z]+)(?P\d+))? serialize = {major}.{minor}.{patch}{release}{n} From e046d2ba7e7d7ea27d097ef7186c4fa9b536f1f1 Mon Sep 17 00:00:00 2001 From: Evan Sosenko Date: Sun, 12 Jun 2022 18:01:39 +0000 Subject: [PATCH 3/3] 3.18.0 --- pyproject.toml | 2 +- setup.cfg | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 666ddcb..a626d77 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "makenew-pypackage" -version = "3.18.0rc0" +version = "3.18.0" description = "Package skeleton for a Python module." authors = ["Evan Sosenko "] license = "MIT" diff --git a/setup.cfg b/setup.cfg index e60e6dc..fc54307 100644 --- a/setup.cfg +++ b/setup.cfg @@ -2,7 +2,7 @@ commit = True tag = True message = {new_version} -current_version = 3.18.0rc0 +current_version = 3.18.0 parse = (?P\d+)\.(?P\d+)\.(?P\d+)((?P[a-z]+)(?P\d+))? serialize = {major}.{minor}.{patch}{release}{n}