From afee6ed106b739ea8c2d8ebd34193170947d873f Mon Sep 17 00:00:00 2001 From: Varun Agrawal Date: Tue, 25 Jun 2024 18:02:55 -0400 Subject: [PATCH 1/4] update MSVC toolset version --- .github/workflows/build-python.yml | 2 +- .github/workflows/build-windows.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-python.yml b/.github/workflows/build-python.yml index 4ce6030233..a3e3e33478 100644 --- a/.github/workflows/build-python.yml +++ b/.github/workflows/build-python.yml @@ -109,7 +109,7 @@ jobs: uses: ilammy/msvc-dev-cmd@v1 with: arch: x${{matrix.platform}} - toolset: 14.2 + toolset: 14.40 - name: cl version (Windows) if: runner.os == 'Windows' diff --git a/.github/workflows/build-windows.yml b/.github/workflows/build-windows.yml index 17306b66f5..dcf742c059 100644 --- a/.github/workflows/build-windows.yml +++ b/.github/workflows/build-windows.yml @@ -50,7 +50,7 @@ jobs: uses: ilammy/msvc-dev-cmd@v1 with: arch: x${{ matrix.platform }} - toolset: 14.2 + toolset: 14.40 - name: cl version shell: cmd From f29ece9b60e5c1dfd35dab300fcf82a7fa88e94e Mon Sep 17 00:00:00 2001 From: Varun Agrawal Date: Wed, 26 Jun 2024 12:46:36 -0400 Subject: [PATCH 2/4] update setup-python action version --- .github/workflows/build-python.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build-python.yml b/.github/workflows/build-python.yml index a3e3e33478..879777cc97 100644 --- a/.github/workflows/build-python.yml +++ b/.github/workflows/build-python.yml @@ -2,8 +2,8 @@ name: Python CI on: [pull_request] -# Every time you make a push to your PR, it cancel immediately the previous checks, -# and start a new one. The other runner will be available more quickly to your PR. +# Every time you make a push to your PR, it cancel immediately the previous checks, +# and start a new one. The other runner will be available more quickly to your PR. concurrency: group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }} cancel-in-progress: true @@ -19,7 +19,7 @@ jobs: CMAKE_BUILD_TYPE: ${{ matrix.build_type }} PYTHON_VERSION: ${{ matrix.python_version }} BOOST_VERSION: 1.72.0 - BOOST_EXE: boost_1_72_0-msvc-14.2 + BOOST_EXE: boost_1_72_0-msvc-14.2 strategy: fail-fast: true @@ -117,7 +117,7 @@ jobs: run: cl - name: Setup python (Windows) - uses: actions/setup-python@v4 + uses: actions/setup-python@v5 if: runner.os == 'Windows' with: python-version: ${{ matrix.python_version }} From 75f9a901f3ee471172592ae92d604136e37b6cb6 Mon Sep 17 00:00:00 2001 From: Varun Agrawal Date: Thu, 27 Jun 2024 21:54:50 -0400 Subject: [PATCH 3/4] restrict numpy to under v2.0.0 --- python/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/python/requirements.txt b/python/requirements.txt index 099cc80d60..81193bc557 100644 --- a/python/requirements.txt +++ b/python/requirements.txt @@ -1 +1 @@ -numpy>=1.11.0 +numpy~=1.11.0 From 788826a72a3462337ebcd074e67680e450d8fcaa Mon Sep 17 00:00:00 2001 From: Varun Agrawal Date: Fri, 28 Jun 2024 09:15:58 -0400 Subject: [PATCH 4/4] more explicit numpy version to avoid compiler issues --- python/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/python/requirements.txt b/python/requirements.txt index 81193bc557..d117e48f98 100644 --- a/python/requirements.txt +++ b/python/requirements.txt @@ -1 +1 @@ -numpy~=1.11.0 +numpy>=1.11.0,<2.0.0