Fix python workflow

Author: mdavezac

.github/workflows/python.yml

@@ -9,62 +9,130 @@ name: Python Build
   pull_request:
 
 jobs:
-  from-sdist:
-    name: python unit-tests
+  from_uv:
+    name: python uv installation
     runs-on: ubuntu-latest
     steps:
+      - uses: actions/checkout@v4
       - name: Install uv
         uses: astral-sh/setup-uv@v5
         with:
           version: "0.6.5"
       - name: "Set up Python"
         uses: actions/setup-python@v5
         with:
-          python-version: 3.8
           python-version-file: "pyproject.toml"
 
       - name: Install pyssht
         run: uv sync --all-extras --dev
 
       - name: run pytest
-        run: uv run pytest tests/test_pyssht.py
+        run: uv run pytest
+
+  from_sdist:
+    name: python source distribution
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - name: Install uv
+        uses: astral-sh/setup-uv@v5
+        with:
+          version: "0.6.5"
+
+      - name: "Set up Python"
+        uses: actions/setup-python@v5
+        with:
+          python-version-file: "pyproject.toml"
+
+      - name: Build sdist
+        run: uv build --sdist
+
+      - name: create venv
+        run: uv venv 
+
+      - name: install wheel
+        run: "uv pip install dist/pyssht-*.tar.gz"
+
+      - name: run pytests
+        run: uv pip install pytest && uv run pytest
 
   build_wheels:
-    name: Build wheels on ${{ matrix.os }}
+    name: Build wheels
     runs-on: macos-latest
 
     steps:
+      - uses: actions/checkout@v4
       - name: Install uv
         uses: astral-sh/setup-uv@v5
         with:
           version: "0.6.5"
       - name: "Set up Python"
         uses: actions/setup-python@v5
         with:
-          python-version: 3.8
+          python-version-file: "pyproject.toml"
 
       - name: Build wheels
         run: uv build --wheel
 
+      - name: create venv
+        run: uv venv 
+
       - name: install wheel
-        run: "pip install dist/*.whl"
+        run: "uv pip install dist/*.whl"
 
       - name: run pytests
-        run: uv pip install pytest && pytest tests
+        run: uv pip install pytest && uv run pytest
 
-  publication:
-    name: publish to pypi
+  publish_wheels:
+    name: Build wheels and publish on ${{ matrix.os }}
     if: ${{ startsWith(github.ref, 'refs/tags') }}
-    runs-on: macos-latest
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        os: [ubuntu-latest, ubuntu-24.04-arm, macos-13, macos-14]
+    permissions:
+      id-token: write
     steps:
+      - uses: actions/checkout@v4
       - name: Install uv
         uses: astral-sh/setup-uv@v5
         with:
           version: "0.6.5"
+
+      - name: Build wheels
+        uses: pypa/[email protected]
+        env:
+          CIBW_SKIP: "cp36-* cp37-* cp38-* pp* *musllinux*"
+          CIBW_BUILD_FRONTEND: "build[uv]"
+
+      - name: Publish distribution 📦 to Test PyPI
+        if: ${{ github.ref != 'refs/tags/v1.5.2' }}
+        run: "uv publish --publish-url https://test.pypi.org/legacy/ wheelhouse/*.whl"
+
+      - name: Publish distribution 📦 to PyPI
+        if: ${{ github.ref == 'refs/tags/v1.5.2' }}
+        run: "uv publish wheelhouse/*.whl"
+
+  publish_sdist:
+    name: Build sdist and publish on ubuntu
+    if: ${{ startsWith(github.ref, 'refs/tags') }}
+    runs-on: ubuntu-latest
+    permissions:
+      id-token: write
+    steps:
+      - uses: actions/checkout@v4
+      - name: Install uv
+        uses: astral-sh/setup-uv@v5
+        with:
+          version: "0.6.5"
+
+      - name: Build sdist
+        run: uv build --sdist
+
       - name: Publish distribution 📦 to Test PyPI
         if: ${{ github.ref != 'refs/tags/v1.5.2' }}
-        run: "uv publish --publish-url https://test.pypi.org/legacy --token ${{ secrets.TEST_PYPI_TOKEN }}"
+        run: "uv publish --publish-url https://test.pypi.org/legacy/ dist/*.tar.gz"
 
       - name: Publish distribution 📦 to PyPI
         if: ${{ github.ref == 'refs/tags/v1.5.2' }}
-        run: "uv publish --token ${{ secrets.TEST_PYPI_TOKEN }}"
+        run: "uv publish dist/*.tar.gz"

CMakeLists.txt

@@ -11,8 +11,6 @@ project(
     HOMEPAGE_URL "http://astro-informatics.github.io/ssht/"
     LANGUAGES C)
 
-option(conan_deps "Download dependencies using conan" OFF)
-
 if(NOT CMAKE_BUILD_TYPE)
     set(CMAKE_BUILD_TYPE Debug)
 endif()
@@ -38,7 +36,7 @@ if(SKBUILD)
         COMPONENTS Interpreter Development.Module NumPy
         REQUIRED)
     add_subdirectory(src/pyssht)
-elseif(NOT CONAN_EXPORTED)
+else()
     include("${PROJECT_SOURCE_DIR}/cmake/exporting.cmake")
 endif()
 

README.md

@@ -47,10 +47,10 @@ Then **SSHT** can be compiled with:
 
 ```bash
 git clone https://github.com/astro-informatics/ssht.git
-mkdir ssht/build && cd ssht/build
-cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr/local -Dconan_deps=True ..
-make
-make install
+cmake -B ./build -S . -DCMAKE_BUILD_TYPE=Release -DCMAKE_PROJECT_TOP_LEVEL_INCLUDES=./cmake/conan_provider.cmake
+cmake --build build
+ctest --test-dir build
+cmake --install build --install-prefix=/usr/local
 ```
 
 The above will also download [FFTW](http://www.fftw.org/), if necessary.

setup.cfg

@@ -11,7 +11,7 @@ serialize =
 
 [bumpversion:file:makefile]
 
-[bumpversion:file:CMakelists.txt]
+[bumpversion:file:CMakeLists.txt]
 
 [bumpversion:file:.github/workflows/python.yml]