From 81635b366bb42dc5b21b259498e7a03a94e6698d Mon Sep 17 00:00:00 2001
From: Wim Pomp <w.pomp@nki.nl>
Date: Wed, 16 Oct 2024 16:25:31 +0200
Subject: [PATCH] - workflows

---
 .github/workflows/publish.yml | 24 ------------------------
 .github/workflows/wheels.yml  | 28 +++++++++++++---------------
 2 files changed, 13 insertions(+), 39 deletions(-)
 delete mode 100644 .github/workflows/publish.yml

diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
deleted file mode 100644
index 901cc38..0000000
--- a/.github/workflows/publish.yml
+++ /dev/null
@@ -1,24 +0,0 @@
-name: Publish
-
-on: workflow_dispatch
-
-jobs:
-  publish_wheels:
-    uses: ./.github/workflows/wheels.yml
-  publish:
-    name: publish
-    needs: publish_wheels
-    runs-on: ubuntu-latest
-    environment:
-      name: pypi
-      url: https://pypi.org/p/tiffwrite
-    permissions:
-      id-token: write
-    steps:
-      - name: Download all the dists
-        uses: actions/download-artifact@v4
-        with:
-          name: python-package-distributions
-          path: dist/
-      - name: Publish distribution 📦 to PyPI
-        uses: pypa/gh-action-pypi-publish@release/v1
\ No newline at end of file
diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml
index 9dba990..41d7430 100644
--- a/.github/workflows/wheels.yml
+++ b/.github/workflows/wheels.yml
@@ -100,7 +100,7 @@ jobs:
           path: dist
 
   sdist:
-    #    needs: [ wheels_pytest ]
+    needs: [ wheels_pytest ]
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
@@ -115,17 +115,15 @@ jobs:
           name: wheels-sdist
           path: dist
 
-#  release:
-#    name: Release
-#    runs-on: ubuntu-latest
-#    if: "startsWith(github.ref, 'refs/tags/')"
-#    needs: [linux, windows, macos, sdist]
-#    steps:
-#      - uses: actions/download-artifact@v4
-#      - name: Publish to PyPI
-#        uses: PyO3/maturin-action@v1
-#        env:
-#          MATURIN_PYPI_TOKEN: ${{ secrets.PYPI_API_TOKEN }}
-#        with:
-#          command: upload
-#          args: --non-interactive --skip-existing wheels-*/*
+  release:
+    name: Release
+    runs-on: ubuntu-latest
+    if: "startsWith(github.ref, 'refs/tags/')"
+    needs: [linux, windows, macos, sdist]
+    steps:
+      - uses: actions/download-artifact@v4
+      - name: Publish to PyPI
+        uses: PyO3/maturin-action@v1
+        with:
+          command: upload
+          args: --non-interactive --skip-existing wheels-*/*