pyproject.toml: Move settings of CIBW_ENVIRONMENT variables here

Author: mkoeppe

.github/workflows/buildwheel.yml

@@ -43,10 +43,6 @@ jobs:
           CIBW_BEFORE_ALL_WINDOWS: msys2 -c bin/cibw_before_all_windows.sh
           CIBW_BEFORE_BUILD_WINDOWS: msys2 -c bin/cibw_before_build_windows.sh
           CIBW_BEFORE_BUILD: pip install numpy setuptools cython delvewheel
-          CIBW_ENVIRONMENT: >
-            C_INCLUDE_PATH=$(pwd)/.local/include/
-            LIBRARY_PATH=$(pwd)/.local/lib/
-            LD_LIBRARY_PATH=$(pwd)/.local/lib:$LD_LIBRARY_PATH
 
       - uses: actions/upload-artifact@v4
         with:

bin/cibw.sh

@@ -8,9 +8,6 @@
 
 rm -f wheelhouse/*
 
-# bin/build_dependencies_unix.sh places headers and shared libraries under .local
-export CIBW_ENVIRONMENT='C_INCLUDE_PATH=$(pwd)/.local/include/ LIBRARY_PATH=$(pwd)/.local/lib/ LD_LIBRARY_PATH=$(pwd)/.local/lib:$LD_LIBRARY_PATH'
-
 export CIBW_BUILD='cp39-* cp310-* cp311-* cp312-*'
 # export CIBW_BUILD='cp311-*'
 export CIBW_SKIP='*-win32 *-manylinux_i686 *-musllinux_*'

pyproject.toml

@@ -24,10 +24,18 @@ content-type = "text/markdown"
 [tool.cibuildwheel]
 test-command = "python -c 'import flint; print(str(flint.fmpz(2)))'"
 
+[tool.cibuildwheel.environment]
+# bin/build_dependencies_unix.sh places headers and shared libraries under .local
+C_INCLUDE_PATH = "$(pwd)/.local/include/"
+LIBRARY_PATH = "$(pwd)/.local/lib/"
+LD_LIBRARY_PATH = "$(pwd)/.local/lib:$LD_LIBRARY_PATH"
+
 [tool.cibuildwheel.linux]
 
 [tool.cibuildwheel.macos]
 
 [tool.cibuildwheel.windows]
-environment = { PYTHON_FLINT_MINGW64="true" }
 repair-wheel-command = "bin\\cibw_repair_wheel_command_windows.bat {dest_dir} {wheel}"
+
+[tool.cibuildwheel.windows.environment]
+PYTHON_FLINT_MINGW64 = "true"