Merge branch 'main' into jhale/scikit-build-core-0.10

FEniCS · Oct 10, 2024 · 28cb8b1 · 28cb8b1
2 parents fcbfabb + 5fca38a
commit 28cb8b1
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 12 deletions.
diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
@@ -36,12 +36,9 @@ jobs:
         with:
           python-version: "3.11"
 
-      - name: Install build dependencies (workaround)
-        run: |
-          python -m pip install scikit-build-core[pyproject] git+https://github.com/jhale/nanobind.git@jhale/msvc2022-workaround setuptools wheel
       - name: Install Basix (combined)
         run: |
-          python -m pip -v install --no-build-isolation --no-cache-dir .[ci] --config-settings=cmake.args=-DINSTALL_RUNTIME_DEPENDENCIES=ON --config-settings=cmake.args=-DCMAKE_TOOLCHAIN_FILE=C:/vcpkg/scripts/buildsystems/vcpkg.cmake
+          python -m pip -v install --no-cache-dir .[ci] --config-settings=cmake.args=-DINSTALL_RUNTIME_DEPENDENCIES=ON --config-settings=cmake.args=-DCMAKE_TOOLCHAIN_FILE=C:/vcpkg/scripts/buildsystems/vcpkg.cmake
 
       - name: Run units tests
         run: |
@@ -84,13 +81,10 @@ jobs:
           cmake --install build-dir --config Release --prefix D:/a/basix/install
           echo "D:/a/basix/install/bin" | Out-File -Append -FilePath $env:GITHUB_PATH -Encoding utf8
 
-      - name: Install build dependencies (workaround)
-        run: |
-          python -m pip install scikit-build-core[pyproject] git+https://github.com/jhale/nanobind.git@jhale/msvc2022-workaround setuptools wheel
       - name: Install Basix (Python)
         run: |
           cd python
-          python -m pip -v install --no-build-isolation --no-cache-dir .[ci] --config-settings=cmake.args=-DBasix_DIR=D:/a/basix/install/lib/cmake/basix
+          python -m pip -v install --no-cache-dir .[ci] --config-settings=cmake.args=-DBasix_DIR=D:/a/basix/install/lib/cmake/basix
           cd ../
       
       - name: Run units tests

diff --git a/pyproject.toml b/pyproject.toml
@@ -54,8 +54,7 @@ manylinux-x86_64-image = "quay.io/pypa/manylinux_2_28_x86_64:2024-09-16-ab73a4b"
 manylinux-aarch64-image = "quay.io/pypa/manylinux_2_28_aarch64:2024-09-16-ab73a4b"
 
 [tool.cibuildwheel.windows]
-before-build = "pip install scikit-build-core[pyproject] git+https://github.com/jhale/nanobind.git@jhale/msvc2022-workaround setuptools wheel"
-build-frontend = {name = "pip", args = ["--no-build-isolation", "--config-settings=cmake.args=-DINSTALL_RUNTIME_DEPENDENCIES=ON", "--config-settings=cmake.args=-DCMAKE_TOOLCHAIN_FILE=C:/vcpkg/scripts/buildsystems/vcpkg.cmake"] }
+build-frontend = {name = "pip", args = ["--config-settings=cmake.args=-DINSTALL_RUNTIME_DEPENDENCIES=ON", "--config-settings=cmake.args=-DCMAKE_TOOLCHAIN_FILE=C:/vcpkg/scripts/buildsystems/vcpkg.cmake"] }
 test-command = [
     "python -m pytest -v -n auto --durations 20 {project}/test/",
 ]
@@ -64,7 +63,7 @@ test-command = [
 archs = [
     "x86_64",
     "aarch64",
-] # Forces arm64 build on x86_64 runner using emulation.
+] # Forces arm64 build on x86_64 runner using emulation (and vice-versa).
 before-build = "yum -y update && yum install -y epel-release && yum install -y openblas-devel ninja-build"
 test-command = [
     "cmake -G Ninja -DPython3_EXECUTABLE=$(which python) -B build-dir -S {project}/test/test_cmake",
@@ -78,7 +77,7 @@ environment = { "MACOSX_DEPLOYMENT_TARGET" = "10.14" }
 archs = [
     "x86_64",
     "arm64",
-] # Forces x86_64 build on arm64 runner using cross-compilation.
+] # Forces x86_64 build on arm64 runner using cross-compilation (and vice-versa).
 before-build = "export HOMEBREW_AUTO_UPDATING=0 && brew update && brew install ninja"
 test-command = [
     "cmake -G Ninja -DPython3_EXECUTABLE=$(which python) -B build-dir -S {project}/test/test_cmake",