Merge branch 'main' into enhance-config-usage-hint

Signed-off-by: Kenneth Bingham <kenneth.bingham@netfoundry.io>

.github/workflows/build-wheels.yml

@@ -45,7 +45,7 @@ jobs:
           name: zrok_sdk_${{ matrix.spec.target }}
           path: ${{ github.workspace }}/sdk/python/sdk/zrok/dist/*
 
-  publish:
+  publish-testpypi:
     runs-on: ubuntu-20.04
     needs: [ build_wheels ]
     permissions:
@@ -54,16 +54,10 @@ jobs:
       - name: Download artifacts
         uses: actions/download-artifact@v4
         with:
-          path: ./download
+          path: ./dist
           merge-multiple: true
           pattern: zrok_sdk_*
 
-      - name: check
-        run: |
-          ls -lR ./download/
-          mkdir dist
-          cp ./download/* ./dist/
-
       - name: Publish wheels (TestPYPI)
         uses: pypa/gh-action-pypi-publish@release/v1
         with:
@@ -72,6 +66,19 @@ jobs:
           skip-existing: true
           verbose: true
 
+  publish-pypi:
+    runs-on: ubuntu-20.04
+    needs: [ publish-testpypi ]
+    permissions:
+          id-token: write
+    steps:
+      - name: Download artifacts
+        uses: actions/download-artifact@v4
+        with:
+          path: ./dist
+          merge-multiple: true
+          pattern: zrok_sdk_*
+
       - name: Publish wheels (PyPI)
         uses: pypa/gh-action-pypi-publish@release/v1
         with:

CHANGELOG.md

@@ -9,6 +9,8 @@ CHANGE: The Python SDK's `Overview()` function was refactored as a class method
 FEATURE: The Python SDK now includes a `ProxyShare` class providing an HTTP proxy for public and private shares and a
          Jupyter notebook example (https://github.com/openziti/zrok/pull/847).
 
+FIX: PyPi publishing was failing due to a CI issue (https://github.com/openziti/zrok/issues/849)
+
 ## v0.4.46
 
 FEATURE: Linux service template for systemd user units (https://github.com/openziti/zrok/pull/818)