From e5ab767e2c18774e7b2e7b1a83f5afe76f9f1ad2 Mon Sep 17 00:00:00 2001 From: Vahid Tavanashad Date: Thu, 7 Aug 2025 09:03:35 -0700 Subject: [PATCH 1/3] update recipe to use numpy-base --- conda-recipe/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conda-recipe/meta.yaml b/conda-recipe/meta.yaml index ff04c92..dee05bf 100644 --- a/conda-recipe/meta.yaml +++ b/conda-recipe/meta.yaml @@ -27,7 +27,7 @@ requirements: run: - python - {{ pin_compatible('mkl', min_pin="x.x", max_pin="x") }} - - {{ pin_compatible('numpy', min_pin="x.x", max_pin="x") }} + - {{ pin_compatible('numpy-base', min_pin="x.x", max_pin="x") }} test: commands: From 856c3975af4cee5cd8d76766c01ce676cce08e80 Mon Sep 17 00:00:00 2001 From: Vahid Tavanashad Date: Fri, 8 Aug 2025 17:27:59 -0700 Subject: [PATCH 2/3] correct channel order --- .github/workflows/conda-package.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/conda-package.yml b/.github/workflows/conda-package.yml index 924bd30..ac10c7b 100644 --- a/.github/workflows/conda-package.yml +++ b/.github/workflows/conda-package.yml @@ -46,7 +46,7 @@ jobs: run: conda install conda-build - name: Build conda package run: | - CHANNELS="-c conda-forge -c https://software.repos.intel.com/python/conda --override-channels" + CHANNELS="-c https://software.repos.intel.com/python/conda -c conda-forge --override-channels" VERSIONS="--python ${{ matrix.python }}" TEST="--no-test" @@ -114,7 +114,7 @@ jobs: runner: [ubuntu-latest] continue-on-error: ${{ matrix.experimental }} env: - CHANNELS: -c conda-forge -c https://software.repos.intel.com/python/conda --override-channels + CHANNELS: -c https://software.repos.intel.com/python/conda -c conda-forge --override-channels steps: - name: Download artifact @@ -182,7 +182,7 @@ jobs: runner: [windows-latest] continue-on-error: ${{ matrix.experimental }} env: - CHANNELS: -c conda-forge -c https://software.repos.intel.com/python/conda --override-channels + CHANNELS: -c https://software.repos.intel.com/python/conda -c conda-forge --override-channels steps: - name: Download artifact From 3647624d3f680a246b8eff4b42d5a91d105b85fe Mon Sep 17 00:00:00 2001 From: Vahid Tavanashad Date: Fri, 8 Aug 2025 17:45:38 -0700 Subject: [PATCH 3/3] specify numpy version for each python version --- .github/workflows/conda-package.yml | 33 +++++++++++++++++------------ 1 file changed, 20 insertions(+), 13 deletions(-) diff --git a/.github/workflows/conda-package.yml b/.github/workflows/conda-package.yml index ac10c7b..5c237ac 100644 --- a/.github/workflows/conda-package.yml +++ b/.github/workflows/conda-package.yml @@ -104,15 +104,18 @@ jobs: test_linux: needs: build_linux - runs-on: ${{ matrix.runner }} - + runs-on: ubuntu-latest strategy: matrix: - python: ["3.9", "3.10", "3.11", "3.12"] - numpy: ['1.26*'] - experimental: [false] - runner: [ubuntu-latest] - continue-on-error: ${{ matrix.experimental }} + include: + - python: '3.9' + numpy: '1.26' + - python: '3.10' + numpy: '2.2' + - python: '3.11' + numpy: '2.2' + - python: '3.12' + numpy: '2.2' env: CHANNELS: -c https://software.repos.intel.com/python/conda -c conda-forge --override-channels @@ -172,15 +175,19 @@ jobs: test_windows: needs: build_windows - runs-on: ${{ matrix.runner }} + runs-on: windows-latest strategy: matrix: - python: ["3.9", "3.10", "3.11", "3.12"] - numpy: ['1.26*'] - experimental: [false] - runner: [windows-latest] - continue-on-error: ${{ matrix.experimental }} + include: + - python: '3.9' + numpy: '1.26' + - python: '3.10' + numpy: '2.2' + - python: '3.11' + numpy: '2.2' + - python: '3.12' + numpy: '2.2' env: CHANNELS: -c https://software.repos.intel.com/python/conda -c conda-forge --override-channels