Single commit

rzats · rzats · commit 0e9500f7da8c · 2024-06-25T16:35:14.000+03:00
diff --git a/.bumpversion.cfg b/.bumpversion.cfg
@@ -9,10 +9,6 @@ tag = False
 
 [bumpversion:file:src/client/delphi_epidata.R]
 
-[bumpversion:file:src/client/delphi_epidata.py]
-
 [bumpversion:file:src/client/packaging/npm/package.json]
 
-[bumpversion:file:src/client/packaging/pypi/pyproject.toml]
-
 [bumpversion:file:dev/local/setup.cfg]
diff --git a/.github/workflows/create-release.yml b/.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
 
@@ -27,19 +27,48 @@ jobs:
           python-version: 3.8
       - name: Change version number
         id: version
+        # See this issue for explanation and testing:
+        # https://github.com/cmu-delphi/delphi-epidata/pull/1473
         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,"^.*=",,
-      - name: Create pull request into prod
+          if [[ ${{ github.event.inputs.versionName }} =~ ^[0-9]+\.[0-9]+\.[0-9]+$ ]]; then
+            # use given version number
+            NEXT_TAG="${{ github.event.inputs.versionName }}"
+          elif [[ ${{ github.event.inputs.versionName }} =~ ^(major|minor|patch)$ ]]; then
+            # calculate new version number based on given tag
+            NEXT_TAG=$(bump2version --dry-run --list ${{ github.event.inputs.versionName }} | grep ^new_version | sed -r s,"^.*=",,)
+          else
+            echo "\nInvalid version name: ${{ github.event.inputs.versionName }}"
+            exit 1
+          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 Python client file changes
+        id: changed-py
+        uses: dorny/paths-filter@v3
+        with:
+            base: "main"
+            ref: "dev"
+            filters: |
+              python_client_changed:
+                - src/client/delphi_epidata.py
+                - src/client/packaging/pypi/**
+      - name: Bump Python versions if client files changed
+        if: steps.changed-py.outputs.python_client_changed == 'true'
+        # _ignored_arg_ below is required because of tool quirk
+        # https://github.com/c4urself/bump2version/issues/22
+        run: |
+          cd src/client/packaging/pypi
+          # this is using the new literal version number (steps.version.outputs.next_tag) output from the bump2version step above, not the workflow input (github.event.inputs.versionName) which can be relative
+          bump2version --allow-dirty --new-version ${{ steps.version.outputs.next_tag }} _ignored_arg_
+      - name: Create pull request into main
         uses: peter-evans/create-pull-request@v3
         with:
           branch: release/delphi-epidata-${{ steps.version.outputs.next_tag }}
           commit-message: 'chore: release delphi-epidata ${{ steps.version.outputs.next_tag }}'
           base: main
           title: Release Delphi Epidata ${{ steps.version.outputs.next_tag }}
-          labels: chore
-          reviewers: melange396
-          assignees: melange396
           body: |
             Releasing Delphi Epidata ${{ steps.version.outputs.next_tag }}.
diff --git a/.github/workflows/release-helper.yml b/.github/workflows/release-helper.yml
@@ -10,79 +10,46 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: fail on fork
-        if: github.repository_owner != 'cmu-delphi'
+        if: github.repository_owner == 'cmu-delphi'
         run: exit 1
 
-  create_release:
+  client_changed:
     needs: correct_repository
     runs-on: ubuntu-latest
     steps:
       - name: Check out code
         uses: actions/checkout@v2
         with:
-          ssh-key: ${{ secrets.CMU_DELPHI_DEPLOY_MACHINE_SSH }}
-      - name: Set up Python 3.8
-        uses: actions/setup-python@v2
-        with:
-          python-version: 3.8
-      - name: Extract version
-        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,"^.*=",,
-      - name: Create Release
-        id: create_release
-        uses: release-drafter/release-drafter@v5
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          fetch-depth: 2
+      - name: Get Python client file changes
+        id: changed-py
+        uses: dorny/paths-filter@v3
         with:
-          version: ${{ steps.extract_version.outputs.version }}
-          publish: true
+          # when base and ref are the same, changes are detected against the most recent commit before the push.
+          # see https://github.com/dorny/paths-filter#usage for details.
+          base: 'main'
+          ref: 'main'
+          filters: |
+            python_client_changed:
+              - src/client/delphi_epidata.py
+              - src/client/packaging/pypi/**
     outputs:
-      version: ${{ steps.extract_version.outputs.version }}
-      upload_url: ${{ steps.create_release.outputs.upload_url }}
-      tag_name: ${{ steps.create_release.outputs.tag_name }}
+      python_client_changed: ${{ steps.changed-py.outputs.python_client_changed }}
+
+  create_release:
+    needs: correct_repository
+    runs-on: ubuntu-latest
+    steps:
+      - name: Check out code
+        uses: actions/checkout@v2
 
   release_python_client:
-    needs: create_release
+    needs: [client_changed, create_release]
+    if: needs.client_changed.outputs.python_client_changed == 'true'
     runs-on: ubuntu-latest
     steps:
       - name: Check out code
         uses: actions/checkout@v2
-      - name: Set up Python 3.8
-        uses: actions/setup-python@v2
-        with:
-          python-version: 3.8
-      - name: Install build dependencies
-        run: |
-          python -m pip install --upgrade pip
-          pip install build wheel twine
-      - name: Prepare package
-        run: |
-          cp src/client/*.py src/client/packaging/pypi/delphi_epidata/
-      - name: Create release
-        working-directory: src/client/packaging/pypi
-        run: |
-          python -m build --sdist --wheel
-      - uses: actions/upload-artifact@v2
-        with:
-          name: delphi_epidata_py
-          path: src/client/packaging/pypi/dist/*.tar.gz
-      - name: Upload Release Asset
-        uses: AButler/upload-release-assets@v2.0
-        with:
-          files: "src/client/packaging/pypi/dist/*.tar.gz"
-          repo-token: ${{ secrets.GITHUB_TOKEN }}
-          release-tag: ${{ needs.create_release.outputs.tag_name }}
-      - name: Publish a Python distribution to PyPI
-        uses: pypa/gh-action-pypi-publish@release/v1
-        with:
-          user: __token__
-          password: ${{ secrets.DELPHI_PYPI_PROD_TOKEN }}
-          packages-dir: src/client/packaging/pypi/dist/
-          skip-existing: true
-          # repository_url: https://test.pypi.org/legacy/
 
   release_js_client:
     needs: create_release
@@ -93,38 +60,6 @@ jobs:
     steps:
       - name: Check out code
         uses: actions/checkout@v2
-      - uses: actions/setup-node@v2
-        with:
-          node-version: '16.x'
-      - name: Cache Node.js modules
-        uses: actions/cache@v2
-        with:
-          path: ~/.npm # npm cache files are stored in `~/.npm` on Linux/macOS
-          key: ${{ runner.OS }}-node2-${{ hashFiles('**/package-lock.json') }}
-          restore-keys: |
-            ${{ runner.OS }}-node2-
-      - run: npm ci
-      - run: npm test
-      - run: npm pack
-      - name: Rename to a different name
-        run: for f in *.tgz; do mv "$f" "$(echo "$f" | sed s/delphi_epidata-/delphi_epidata_js-/)"; done
-      - uses: actions/upload-artifact@v2
-        with:
-          name: delphi_epidata_js
-          path: src/client/packaging/npm/*.tgz
-      - name: Upload Release Asset
-        uses: AButler/upload-release-assets@v2.0
-        with:
-          files: "src/client/packaging/npm/*.tgz"
-          repo-token: ${{ secrets.GITHUB_TOKEN }}
-          release-tag: ${{ needs.create_release.outputs.tag_name }}
-      - name: Publish to NPM
-        uses: JS-DevTools/npm-publish@v1
-        with:
-          token: ${{ secrets.DELPHI_NPM_TOKEN }}
-          package: src/client/packaging/npm/package.json
-          access: public
-          check-version: true
 
   sync_dev:
     needs: correct_repository
@@ -146,8 +81,5 @@ jobs:
           commit-message: "chore: sync main-dev"
           base: dev
           title: "chore: sync main->dev"
-          labels: chore
-          reviewers: melange396
-          assignees: melange396
           body: |
             Syncing Main->Dev.
diff --git a/requirements.dev.txt b/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
diff --git a/src/client/packaging/pypi/.bumpversion.cfg b/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]
