From db04ba837b658c971cc8bdb027b481a346ba1409 Mon Sep 17 00:00:00 2001 From: Ted Kisner Date: Sat, 16 Dec 2023 22:07:15 -0800 Subject: [PATCH] Change numpy pinning --- config/common.txt | 2 +- pkgs/moby2/meta.yaml | 2 +- pkgs/pixell/meta.yaml | 3 ++- pkgs/qpoint/meta.yaml | 2 +- pkgs/so3g/meta.yaml | 2 +- pkgs/toast/meta.yaml | 3 ++- 6 files changed, 8 insertions(+), 6 deletions(-) diff --git a/config/common.txt b/config/common.txt index ee3cbf0..9d80cc2 100644 --- a/config/common.txt +++ b/config/common.txt @@ -24,7 +24,7 @@ liblapacke=*=*openblas # # Install requirements of our local and pip packages # -numpy +numpy=1.26.* scipy matplotlib cmake diff --git a/pkgs/moby2/meta.yaml b/pkgs/moby2/meta.yaml index 81c8167..3ba97a7 100644 --- a/pkgs/moby2/meta.yaml +++ b/pkgs/moby2/meta.yaml @@ -35,7 +35,7 @@ requirements: - gsl - libactpol - future - - numpy + - numpy=1.26.* # Although not a dependency, we put numba here to force # building with a numba-compatible numpy version - numba diff --git a/pkgs/pixell/meta.yaml b/pkgs/pixell/meta.yaml index 362790b..b900e94 100644 --- a/pkgs/pixell/meta.yaml +++ b/pkgs/pixell/meta.yaml @@ -35,6 +35,7 @@ requirements: - libtool - python - cython + - numpy=1.26.* - scipy - astropy - healpy @@ -54,7 +55,7 @@ requirements: - libblas * *openblas - liblapack * *openblas - python - - numpy + - {{ pin_compatible('numpy') }} - scipy - astropy - healpy diff --git a/pkgs/qpoint/meta.yaml b/pkgs/qpoint/meta.yaml index f8d2747..c61bc70 100644 --- a/pkgs/qpoint/meta.yaml +++ b/pkgs/qpoint/meta.yaml @@ -27,7 +27,7 @@ requirements: - libgomp # [linux] - python - setuptools - - numpy + - numpy=1.26.* # Although not a dependency, we put numba here to force # building with a numba-compatible numpy version - numba diff --git a/pkgs/so3g/meta.yaml b/pkgs/so3g/meta.yaml index 414f4b8..5dc783b 100644 --- a/pkgs/so3g/meta.yaml +++ b/pkgs/so3g/meta.yaml @@ -37,7 +37,7 @@ requirements: - libblas * *openblas - liblapack * *openblas - python - - numpy + - numpy=1.26.* - scipy - boost - libboost-devel diff --git a/pkgs/toast/meta.yaml b/pkgs/toast/meta.yaml index dfe885c..2fc5c1a 100644 --- a/pkgs/toast/meta.yaml +++ b/pkgs/toast/meta.yaml @@ -36,6 +36,7 @@ requirements: - libblas * *openblas - liblapack * *openblas - python + - numpy=1.26.* - fftw - suitesparse - libaatm @@ -46,7 +47,7 @@ requirements: - libblas * *openblas - liblapack * *openblas - python - - numpy + - {{ pin_compatible('numpy') }} - {{ pin_compatible('fftw') }} - {{ pin_compatible('suitesparse') }} - {{ pin_compatible('libaatm') }}