fix(ci): use bump2version and validate

* add comments
* revert bumpversion configs

Co-authored-by: george <[email protected]>

Author: dshemetov

.github/workflows/create-release.yml

@@ -30,8 +30,7 @@ jobs:
         # See this issue for explanation and testing:
         # https://github.com/cmu-delphi/delphi-epidata/pull/1473
         run: |
-          python -m pip install bump-my-version
-          echo -n "next_tag=" >> $GITHUB_OUTPUT
+          python -m pip install bump2version
           allowed_pattern="^(major|minor|patch|[0-9]+\.[0-9]+\.[0-9]+)$"
 
           if [[ ! ${{ github.event.inputs.versionName }} =~ $allowed_pattern ]]; then
@@ -40,10 +39,16 @@ jobs:
           fi
 
           if [[ ${{ github.event.inputs.versionName }} =~ ^[0-9]+\.[0-9]+\.[0-9]+$ ]]; then
-            echo "${{ github.event.inputs.versionName }}"
+            # use given version number
+            NEXT_TAG="${{ github.event.inputs.versionName }}"
           else
-            echo $(bump-my-version show-bump | grep ${{ github.event.inputs.versionName }} | sed -r s,"^.*─ ",,)
+            # calculate new version number based on given tag
+            NEXT_TAG=$(bump2version --dry-run --list ${{ github.event.inputs.versionName }} | grep ^new_version | sed -r s,"^.*=",,)
           fi
+          # apply given or calculated version number
+          bump2version --new-version $NEXT_TAG _ignored_arg_
+          # save version number for later
+          echo "next_tag=$NEXT_TAG" >> $GITHUB_OUTPUT
       - name: Get main branch SHA
         id: base-sha
         run: echo "sha=$(git rev-parse origin/main)" >> $GITHUB_OUTPUT
@@ -57,9 +62,11 @@ jobs:
               src/client/packaging/pypi/**
       - name: Bump Python versions if client files changed
         if: steps.changed-py.outputs.any_changed == 'true'
+        # _ignored_arg_ below is required because of tool quirk
+        # https://github.com/c4urself/bump2version/issues/22
         run: |
           cd src/client/packaging/pypi
-          bump-my-version --allow-dirty --new-version ${{ steps.version.outputs.next_tag }}
+          bump2version --allow-dirty --new-version ${{ steps.version.outputs.next_tag }} _ignored_arg_
       - name: Create pull request into prod
         uses: peter-evans/create-pull-request@v3
         with:

.github/workflows/release-helper.yml

@@ -25,9 +25,9 @@ jobs:
         id: changed-py
         uses: tj-actions/changed-files@v44
         with:
-            files: |
-              src/client/delphi_epidata.py
-              src/client/packaging/pypi/**
+          files: |
+            src/client/delphi_epidata.py
+            src/client/packaging/pypi/**
     outputs:
       any_changed: ${{ steps.changed-py.outputs.any_changed }}
 
@@ -47,8 +47,8 @@ jobs:
         id: extract_version
         run: |
           python -m pip install bump2version
-          echo -n "::set-output name=version::"
-          bump2version --dry-run --list patch | grep ^current_version | sed -r s,"^.*=",,
+          VERSION=$(bump2version --dry-run --list patch | grep ^current_version | sed -r s,"^.*=",,)
+          echo "version=$VERSION" >> $GITHUB_OUTPUT
       - name: Create Release
         id: create_release
         uses: release-drafter/release-drafter@v5
@@ -114,7 +114,7 @@ jobs:
         uses: actions/checkout@v2
       - uses: actions/setup-node@v2
         with:
-          node-version: '16.x'
+          node-version: "16.x"
       - name: Cache Node.js modules
         uses: actions/cache@v2
         with:

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

@@ -0,0 +1,8 @@
+[bumpversion]
+current_version = 4.1.23
+commit = False
+tag = False
+
+[bumpversion:file:../../delphi_epidata.py]
+
+[bumpversion:file:pyproject.toml]

src/client/packaging/pypi/pyproject.toml

@@ -42,27 +42,3 @@ 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"