Skip to content

Commit 5fca38a

Browse files
authored
Remove custom branch of nanobind for Windows (#857)
* Remove my branch of nanobind. * Syntax fix.
1 parent 18a2c6b commit 5fca38a

File tree

2 files changed

+5
-12
lines changed

2 files changed

+5
-12
lines changed

.github/workflows/windows.yml

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -36,12 +36,9 @@ jobs:
3636
with:
3737
python-version: "3.11"
3838

39-
- name: Install build dependencies (workaround)
40-
run: |
41-
python -m pip install scikit-build-core[pyproject] git+https://github.com/jhale/nanobind.git@jhale/msvc2022-workaround setuptools wheel
4239
- name: Install Basix (combined)
4340
run: |
44-
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
41+
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
4542
4643
- name: Run units tests
4744
run: |
@@ -84,13 +81,10 @@ jobs:
8481
cmake --install build-dir --config Release --prefix D:/a/basix/install
8582
echo "D:/a/basix/install/bin" | Out-File -Append -FilePath $env:GITHUB_PATH -Encoding utf8
8683
87-
- name: Install build dependencies (workaround)
88-
run: |
89-
python -m pip install scikit-build-core[pyproject] git+https://github.com/jhale/nanobind.git@jhale/msvc2022-workaround setuptools wheel
9084
- name: Install Basix (Python)
9185
run: |
9286
cd python
93-
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
87+
python -m pip -v install --no-cache-dir .[ci] --config-settings=cmake.args=-DBasix_DIR=D:/a/basix/install/lib/cmake/basix
9488
cd ../
9589
9690
- name: Run units tests

pyproject.toml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -56,8 +56,7 @@ manylinux-x86_64-image = "quay.io/pypa/manylinux_2_28_x86_64:2024-09-16-ab73a4b"
5656
manylinux-aarch64-image = "quay.io/pypa/manylinux_2_28_aarch64:2024-09-16-ab73a4b"
5757

5858
[tool.cibuildwheel.windows]
59-
before-build = "pip install scikit-build-core[pyproject] git+https://github.com/jhale/nanobind.git@jhale/msvc2022-workaround setuptools wheel"
60-
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"] }
59+
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"] }
6160
test-command = [
6261
"python -m pytest -v -n auto --durations 20 {project}/test/",
6362
]
@@ -66,7 +65,7 @@ test-command = [
6665
archs = [
6766
"x86_64",
6867
"aarch64",
69-
] # Forces arm64 build on x86_64 runner using emulation.
68+
] # Forces arm64 build on x86_64 runner using emulation (and vice-versa).
7069
before-build = "yum -y update && yum install -y epel-release && yum install -y openblas-devel ninja-build"
7170
test-command = [
7271
"cmake -G Ninja -DPython3_EXECUTABLE=$(which python) -B build-dir -S {project}/test/test_cmake",
@@ -80,7 +79,7 @@ environment = { "MACOSX_DEPLOYMENT_TARGET" = "10.14" }
8079
archs = [
8180
"x86_64",
8281
"arm64",
83-
] # Forces x86_64 build on arm64 runner using cross-compilation.
82+
] # Forces x86_64 build on arm64 runner using cross-compilation (and vice-versa).
8483
before-build = "export HOMEBREW_AUTO_UPDATING=0 && brew update && brew install ninja"
8584
test-command = [
8685
"cmake -G Ninja -DPython3_EXECUTABLE=$(which python) -B build-dir -S {project}/test/test_cmake",

0 commit comments

Comments
 (0)