Add GitHub workflows for automated and manual PyPI publishing; update user-agent test to use regex matcher

Author: Sam

.github/workflows/manual-release.yml

@@ -1,9 +1,8 @@
 name: Publish to PyPI
 
 on:
-  push:
-    branches:
-      - main
+  release:
+    types: [published]
 
 permissions:
   contents: write
@@ -15,8 +14,7 @@ jobs:
       - name: Checkout code
         uses: actions/checkout@v4
         with:
-          fetch-depth: 0
-          token: ${{ secrets.GITHUB_TOKEN }}
+          ref: ${{ github.event.release.tag_name }}
 
       - name: Set up Python
         uses: actions/setup-python@v5
@@ -32,62 +30,25 @@ jobs:
       - name: Run tests
         run: python -m unittest discover -s tests -v
 
-      - name: Configure git
+      - name: Verify version matches tag
         run: |
-          git config user.name "github-actions[bot]"
-          git config user.email "github-actions[bot]@users.noreply.github.com"
+          TAG="${{ github.event.release.tag_name }}"
+          # Remove 'v' prefix if present
+          TAG_VERSION="${TAG#v}"
 
-      - name: Get current version
-        id: get_version
-        run: |
-          VERSION=$(python -c "import re; content=open('setup.py').read(); print(re.search(r\"version='([^']+)'\", content).group(1))")
-          echo "current_version=$VERSION" >> $GITHUB_OUTPUT
-
-      - name: Bump version
-        id: bump_version
-        run: |
-          CURRENT_VERSION="${{ steps.get_version.outputs.current_version }}"
-
-          # Extract version parts (handles versions like 0.1.4-beta)
-          BASE_VERSION=$(echo "$CURRENT_VERSION" | sed -E 's/(-[a-zA-Z0-9]+)?$//')
-          SUFFIX=$(echo "$CURRENT_VERSION" | grep -oE '\-[a-zA-Z0-9]+$' || echo "")
-
-          # Split into major.minor.patch
-          IFS='.' read -r MAJOR MINOR PATCH <<< "$BASE_VERSION"
-
-          # Bump patch version
-          NEW_PATCH=$((PATCH + 1))
-          NEW_VERSION="${MAJOR}.${MINOR}.${NEW_PATCH}${SUFFIX}"
-
-          echo "new_version=$NEW_VERSION" >> $GITHUB_OUTPUT
-          echo "Bumping version from $CURRENT_VERSION to $NEW_VERSION"
-
-      - name: Update version in files
-        run: |
-          NEW_VERSION="${{ steps.bump_version.outputs.new_version }}"
-
-          # Update setup.py
-          sed -i "s/version='[^']*'/version='$NEW_VERSION'/" setup.py
-
-          # Update __init__.py
-          sed -i "s/__version__ = '[^']*'/__version__ = '$NEW_VERSION'/" ujeebu_python/__init__.py
-
-          # Show changes
-          echo "Updated version to $NEW_VERSION"
-          git diff
+          # Get version from setup.py
+          SETUP_VERSION=$(python -c "import re; content=open('setup.py').read(); print(re.search(r\"version='([^']+)'\", content).group(1))")
 
-      - name: Commit version bump
-        run: |
-          NEW_VERSION="${{ steps.bump_version.outputs.new_version }}"
-          git add setup.py ujeebu_python/__init__.py
-          git commit -m "Bump version to $NEW_VERSION [skip ci]"
-          git push
+          if [ "$TAG_VERSION" != "$SETUP_VERSION" ]; then
+            echo "❌ Version mismatch!"
+            echo "   Tag version: $TAG_VERSION"
+            echo "   setup.py version: $SETUP_VERSION"
+            echo ""
+            echo "Please update the version in setup.py and ujeebu_python/__init__.py before releasing."
+            exit 1
+          fi
 
-      - name: Create and push tag
-        run: |
-          NEW_VERSION="${{ steps.bump_version.outputs.new_version }}"
-          git tag -a "v$NEW_VERSION" -m "Release v$NEW_VERSION"
-          git push origin "v$NEW_VERSION"
+          echo "✅ Version matches: $TAG_VERSION"
 
       - name: Build package
         run: python -m build
@@ -98,24 +59,10 @@ jobs:
           TWINE_PASSWORD: ${{ secrets.PYPI_API_TOKEN }}
         run: twine upload dist/*
 
-      - name: Create GitHub Release
+      - name: Upload release assets
         uses: softprops/action-gh-release@v1
         with:
-          tag_name: v${{ steps.bump_version.outputs.new_version }}
-          name: Release v${{ steps.bump_version.outputs.new_version }}
-          body: |
-            ## Release v${{ steps.bump_version.outputs.new_version }}
-
-            This release was automatically generated.
-
-            ### Installation
-            ```bash
-            pip install ujeebu_python==${{ steps.bump_version.outputs.new_version }}
-            ```
-          draft: false
-          prerelease: ${{ contains(steps.bump_version.outputs.new_version, 'beta') || contains(steps.bump_version.outputs.new_version, 'alpha') }}
-          files: |
-            dist/*
+          files: dist/*
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 

.github/workflows/publish.yml

@@ -85,3 +85,16 @@ dist: clean ## builds source and wheel package
 
 install: clean ## install the package to the active Python's site-packages
 	python3 setup.py install
+
+bump-patch: ## bump patch version (0.0.X)
+	bump2version patch --allow-dirty
+
+bump-minor: ## bump minor version (0.X.0)
+	bump2version minor --allow-dirty
+
+bump-major: ## bump major version (X.0.0)
+	bump2version major --allow-dirty
+
+version: ## show current version
+	@grep -m1 "current_version" setup.cfg | cut -d'=' -f2 | tr -d ' '
+

Makefile

@@ -1,7 +1,11 @@
 [bumpversion]
 current_version = 0.1.4-beta
 commit = True
-tag = True
+tag = False
+parse = (?P<major>\d+)\.(?P<minor>\d+)\.(?P<patch>\d+)(-(?P<release>.+))?
+serialize =
+	{major}.{minor}.{patch}-{release}
+	{major}.{minor}.{patch}
 
 [bumpversion:file:setup.py]
 search = version='{current_version}'