.github/workflows/release: Update release file

rkdarst · rkdarst · commit fb10e5a15527 · 2024-03-08T02:33:40.000+02:00
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -24,60 +24,65 @@ name: PyPI release
 #  MOD_NAME: numpy
 
 on:
+  # For Github release-based publishing
+  #release:
+  #  types: [published]
+  # For tag-based (instead of Github-specific release-based):
   push:
     tags:
       - '*'
 
 jobs:
-  pypi:
+  build:
     runs-on: ubuntu-latest
     if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags')
+    permissions:
+      contents: read
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
 
     - name: Set up Python
-      uses: actions/setup-python@v2
+      uses: actions/setup-python@v4
       #with:
       #  python-version: 3.8
 
     - name: Install dependencies
       run: |
         python -m pip install --upgrade pip
-        pip install twine wheel
+        pip install -r requirements.txt
+        pip install twine wheel flit
 
     - name: Build
       run: |
-        python setup.py sdist bdist_wheel
+        flit build
 
     # Verify that the git tag has the same version as the python
     # project version.
-    - name: Check that versions match
-      run: |
-        pip install .
-        # If MOD_NAME not defined, infer it from the directory name
-        if [ -z "$MOD_NAME" ] ; then
-            # strip leading directories
-            MOD_NAME=${PWD##*/}
-            # replace '-' with '_'
-            MOD_NAME=${MOD_NAME//-/_}
-        fi
-        # Find the versions
-        MOD_VERSION=$(python -c "import $MOD_NAME ; print($MOD_NAME.__version__)")
-        echo $MOD_VERSION
-        TAG_VERSION=${{ github.ref }}
-        echo $TAG_VERSION
-        TAG_VERSION=${TAG_VERSION##refs/tags/}   # remove leading 'refs/tags/'
-        # Do the actual check
-        if [ "$MOD_VERSION" != "$TAG_VERSION" ] ; then
-          echo "::error::Module version ($MOD_VERSION) des not match tag version ($TAG_VERSION)"
-          exit 1
-        fi
+    - uses: rkdarst/action-verify-python-version@main
 
-    - name: Publish on PyPI
-      if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags')
-      uses: pypa/gh-action-pypi-publish@v1.4.1
+    - uses: actions/upload-artifact@v4
+      with:
+        name: dist-directory
+        path: dist/
+
+
+  upload:
+    runs-on: ubuntu-latest
+    needs: build
+    if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags')
+    permissions:
+      id-token: write  # for trusted publishing
+    steps:
+
+    - uses: actions/download-artifact@v4
       with:
-        user: __token__
-        password: ${{ secrets.pypi_password }}
+        name: dist-directory
+        path: dist/
+
+    - name: Publish on PyPI
+      uses: pypa/gh-action-pypi-publish@release/v1
+      #with:
+        #user: __token__
+        #password: ${{ secrets.pypi_password }}
         #repository_url: https://test.pypi.org/legacy/
