Merge

.github/workflows/python-publish.yml

@@ -15,28 +15,30 @@ on:
 
 jobs:
 
-  build_wheels:
-    name: Build wheels on ${{ matrix.os }}
+  build_native_wheels:
+    name: Build native wheels on ${{ matrix.os }}
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [ubuntu-latest, windows-latest, macos-13, macos-14]
+        os: [ubuntu-latest, windows-latest, macos-15-intel, macos-15]
 
     steps:
       - uses: actions/checkout@v4
 
       # Used to host cibuildwheel
       - uses: actions/setup-python@v5
 
-      - name: Install cibuildwheel
+      - name: Install cibuildwheel and native deps
         run: |
           python -m pip install --upgrade pip
           python -m pip install cibuildwheel==3.2.1
           python fetch_dependencies.py
 
-      - name: Build wheels
+      - name: Build native wheels
         env:
           CIBW_SKIP: 'pp* manylinux_i686 musllinux*'
+          VKDISPATCH_BUILD_TARGET: native
+          CIBW_ENVIRONMENT: VKDISPATCH_BUILD_TARGET=native
         run: python -m cibuildwheel --output-dir wheelhouse
 
         # to supply options, put them in 'env', like:
@@ -47,28 +49,44 @@ jobs:
         with:
           name: cibw-wheels-${{ matrix.os }}-${{ strategy.job-index }}
           path: ./wheelhouse/*.whl
-  build_sdist:
-    name: Build source distribution
+  build_python_dists:
+    name: Build native/core/meta sdists and pure wheels
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
 
-      - name: Install dependencies
+      - uses: actions/setup-python@v5
+
+      - name: Install build tooling
         run: |
           python -m pip install --upgrade pip
+          python -m pip install build
+
+      - name: Build native source distribution
+        env:
+          VKDISPATCH_BUILD_TARGET: native
+        run: |
           python fetch_dependencies.py
+          python -m build --sdist --outdir dist
+
+      - name: Build core wheel and source distribution
+        env:
+          VKDISPATCH_BUILD_TARGET: core
+        run: python -m build --wheel --sdist --outdir dist
 
-      - name: Build sdist
-        run: pipx run build --sdist
+      - name: Build meta wheel and source distribution
+        env:
+          VKDISPATCH_BUILD_TARGET: meta
+        run: python -m build --wheel --sdist --outdir dist
 
       - uses: actions/upload-artifact@v4
         with:
-          name: cibw-sdist
-          path: dist/*.tar.gz
+          name: cibw-python-dists
+          path: dist/*
   publish-to-pypi:
     name: Publish Python package to PyPI
     # if: startsWith(github.ref, 'refs/tags/')  # only publish to PyPI on tag pushes
-    needs: [build_wheels, build_sdist]
+    needs: [build_native_wheels, build_python_dists]
     runs-on: ubuntu-latest
     environment:
       name: pypi

docs/Makefile

@@ -27,11 +27,9 @@ bundle_lib:
 	@rm -rf "$(LIB_DEST)/vkdispatch"
 	@mkdir -p "$(LIB_DEST)"
 	@rm -f "$(LIB_DEST)/$(LIB_BUNDLE)"
-	@rm -f "$(LIB_DEST)/vkdispatch_native.brython.js"
 	@rm -rf "$(LIB_STAGE)"
 	@mkdir -p "$(LIB_STAGE)"
 	@cp -r ../vkdispatch "$(LIB_STAGE)/vkdispatch"
-	@cp -r special_pages/libs/vkdispatch_native "$(LIB_STAGE)/vkdispatch_native"
 	@cd "$(LIB_STAGE)" && $(PYTHON) -m brython make_package vkdispatch \
 		--src-dir . \
 		--output-path "$(CURDIR)/$(LIB_DEST)/$(LIB_BUNDLE)"

docs/special/index.rst

@@ -6,4 +6,4 @@ Standalone pages integrated into the docs navigation.
 .. toctree::
    :maxdepth: 1
 
-   brython_shader_lab
+   shader_playground

docs/special/shader_playground.rst

@@ -0,0 +1,16 @@
+Shader Playground
+==================
+
+This page redirects to a standalone HTML app page.
+
+.. raw:: html
+
+   <meta http-equiv="refresh" content="0; url=../shader_playground.html">
+   <script>
+     window.location.replace("../shader_playground.html");
+   </script>
+   <p>
+     Redirecting to the shader playground page.
+     If you are not redirected, open
+     <a href="../shader_playground.html">the standalone HTML page</a>.
+   </p>