Also publish pure python wheel

Author: JelmerBot

.github/workflows/Publish.yml

@@ -41,14 +41,14 @@ jobs:
       - name: Move files to dist
         run: |
           mkdir dist
-          mv sdist/* dist/
+          mv dists/* dist/
           if [[ ! -f dist/multi_mst-${{ steps.version.outputs.version }}.tar.gz ]] ; then exit 1; fi
       
       - name: Create Github Release
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}  
         run: |
-          gh release create -R vda-lab/multi_mst -t "Version ${{ steps.version.outputs.version }}" -n "**Full Changelog**: https://github.com/vda-lab/pyflasc/commits/${{ steps.version.outputs.tag }}" "${{ steps.version.outputs.tag }}" dist/*.tar.gz
+          gh release create -R vda-lab/multi_mst -t "Version ${{ steps.version.outputs.version }}" -n "**Full Changelog**: https://github.com/vda-lab/pyflasc/commits/${{ steps.version.outputs.tag }}" "${{ steps.version.outputs.tag }}" dist/*.whl dist/*.tar.gz
         
       - name: Publish package to (Test)PyPI
         uses: pypa/[email protected]

.github/workflows/Tests.yml

@@ -27,11 +27,11 @@ on:
   workflow_dispatch:
 
 jobs:
-  build_sdist:
-    name: Build sdist
+  build_dists:
+    name: Build dists
     runs-on: ubuntu-20.04
     outputs:
-      SDIST_NAME: ${{ steps.sdist.outputs.SDIST_NAME }}
+      WHEEL_NAME: ${{ steps.dists.outputs.WHEEL_NAME }}
     steps:
       - uses: actions/checkout@v4
         with:
@@ -47,32 +47,32 @@ jobs:
         run: |
           python -m pip install --upgrade pip
           pip install -r requirements.txt
-          pip install twine flake8
+          pip install twine flake8 build
 
       - name: Lint with flake8
         run: |
           # stop the build if there are Python syntax errors or undefined names
           flake8 . --count --select=E9,F63,F7,F82 --show-source --statistics
 
-      - name: Build sdist
-        id: sdist
+      - name: Build dists
+        id: dists
         run: |
-          python setup.py sdist
-          python ci/export_sdist_name.py
+          python -m build --sdist --wheel
+          python ci/export_name.py
 
       - name: Check README rendering for PyPI
         run: twine check dist/*
 
       - name: Upload sdist result
         uses: actions/upload-artifact@v3
         with:
-          name: sdist
-          path: dist/*.tar.gz
+          name: dists
+          path: dist/*
           if-no-files-found: error
 
   test_sdist:
-    name: Test sdist for cp${{ matrix.python }}-${{ matrix.platform_id }}-${{ matrix.manylinux_image }}
-    needs: build_sdist
+    name: Test dist for cp${{ matrix.python }}-${{ matrix.platform_id }}-${{ matrix.manylinux_image }}
+    needs: build_dists
     runs-on: ${{ matrix.os }}
     strategy:
       fail-fast: true
@@ -116,7 +116,7 @@ jobs:
       - name: Download sdist
         uses: actions/download-artifact@v3
         with:
-          name: sdist
+          name: dists
           path: dist/
 
       - name: Setup Python
@@ -131,6 +131,6 @@ jobs:
 
       - name: Run tests
         run: |
-          pip install dist/${{ needs.build_sdist.outputs.SDIST_NAME }}
+          pip install dist/${{ needs.build_dists.outputs.WHEEL_NAME }}
           python -c "from multi_mst.tests import run_tests; run_tests()"
   

ci/export_name.py

@@ -0,0 +1,21 @@
+#!/usr/bin/env python3
+
+"""
+Determine the name of the wheel and export to GitHub output named WHEEL_NAME.
+
+To run:
+    $ python3 -m build --sdist
+    $ ./ci/determine_name.py
+"""
+import os
+from pathlib import Path
+import sys
+
+
+paths = [p.name for p in Path("dist").glob("*.whl")]
+if len(paths) != 1:
+    sys.exit(f"Only a single wheel is supported, but found: {paths}")
+
+print(paths[0])
+with open(os.environ["GITHUB_OUTPUT"], "a") as f:
+    f.write(f"WHEEL_NAME={paths[0]}\n")

ci/export_sdist_name.py

@@ -1,4 +1,5 @@
-numpy>=1.21
-numba>=0.56
-umap-learn>=0.5.4
-scikit-learn>=1.1
+numpy >= 1.23
+scipy >= 1.9
+scikit-learn >= 1.1
+umap-learn >= 0.5.4
+numba >= 0.57.1

requirements.txt

@@ -1,6 +1,6 @@
 [metadata]
 name = multi_mst
-version = 0.1.1
+version = 0.1.2
 author = Jelmer Bot
 author_email = [email protected]
 maintainer = Jelmer Bot
@@ -28,7 +28,8 @@ packages =
     multi_mst.tests
 python_requires = >=3.9
 install_requires =
-    numpy>=1.21
-    numba>=0.56
-    umap-learn>=0.5.4
-    scikit-learn>=1.1
+    numpy >= 1.23
+    scipy >= 1.9
+    scikit-learn >= 1.1
+    umap-learn >= 0.5.4
+    numba >= 0.57.1