fix: escaped variables in shell script for PyPI workflow

Author: Germey

.github/workflows/publish-pypi.yml

@@ -6,99 +6,67 @@ on:
   workflow_dispatch:
 
 jobs:
-  publish-pypi:
-    name: Build & publish (PyPI)
+  publish:
     runs-on: ubuntu-latest
-    defaults:
-      run:
-        working-directory: python
-    environment:
-      name: pypi
-      url: https://pypi.org/project/acedatacloud-x402/
-    permissions:
-      contents: write
-      id-token: write
     steps:
-      - name: Checkout
-        uses: actions/checkout@v5
+      - uses: actions/checkout@v4
+      - uses: actions/setup-python@v5
         with:
-          fetch-depth: 0
-
-      - name: Setup Python
-        uses: actions/setup-python@v5
-        with:
-          python-version: "3.11"
-
-      - name: Install build tools
-        run: |
-          python -m pip install --upgrade pip
-          pip install build hatchling
+          python-version: '3.11'
 
       - name: Compute CalVer version
-        id: version
-        shell: python
+        id: calver
+        env:
+          PKG_NAME: acedatacloud-x402
         run: |
-          import json, os, urllib.request, datetime, subprocess
-          name = "acedatacloud-x402"
-          prefix = datetime.datetime.now(datetime.timezone.utc).strftime("%Y.%-m.%-d")
-          print(f"Package: {name}")
-          print(f"Date prefix (UTC): {prefix}")
+          DATE_PREFIX=$(date -u +'%Y.%-m.%-d')
+          echo "Package: $PKG_NAME"
+          echo "Date prefix (UTC): $DATE_PREFIX"
+          VERSION=$(python3 -c "
+          import json, os, urllib.request
+          name = os.environ['PKG_NAME']
+          prefix = os.environ['DATE_PREFIX']
           try:
-              with urllib.request.urlopen(f"https://pypi.org/pypi/{name}/json", timeout=10) as r:
-                  versions = list(json.load(r).get("releases", {}).keys())
-          except Exception as e:
-              print(f"Error fetching from PyPI: {e}")
+              with urllib.request.urlopen(f'https://pypi.org/pypi/{name}/json', timeout=10) as r:
+                  versions = list(json.load(r).get('releases', {}).keys())
+          except Exception:
               versions = []
           
-          same = [v for v in versions if v == prefix or v.startswith(prefix + ".")]
+          same = [v for v in versions if v == prefix or v.startswith(prefix + '.')]
           if not same:
-              version = prefix
-          else:
-              max_n = 0
-              for v in same:
-                  if v == prefix:
-                      if max_n < 1: max_n = 1
-                      continue
-                  tail = v[len(prefix) + 1:]
-                  try:
-                      n = int(tail)
-                      if n >= max_n: max_n = n + 1
-                  except ValueError:
-                      pass
-              version = f"{prefix}.{max_n}"
+              print(prefix); exit(0)
           
-          print(f"Resolved version: {version}")
-          with open(os.environ["GITHUB_OUTPUT"], "a") as f:
-              f.write(f"version={version}\n")
+          max_n = 0
+          for v in same:
+              if v == prefix:
+                  if max_n < 1: max_n = 1
+                  continue
+              tail = v[len(prefix) + 1:]
+              try:
+                  n = int(tail)
+                  if n >= max_n: max_n = n + 1
+              except ValueError:
+                  pass
+          print(f'{prefix}.{max_n}')
+          ")
+          echo "Resolved version: $VERSION"
+          echo "version=$VERSION" >> "$GITHUB_OUTPUT"
 
-      - name: Stamp version into pyproject.toml
-        env:
-          VERSION: ${{ steps.version.outputs.version }}
+      - name: Update version in pyproject.toml
         run: |
-          python3 -c "
-          import os, re, pathlib
-          version = os.environ['VERSION']
-          p = pathlib.Path('pyproject.toml')
-          text = p.read_text()
-          text = re.sub(r'^version = \"[^\"]+\"', f'version = \"{version}\"', text, count=1, flags=re.M)
-          p.write_text(text)
-          "
-          grep -m1 '^version' pyproject.toml
-
-      - name: Build distributions
-        run: python3 -m build
+          VERSION=${{ steps.calver.outputs.version }}
+          sed -i "s/^version = \".*\"/version = \"$VERSION\"/" pyproject.toml
+          cat pyproject.toml | grep "^version ="
 
-      - name: Publish to PyPI
-        uses: pypa/gh-action-pypi-publish@release/v1
-        with:
-          packages-dir: python/dist/
+      - name: Install dependencies
+        run: |
+          python -m pip install --upgrade pip
+          pip install build twine
 
-      - name: Create Release
+      - name: Build and publish
         env:
-          GITHUB_TOKEN: ${{ github.token }}
-          VERSION: ${{ steps.version.outputs.version }}
+          TWINE_USERNAME: __token__
+          TWINE_PASSWORD: ${{ secrets.PYPI_API_TOKEN }}
         run: |
-          gh release create "python-v$VERSION" python/dist/* \
-            --title "Python v$VERSION" \
-            --generate-notes \
-            --repo "${{ github.repository }}" || echo "Release already exists, skipping"
+          python -m build
+          twine upload dist/*