fix(ci): use bump-my-version and fix release CI

Author: dshemetov

.github/workflows/create-release.yml

@@ -4,7 +4,7 @@ on:
   workflow_dispatch:
     inputs:
       versionName:
-        description: 'Semantic Version Number (i.e., 5.5.0 or patch, minor, major, prepatch, preminor, premajor, prerelease)'
+        description: 'Semantic Version Number (i.e., 5.5.0 or patch, minor, major)'
         required: true
         default: patch
 
@@ -28,9 +28,20 @@ jobs:
       - name: Change version number
         id: version
         run: |
-          python -m pip install bump2version
-          echo -n "::set-output name=next_tag::"
-          bump2version --list ${{ github.event.inputs.versionName }} | grep new_version | sed -r s,"^.*=",,
+          python -m pip install bump-my-version
+          echo -n "next_tag=" >> $GITHUB_OUTPUT
+          allowed_pattern="^(major|minor|patch|[0-9]+\.[0-9]+\.[0-9]+)$"
+
+          if [[ ! ${{ github.event.inputs.versionName }} =~ $allowed_pattern ]]; then
+            echo "Invalid version name:${{ github.event.inputs.versionName }}"
+            exit 1
+          fi
+
+          if [[ ${{ github.event.inputs.versionName }} =~ ^[0-9]+\.[0-9]+\.[0-9]+$ ]]; then
+            echo "next_tag=${{ github.event.inputs.versionName }}" >> $GITHUB_OUTPUT
+          else
+            echo "next_tag=$(bump-my-version show-bump | grep${{ github.event.inputs.versionName }} | sed -r s,"^.*─ ",,)" >> $GITHUB_OUTPUT
+          fi
       - name: Get main branch SHA
         id: base-sha
         run: echo "sha=$(git rev-parse origin/main)" >> $GITHUB_OUTPUT
@@ -46,7 +57,7 @@ jobs:
         if: steps.changed-py.outputs.any_changed == 'true'
         run: |
           cd src/client/packaging/pypi
-          bump2version --allow-dirty --new-version ${{ steps.version.outputs.next_tag }} ignore_part
+          bump-my-version --allow-dirty --new-version ${{ steps.version.outputs.next_tag }}
       - name: Create pull request into prod
         uses: peter-evans/create-pull-request@v3
         with:

requirements.dev.txt

@@ -1,6 +1,5 @@
 aiohttp==3.9.4
 black>=20.8b1
-bump2version==1.0.1
 covidcast==0.1.5
 delphi_utils
 docker==6.0.1

src/client/packaging/pypi/.bumpversion.cfg

@@ -42,3 +42,27 @@ dependencies = ["aiohttp", "delphi-utils", "requests>=2.7.0", "tenacity"]
 [project.urls]
 "Homepage" = "https://github.com/cmu-delphi/delphi-epidata"
 "Changelog" = "https://github.com/cmu-delphi/delphi-epidata/blob/main/src/client/packaging/pypi/CHANGELOG.md"
+
+[tool.bumpversion]
+current_version = "4.1.23"
+parse = "(?P<major>\\d+)\\.(?P<minor>\\d+)\\.(?P<patch>\\d+)"
+serialize = ["{major}.{minor}.{patch}"]
+search = "{current_version}"
+replace = "{new_version}"
+regex = false
+ignore_missing_version = false
+ignore_missing_files = false
+tag = false
+sign_tags = false
+tag_name = "v{new_version}"
+tag_message = "Bump version: {current_version} → {new_version}"
+allow_dirty = false
+commit = false
+message = "Bump version: {current_version} → {new_version}"
+commit_args = ""
+
+[[tool.bumpversion.files]]
+filename = "../../delphi_epidata.py"
+
+[[tool.bumpversion.files]]
+filename = "pyproject.toml"