From 8a88180e2266dcb3f285044c848db8e17cd57797 Mon Sep 17 00:00:00 2001 From: HPDell Date: Fri, 29 May 2026 10:38:16 +0800 Subject: [PATCH 01/16] edit: cd use pypi environment --- .github/workflows/cd.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml index 5965ff3..37e6822 100644 --- a/.github/workflows/cd.yml +++ b/.github/workflows/cd.yml @@ -93,6 +93,9 @@ jobs: needs: build-wheels runs-on: ubuntu-latest if: startsWith(github.ref, 'refs/tags/v') + environment: + name: pypi + url: https://pypi.org/project/pygwmodel/ permissions: id-token: write From 7c07a25e50078835112dba725d9375bbcb79a3ee Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Fri, 29 May 2026 02:44:47 +0000 Subject: [PATCH 02/16] Fix cd workflow cross-platform build setup --- .github/workflows/cd.yml | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml index 37e6822..65cd5db 100644 --- a/.github/workflows/cd.yml +++ b/.github/workflows/cd.yml @@ -59,8 +59,15 @@ jobs: CIBW_BUILD: "cp312-*" CIBW_SKIP: "pp* *-musllinux* *-manylinux_i686* *-win32 *-macosx_x86_64" CIBW_BEFORE_ALL_LINUX: > - apt-get update -qq && - apt-get install -qq libarmadillo-dev libopenblas-dev libgsl-dev + if command -v apt-get >/dev/null; then + apt-get update -qq && apt-get install -qq libarmadillo-dev libopenblas-dev libgsl-dev; + elif command -v dnf >/dev/null; then + dnf install -y armadillo-devel openblas-devel gsl-devel; + elif command -v yum >/dev/null; then + yum install -y armadillo-devel openblas-devel gsl-devel; + else + echo "No supported package manager found" && exit 1; + fi CIBW_ENVIRONMENT_LINUX: > CMAKE_ARGS="-DWITH_TESTS=OFF" PYGW_TEST_DATA="{project}/tests/londonhp100.csv" @@ -68,10 +75,9 @@ jobs: CIBW_ENVIRONMENT_MACOS: > CMAKE_ARGS="-DWITH_TESTS=OFF" PYGW_TEST_DATA="{project}/tests/londonhp100.csv" - MACOSX_DEPLOYMENT_TARGET="10.14" + MACOSX_DEPLOYMENT_TARGET="15.0" CIBW_BEFORE_ALL_WINDOWS: | - $vcpkg = "$env:VCPKG_INSTALLATION_ROOT/vcpkg.exe" - & $vcpkg install armadillo gsl openblas --triplet x64-windows + "%VCPKG_INSTALLATION_ROOT%\vcpkg.exe" install armadillo gsl openblas --triplet x64-windows CIBW_BEFORE_BUILD_WINDOWS: pip install delvewheel CIBW_ENVIRONMENT_WINDOWS: > PATH="C:/vcpkg/installed/x64-windows/bin" From 2654bc2a29aee9f216abdcd752fb141c6480a063 Mon Sep 17 00:00:00 2001 From: HPDell Date: Fri, 29 May 2026 10:57:00 +0800 Subject: [PATCH 03/16] fix: test file location --- .github/workflows/cd.yml | 8 ++++---- pyproject.toml | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml index 65cd5db..7192ac1 100644 --- a/.github/workflows/cd.yml +++ b/.github/workflows/cd.yml @@ -70,11 +70,11 @@ jobs: fi CIBW_ENVIRONMENT_LINUX: > CMAKE_ARGS="-DWITH_TESTS=OFF" - PYGW_TEST_DATA="{project}/tests/londonhp100.csv" + PYGW_TEST_DATA="{project}/test/londonhp100.csv" CIBW_BEFORE_ALL_MACOS: brew install armadillo gsl openblas CIBW_ENVIRONMENT_MACOS: > CMAKE_ARGS="-DWITH_TESTS=OFF" - PYGW_TEST_DATA="{project}/tests/londonhp100.csv" + PYGW_TEST_DATA="{project}/test/londonhp100.csv" MACOSX_DEPLOYMENT_TARGET="15.0" CIBW_BEFORE_ALL_WINDOWS: | "%VCPKG_INSTALLATION_ROOT%\vcpkg.exe" install armadillo gsl openblas --triplet x64-windows @@ -82,10 +82,10 @@ jobs: CIBW_ENVIRONMENT_WINDOWS: > PATH="C:/vcpkg/installed/x64-windows/bin" CMAKE_ARGS="-DWITH_TESTS=OFF -DCMAKE_TOOLCHAIN_FILE=C:/vcpkg/scripts/buildsystems/vcpkg.cmake" - PYGW_TEST_DATA="{project}/tests/londonhp100.csv" + PYGW_TEST_DATA="{project}/test/londonhp100.csv" CIBW_REPAIR_WHEEL_COMMAND_WINDOWS: > python "${{ github.workspace }}/tools/repair_windows_wheel.py" {wheel} {dest_dir} - CIBW_TEST_COMMAND: "pytest {project}/tests -v" + CIBW_TEST_COMMAND: "pytest {project}/test -v" CIBW_TEST_REQUIRES: pytest - name: Upload wheels diff --git a/pyproject.toml b/pyproject.toml index 6ab204e..55380a1 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -28,7 +28,7 @@ wheel.py-api = "cp312" build-verbosity = 1 build = "cp312-*" skip = "pp* *-musllinux* *-manylinux_i686* *-win32 *-macosx_x86_64" -test-command = "pytest {project}/tests -v" +test-command = "pytest {project}/test -v" test-requires = "pytest" [tool.cibuildwheel.macos.environment] From 8fbf28fcf98b1c074ab139472eccc566d759e8cc Mon Sep 17 00:00:00 2001 From: HPDell Date: Fri, 29 May 2026 11:04:41 +0800 Subject: [PATCH 04/16] fix: dependencies --- pyproject.toml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pyproject.toml b/pyproject.toml index 55380a1..683e565 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -10,6 +10,10 @@ readme = "README.md" authors = [ { name = "Yigong Hu", email = "yigong.hu@outlook.com" } ] +dependencies = [ + "numpy", + "geopandas", +] [project.urls] Homepage = "https://github.com/GWmodel-Lab/pygwmodel" From 6dfb21f8a2b945ad39c411c05f890440add11ccb Mon Sep 17 00:00:00 2001 From: HPDell Date: Fri, 29 May 2026 11:23:20 +0800 Subject: [PATCH 05/16] fix: test data file not found --- .github/workflows/cd.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml index 7192ac1..304fed1 100644 --- a/.github/workflows/cd.yml +++ b/.github/workflows/cd.yml @@ -70,11 +70,9 @@ jobs: fi CIBW_ENVIRONMENT_LINUX: > CMAKE_ARGS="-DWITH_TESTS=OFF" - PYGW_TEST_DATA="{project}/test/londonhp100.csv" CIBW_BEFORE_ALL_MACOS: brew install armadillo gsl openblas CIBW_ENVIRONMENT_MACOS: > CMAKE_ARGS="-DWITH_TESTS=OFF" - PYGW_TEST_DATA="{project}/test/londonhp100.csv" MACOSX_DEPLOYMENT_TARGET="15.0" CIBW_BEFORE_ALL_WINDOWS: | "%VCPKG_INSTALLATION_ROOT%\vcpkg.exe" install armadillo gsl openblas --triplet x64-windows @@ -82,7 +80,6 @@ jobs: CIBW_ENVIRONMENT_WINDOWS: > PATH="C:/vcpkg/installed/x64-windows/bin" CMAKE_ARGS="-DWITH_TESTS=OFF -DCMAKE_TOOLCHAIN_FILE=C:/vcpkg/scripts/buildsystems/vcpkg.cmake" - PYGW_TEST_DATA="{project}/test/londonhp100.csv" CIBW_REPAIR_WHEEL_COMMAND_WINDOWS: > python "${{ github.workspace }}/tools/repair_windows_wheel.py" {wheel} {dest_dir} CIBW_TEST_COMMAND: "pytest {project}/test -v" From 9f1955cf064773db5b44df36ec073c13bdb4275b Mon Sep 17 00:00:00 2001 From: HPDell Date: Fri, 29 May 2026 11:35:11 +0800 Subject: [PATCH 06/16] edit(cd): vcpkg on windows use tag 2026.04.27 --- .github/workflows/cd.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml index 304fed1..96f3caf 100644 --- a/.github/workflows/cd.yml +++ b/.github/workflows/cd.yml @@ -75,6 +75,9 @@ jobs: CMAKE_ARGS="-DWITH_TESTS=OFF" MACOSX_DEPLOYMENT_TARGET="15.0" CIBW_BEFORE_ALL_WINDOWS: | + cd /d "%VCPKG_INSTALLATION_ROOT%" + git fetch --tags + git switch --detach 2026.04.27 "%VCPKG_INSTALLATION_ROOT%\vcpkg.exe" install armadillo gsl openblas --triplet x64-windows CIBW_BEFORE_BUILD_WINDOWS: pip install delvewheel CIBW_ENVIRONMENT_WINDOWS: > From eac20f3b96a3f96121cb104203eb393a4b9f156c Mon Sep 17 00:00:00 2001 From: HPDell Date: Fri, 29 May 2026 11:40:31 +0800 Subject: [PATCH 07/16] fix(cd): where not found --- .github/workflows/cd.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml index 96f3caf..8edc716 100644 --- a/.github/workflows/cd.yml +++ b/.github/workflows/cd.yml @@ -81,7 +81,7 @@ jobs: "%VCPKG_INSTALLATION_ROOT%\vcpkg.exe" install armadillo gsl openblas --triplet x64-windows CIBW_BEFORE_BUILD_WINDOWS: pip install delvewheel CIBW_ENVIRONMENT_WINDOWS: > - PATH="C:/vcpkg/installed/x64-windows/bin" + PATH="C:/vcpkg/installed/x64-windows/bin;$PATH" CMAKE_ARGS="-DWITH_TESTS=OFF -DCMAKE_TOOLCHAIN_FILE=C:/vcpkg/scripts/buildsystems/vcpkg.cmake" CIBW_REPAIR_WHEEL_COMMAND_WINDOWS: > python "${{ github.workspace }}/tools/repair_windows_wheel.py" {wheel} {dest_dir} From 9bd7561c55c7b8a7fe77667938bce49266c90895 Mon Sep 17 00:00:00 2001 From: HPDell Date: Fri, 29 May 2026 11:49:36 +0800 Subject: [PATCH 08/16] fix(cd): windows vcpkg install openblas enable threads --- .github/workflows/cd.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml index 8edc716..1bc28b5 100644 --- a/.github/workflows/cd.yml +++ b/.github/workflows/cd.yml @@ -78,7 +78,7 @@ jobs: cd /d "%VCPKG_INSTALLATION_ROOT%" git fetch --tags git switch --detach 2026.04.27 - "%VCPKG_INSTALLATION_ROOT%\vcpkg.exe" install armadillo gsl openblas --triplet x64-windows + "%VCPKG_INSTALLATION_ROOT%\vcpkg.exe" install armadillo gsl openblas[threads] --triplet x64-windows CIBW_BEFORE_BUILD_WINDOWS: pip install delvewheel CIBW_ENVIRONMENT_WINDOWS: > PATH="C:/vcpkg/installed/x64-windows/bin;$PATH" From 87aa6a3ec23bed160da1ac8abf57e5c57a26f307 Mon Sep 17 00:00:00 2001 From: HPDell Date: Fri, 29 May 2026 12:01:26 +0800 Subject: [PATCH 09/16] fix: toolchain path --- .github/workflows/cd.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml index 1bc28b5..031fd4f 100644 --- a/.github/workflows/cd.yml +++ b/.github/workflows/cd.yml @@ -81,8 +81,8 @@ jobs: "%VCPKG_INSTALLATION_ROOT%\vcpkg.exe" install armadillo gsl openblas[threads] --triplet x64-windows CIBW_BEFORE_BUILD_WINDOWS: pip install delvewheel CIBW_ENVIRONMENT_WINDOWS: > - PATH="C:/vcpkg/installed/x64-windows/bin;$PATH" - CMAKE_ARGS="-DWITH_TESTS=OFF -DCMAKE_TOOLCHAIN_FILE=C:/vcpkg/scripts/buildsystems/vcpkg.cmake" + PATH="$VCPKG_INSTALLATION_ROOT/installed/x64-windows/bin;$PATH" + CMAKE_ARGS="-DWITH_TESTS=OFF -DCMAKE_TOOLCHAIN_FILE=$VCPKG_INSTALLATION_ROOT/scripts/buildsystems/vcpkg.cmake -DVCPKG_TARGET_TRIPLET=x64-windows" CIBW_REPAIR_WHEEL_COMMAND_WINDOWS: > python "${{ github.workspace }}/tools/repair_windows_wheel.py" {wheel} {dest_dir} CIBW_TEST_COMMAND: "pytest {project}/test -v" From 1268037dc9799ec9fa0f01ff31dc4da386dbd6db Mon Sep 17 00:00:00 2001 From: HPDell Date: Fri, 29 May 2026 12:25:11 +0800 Subject: [PATCH 10/16] fix(cd): windows environment variables --- .github/workflows/cd.yml | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml index 031fd4f..de2ec84 100644 --- a/.github/workflows/cd.yml +++ b/.github/workflows/cd.yml @@ -53,6 +53,14 @@ jobs: .$NUGET_EXE sources add -Source ${{ env.FEED_URL }} -Name github -UserName ${{ env.USERNAME }} -Password ${{ secrets.GITHUB_TOKEN }} -StorePasswordInClearText .$NUGET_EXE setapikey ${{ secrets.GITHUB_TOKEN }} -Source "${{ env.FEED_URL }}" + - name: Configure Vcpkg paths + if: runner.os == 'Windows' + shell: pwsh + run: | + $vcpkgRoot = $env:VCPKG_INSTALLATION_ROOT -replace '\\', '/' + "VCPKG_ROOT_FWD=$vcpkgRoot" >> $env:GITHUB_ENV + "SKBUILD_CMAKE_ARGS=-DWITH_TESTS=OFF;-DCMAKE_TOOLCHAIN_FILE=$vcpkgRoot/scripts/buildsystems/vcpkg.cmake;-DVCPKG_TARGET_TRIPLET=x64-windows" >> $env:GITHUB_ENV + - name: Build wheels run: python -m cibuildwheel --output-dir wheelhouse env: @@ -81,8 +89,8 @@ jobs: "%VCPKG_INSTALLATION_ROOT%\vcpkg.exe" install armadillo gsl openblas[threads] --triplet x64-windows CIBW_BEFORE_BUILD_WINDOWS: pip install delvewheel CIBW_ENVIRONMENT_WINDOWS: > - PATH="$VCPKG_INSTALLATION_ROOT/installed/x64-windows/bin;$PATH" - CMAKE_ARGS="-DWITH_TESTS=OFF -DCMAKE_TOOLCHAIN_FILE=$VCPKG_INSTALLATION_ROOT/scripts/buildsystems/vcpkg.cmake -DVCPKG_TARGET_TRIPLET=x64-windows" + PATH="$VCPKG_ROOT_FWD/installed/x64-windows/bin;$PATH" + SKBUILD_CMAKE_ARGS="$SKBUILD_CMAKE_ARGS" CIBW_REPAIR_WHEEL_COMMAND_WINDOWS: > python "${{ github.workspace }}/tools/repair_windows_wheel.py" {wheel} {dest_dir} CIBW_TEST_COMMAND: "pytest {project}/test -v" From 3f6a4f38829f183bf108d3da5be7e421b34cd078 Mon Sep 17 00:00:00 2001 From: HPDell Date: Fri, 29 May 2026 13:19:56 +0800 Subject: [PATCH 11/16] fix(cd): armadillo not found in windows --- .gitignore | 1 + CMakeLists.txt | 6 +++++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 25ef0cb..d0519ec 100644 --- a/.gitignore +++ b/.gitignore @@ -233,3 +233,4 @@ cython_debug/ # Sphinx !/doc/Makefile _build/ +.tmp* diff --git a/CMakeLists.txt b/CMakeLists.txt index dc488f1..66397ad 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -49,6 +49,11 @@ if(MSVC) add_definitions(-D_CRT_SECURE_NO_WARNINGS) endif(MSVC) +if(WIN32) + # Prefer package config files (e.g. vcpkg-provided Armadillo config) over CMake modules. + set(CMAKE_FIND_PACKAGE_PREFER_CONFIG ON) +endif() + add_subdirectory(libgwmodel) add_subdirectory(src) @@ -57,4 +62,3 @@ if(WITH_PYTESTS) enable_testing() add_subdirectory(test) endif(WITH_PYTESTS) - From 728f7798243547b29198f4c84b5b1c913a80a984 Mon Sep 17 00:00:00 2001 From: HPDell Date: Fri, 29 May 2026 13:25:23 +0800 Subject: [PATCH 12/16] edit: specify vcpkg find path --- .github/workflows/cd.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml index de2ec84..bac19ef 100644 --- a/.github/workflows/cd.yml +++ b/.github/workflows/cd.yml @@ -59,7 +59,7 @@ jobs: run: | $vcpkgRoot = $env:VCPKG_INSTALLATION_ROOT -replace '\\', '/' "VCPKG_ROOT_FWD=$vcpkgRoot" >> $env:GITHUB_ENV - "SKBUILD_CMAKE_ARGS=-DWITH_TESTS=OFF;-DCMAKE_TOOLCHAIN_FILE=$vcpkgRoot/scripts/buildsystems/vcpkg.cmake;-DVCPKG_TARGET_TRIPLET=x64-windows" >> $env:GITHUB_ENV + "SKBUILD_CMAKE_ARGS=-DWITH_TESTS=OFF;-DCMAKE_TOOLCHAIN_FILE=$vcpkgRoot/scripts/buildsystems/vcpkg.cmake;-DVCPKG_TARGET_TRIPLET=x64-windows;-DCMAKE_PREFIX_PATH=$vcpkgRoot/installed/x64-windows" >> $env:GITHUB_ENV - name: Build wheels run: python -m cibuildwheel --output-dir wheelhouse From 7bd1580e58dfee552287dcfda7891455a40a9d66 Mon Sep 17 00:00:00 2001 From: HPDell Date: Fri, 29 May 2026 13:43:43 +0800 Subject: [PATCH 13/16] fix(cd): install native dependencies on windows before cibuildwheel --- .github/workflows/cd.yml | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml index bac19ef..f00da64 100644 --- a/.github/workflows/cd.yml +++ b/.github/workflows/cd.yml @@ -41,7 +41,7 @@ jobs: shell: pwsh run: | cd "$env:VCPKG_INSTALLATION_ROOT" - git fetch + git fetch --tags git switch 2026.04.27 --detach - name: Setup NuGet Credentials @@ -53,13 +53,19 @@ jobs: .$NUGET_EXE sources add -Source ${{ env.FEED_URL }} -Name github -UserName ${{ env.USERNAME }} -Password ${{ secrets.GITHUB_TOKEN }} -StorePasswordInClearText .$NUGET_EXE setapikey ${{ secrets.GITHUB_TOKEN }} -Source "${{ env.FEED_URL }}" - - name: Configure Vcpkg paths + - name: Install native dependencies + if: runner.os == 'Windows' + shell: pwsh + run: | + $vcpkg = "$env:VCPKG_INSTALLATION_ROOT/vcpkg.exe" + & $vcpkg install armadillo gsl openblas[threads] --triplet x64-windows + + - name: Configure Vcpkg path if: runner.os == 'Windows' shell: pwsh run: | $vcpkgRoot = $env:VCPKG_INSTALLATION_ROOT -replace '\\', '/' "VCPKG_ROOT_FWD=$vcpkgRoot" >> $env:GITHUB_ENV - "SKBUILD_CMAKE_ARGS=-DWITH_TESTS=OFF;-DCMAKE_TOOLCHAIN_FILE=$vcpkgRoot/scripts/buildsystems/vcpkg.cmake;-DVCPKG_TARGET_TRIPLET=x64-windows;-DCMAKE_PREFIX_PATH=$vcpkgRoot/installed/x64-windows" >> $env:GITHUB_ENV - name: Build wheels run: python -m cibuildwheel --output-dir wheelhouse @@ -82,15 +88,10 @@ jobs: CIBW_ENVIRONMENT_MACOS: > CMAKE_ARGS="-DWITH_TESTS=OFF" MACOSX_DEPLOYMENT_TARGET="15.0" - CIBW_BEFORE_ALL_WINDOWS: | - cd /d "%VCPKG_INSTALLATION_ROOT%" - git fetch --tags - git switch --detach 2026.04.27 - "%VCPKG_INSTALLATION_ROOT%\vcpkg.exe" install armadillo gsl openblas[threads] --triplet x64-windows CIBW_BEFORE_BUILD_WINDOWS: pip install delvewheel CIBW_ENVIRONMENT_WINDOWS: > PATH="$VCPKG_ROOT_FWD/installed/x64-windows/bin;$PATH" - SKBUILD_CMAKE_ARGS="$SKBUILD_CMAKE_ARGS" + CMAKE_ARGS="-DWITH_TESTS=OFF -DCMAKE_TOOLCHAIN_FILE=$VCPKG_ROOT_FWD/scripts/buildsystems/vcpkg.cmake -DVCPKG_TARGET_TRIPLET=x64-windows -DCMAKE_PREFIX_PATH=$VCPKG_ROOT_FWD/installed/x64-windows" CIBW_REPAIR_WHEEL_COMMAND_WINDOWS: > python "${{ github.workspace }}/tools/repair_windows_wheel.py" {wheel} {dest_dir} CIBW_TEST_COMMAND: "pytest {project}/test -v" From 25d1c4ddd917ac286089472ea02070378bd3876d Mon Sep 17 00:00:00 2001 From: HPDell Date: Fri, 29 May 2026 14:22:10 +0800 Subject: [PATCH 14/16] edit: use abi3 --- CMakeLists.txt | 2 +- pyproject.toml | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 66397ad..30b4d1f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -29,7 +29,7 @@ endif() set(CMAKE_CXX_STANDARD 17) set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake) -find_package(Python 3.8 REQUIRED COMPONENTS Interpreter Development.Module) +find_package(Python 3.12 REQUIRED COMPONENTS Interpreter Development.Module Development.SABIModule) # Detect the installed nanobind package and import it into CMake execute_process( diff --git a/pyproject.toml b/pyproject.toml index 683e565..0dd56a2 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -7,6 +7,7 @@ name = "pygwmodel" version = "0.1.0" description = "A Python binding for GWmodel" readme = "README.md" +requires-python = ">=3.12" authors = [ { name = "Yigong Hu", email = "yigong.hu@outlook.com" } ] From b470d14000694242bcbaaf407000d18af6f6842e Mon Sep 17 00:00:00 2001 From: HPDell Date: Fri, 29 May 2026 14:58:05 +0800 Subject: [PATCH 15/16] fix(workflow: vcpkg source --- .github/workflows/cd.yml | 7 ++++--- .github/workflows/ci.yml | 7 ++++--- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml index f00da64..c8e9917 100644 --- a/.github/workflows/cd.yml +++ b/.github/workflows/cd.yml @@ -14,9 +14,9 @@ jobs: matrix: os: [ubuntu-latest, windows-latest, macos-latest] env: - USERNAME: GWmodel-Lab - FEED_URL: https://nuget.pkg.github.com/GWmodel-Lab/index.json - VCPKG_BINARY_SOURCES: "clear;nuget,github,readwrite" + USERNAME: ${{ github.repository_owner }} + FEED_URL: https://nuget.pkg.github.com/${{ github.repository_owner }}/index.json + VCPKG_BINARY_SOURCES: "clear;nuget,https://nuget.pkg.github.com/${{ github.repository_owner }}/index.json,readwrite" VCPKG_USE_NUGET_CACHE: 1 permissions: contents: read @@ -50,6 +50,7 @@ jobs: run: | $VCPKG_EXE="$env:VCPKG_INSTALLATION_ROOT/vcpkg.exe" $NUGET_EXE="$(.$VCPKG_EXE fetch nuget)" + .$NUGET_EXE sources remove -Name github -NonInteractive 2>$null .$NUGET_EXE sources add -Source ${{ env.FEED_URL }} -Name github -UserName ${{ env.USERNAME }} -Password ${{ secrets.GITHUB_TOKEN }} -StorePasswordInClearText .$NUGET_EXE setapikey ${{ secrets.GITHUB_TOKEN }} -Source "${{ env.FEED_URL }}" diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 6aad475..139a065 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -54,9 +54,9 @@ jobs: name: windows-latest runs-on: windows-latest env: - USERNAME: GWmodel-Lab - FEED_URL: https://nuget.pkg.github.com/GWmodel-Lab/index.json - VCPKG_BINARY_SOURCES: "clear;nuget,github,readwrite" + USERNAME: ${{ github.repository_owner }} + FEED_URL: https://nuget.pkg.github.com/${{ github.repository_owner }}/index.json + VCPKG_BINARY_SOURCES: "clear;nuget,https://nuget.pkg.github.com/${{ github.repository_owner }}/index.json,readwrite" VCPKG_USE_NUGET_CACHE: 1 permissions: contents: read @@ -80,6 +80,7 @@ jobs: run: | $VCPKG_EXE="$env:VCPKG_INSTALLATION_ROOT/vcpkg.exe" $NUGET_EXE="$(.$VCPKG_EXE fetch nuget)" + .$NUGET_EXE sources remove -Name github -NonInteractive 2>$null .$NUGET_EXE sources add -Source ${{ env.FEED_URL }} -Name github -UserName ${{ env.USERNAME }} -Password ${{ secrets.GITHUB_TOKEN }} -StorePasswordInClearText .$NUGET_EXE setapikey ${{ secrets.GITHUB_TOKEN }} -Source "${{ env.FEED_URL }}" From 217a6640f63ae3ab19785358465219475f0afc59 Mon Sep 17 00:00:00 2001 From: HPDell Date: Fri, 29 May 2026 15:05:40 +0800 Subject: [PATCH 16/16] version: drop to 0.0.1 --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 0dd56a2..bd65bd4 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -4,7 +4,7 @@ build-backend = "scikit_build_core.build" [project] name = "pygwmodel" -version = "0.1.0" +version = "0.0.1" description = "A Python binding for GWmodel" readme = "README.md" requires-python = ">=3.12"