From 07f441f6b39a9c996ddd500d0e808e2900c7f28b Mon Sep 17 00:00:00 2001 From: Nikita Grigorian Date: Tue, 3 Jun 2025 15:29:40 -0700 Subject: [PATCH 1/4] Use `windows-latest` in GH CI --- .github/workflows/conda-package.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/conda-package.yml b/.github/workflows/conda-package.yml index a4fde32..acdda35 100644 --- a/.github/workflows/conda-package.yml +++ b/.github/workflows/conda-package.yml @@ -142,7 +142,7 @@ jobs: pytest -v --pyargs ${{ env.PACKAGE_NAME }} build_windows: - runs-on: windows-2019 + runs-on: windows-latest strategy: matrix: @@ -211,7 +211,7 @@ jobs: matrix: python: ["3.9", "3.10", "3.11", "3.12"] experimental: [false] - runner: [windows-2019] + runner: [windows-latest] continue-on-error: ${{ matrix.experimental }} env: workdir: '${{ github.workspace }}' From a2dd3db5173fff5913664ee0cb600cbe075c93fe Mon Sep 17 00:00:00 2001 From: Nikita Grigorian Date: Tue, 3 Jun 2025 15:29:45 -0700 Subject: [PATCH 2/4] Add conda_build_config.yaml to conda-recipe --- conda-recipe/conda_build_config.yaml | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 conda-recipe/conda_build_config.yaml diff --git a/conda-recipe/conda_build_config.yaml b/conda-recipe/conda_build_config.yaml new file mode 100644 index 0000000..d2faad7 --- /dev/null +++ b/conda-recipe/conda_build_config.yaml @@ -0,0 +1,12 @@ +numpy: + - '1.25' +c_compiler: # [linux] + - gcc # [linux] +cxx_compiler: # [linux] + - gxx # [linux] +cxx_compiler_version: # [linux] + - '14' # [linux] +cxx_compiler: # [win] + - vs2022 # [win] +c_compiler: # [win] + - vs2022 # [win] From ed82b0deb4aee8a1e1e257a401a8b0336c8452f7 Mon Sep 17 00:00:00 2001 From: Nikita Grigorian Date: Tue, 3 Jun 2025 16:09:07 -0700 Subject: [PATCH 3/4] Use stdlib("c") instead of sysroot --- conda-recipe/conda_build_config.yaml | 6 ++++++ conda-recipe/meta.yaml | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/conda-recipe/conda_build_config.yaml b/conda-recipe/conda_build_config.yaml index d2faad7..c8b8c8d 100644 --- a/conda-recipe/conda_build_config.yaml +++ b/conda-recipe/conda_build_config.yaml @@ -6,6 +6,12 @@ cxx_compiler: # [linux] - gxx # [linux] cxx_compiler_version: # [linux] - '14' # [linux] +c_stdlib: # [linux] + - sysroot # [linux] +c_stdlib_version: # [linux] + - '2.28' # [linux] +c_stdlib: # [win] + - vs # [win] cxx_compiler: # [win] - vs2022 # [win] c_compiler: # [win] diff --git a/conda-recipe/meta.yaml b/conda-recipe/meta.yaml index 35b7111..71729f0 100644 --- a/conda-recipe/meta.yaml +++ b/conda-recipe/meta.yaml @@ -17,8 +17,8 @@ requirements: build: - {{ compiler('c') }} - {{ compiler('cxx') }} + - {{ stdlib('c') }} - {{ compiler('dpcpp') }} >=2024.2 # [not osx] - - sysroot_linux-64 >=2.28 # [linux] host: - setuptools >=77 - cmake From 84bf785af233536c3ff57b6bee0c47c98d7fc836 Mon Sep 17 00:00:00 2001 From: Nikita Grigorian Date: Tue, 3 Jun 2025 16:13:13 -0700 Subject: [PATCH 4/4] Specify numpy 1.26.4 in conda_build_config --- conda-recipe/conda_build_config.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conda-recipe/conda_build_config.yaml b/conda-recipe/conda_build_config.yaml index c8b8c8d..b5671eb 100644 --- a/conda-recipe/conda_build_config.yaml +++ b/conda-recipe/conda_build_config.yaml @@ -1,5 +1,5 @@ numpy: - - '1.25' + - '1.26.4' c_compiler: # [linux] - gcc # [linux] cxx_compiler: # [linux]