fix windows setup

Author: neutrinoceros

.github/workflows/cibuildwheel.yml

@@ -123,25 +123,10 @@ jobs:
           create-args: >-
             python=${{ matrix.python-version }} libnetcdf=4.9.2 --channel conda-forge
 
-      - name: Install cibuildwheel
-        run: |
-          python -m pip install --upgrade cibuildwheel delvewheel
-
       - name: Build wheels for Windows (${{ matrix.arch }})
-        run: cibuildwheel --output-dir wheelhouse
+        uses: pypa/cibuildwheel@v3.1.4
         env:
-          CIBW_BUILD: "cp39-${{ matrix.arch }} cp310-${{ matrix.arch }} cp311-${{ matrix.arch }} cp312-${{ matrix.arch }} cp313-${{ matrix.arch }}"
-          CIBW_ENVIRONMENT_WINDOWS: >
-            HDF5_DIR="C:\\Users\\runneradmin\\micromamba\\envs\\build\\Library"
-            netCDF4_DIR="C:\\Users\\runneradmin\\micromamba\\envs\\build\\Library"
-            PATH="C:\\Users\\runneradmin\\micromamba\\envs\\build\\Library\\bin;${PATH}"
-          CIBW_REPAIR_WHEEL_COMMAND_WINDOWS: >
-            delvewheel show {wheel}
-            && delvewheel repair -w {dest_dir} {wheel}
-          CIBW_TEST_REQUIRES: pytest cython packaging typing-extensions
-          CIBW_TEST_COMMAND: >
-            python -c "import netCDF4; print(f'netCDF4 v{netCDF4.__version__}')"
-            && pytest -s -rxs -v {project}\\test
+          CIBW_ARCHS: ${{ matrix.arch }}
 
       - uses: actions/upload-artifact@v4
         with:

pyproject.toml

@@ -112,9 +112,13 @@ skip = [
   "cp314t-*",
 ]
 test-extras = "tests"
+test-sources = [
+  "test",
+  "pyproject.toml"
+]
 test-command = [
     """python -c 'import netCDF4; print(f"netCDF4 v{netCDF4.__version__}")'""",
-    "pytest -s -rxs -v {project}/test",
+    "pytest -s -rxs -v test",
 ]
 manylinux-x86_64-image = "ghcr.io/ocefpaf/manylinux_2_28_x86_64-netcdf"
 manylinux-aarch64-image = "ghcr.io/ocefpaf/manylinux_2_28_aarch64-netcdf"
@@ -132,3 +136,17 @@ environment.MACOSX_DEPLOYMENT_TARGET = "13.0"
 select = "*-macosx_*_arm64*"
 inherit.environment = "append"
 environment.MACOSX_DEPLOYMENT_TARGET = "14.0"
+
+[tool.cibuildwheel.windows]
+before-build = "python -m pip install delvewheel"
+repair-wheel-command = [
+  "delvewheel show {wheel}",
+  "delvewheel repair -w {dest_dir} {wheel}",
+]
+
+[[tool.cibuildwheel.overrides]]
+select = "*-win_*"
+inherit.environment = "append"
+environment = { "HDF5_DIR" = "C:\\Users\\runneradmin\\micromamba\\envs\\build\\Library", "netCDF4_DIR" = "C:\\Users\\runneradmin\\micromamba\\envs\\build\\Library", "PATH" = "C:\\Users\\runneradmin\\micromamba\\envs\\build\\Library\\bin;${PATH}" }
+
+