Merge pull request #269 from roceb/tickets/DM-46144

DM-46144: Pin libblas to use openblas for rubin-env
conda-forge · Sep 6, 2024 · 7c4ebad · 7c4ebad
2 parents b73c468 + 69e45e2
commit 7c4ebad
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 2 deletions.
diff --git a/.ci_support/linux_64_.yaml b/.ci_support/linux_64_.yaml
@@ -58,6 +58,8 @@ ndarray:
 - '1'
 numpy:
 - 1.26.4
+openblas:
+- 0.3.*
 pin_run_as_build:
   python:
     min_pin: x.x

diff --git a/.ci_support/linux_aarch64_.yaml b/.ci_support/linux_aarch64_.yaml
@@ -60,6 +60,8 @@ ndarray:
 - '1'
 numpy:
 - 1.26.4
+openblas:
+- 0.3.*
 pin_run_as_build:
   python:
     min_pin: x.x

diff --git a/.ci_support/osx_64_.yaml b/.ci_support/osx_64_.yaml
@@ -60,6 +60,8 @@ ndarray:
 - '1'
 numpy:
 - 1.26.4
+openblas:
+- 0.3.*
 pin_run_as_build:
   python:
     min_pin: x.x

diff --git a/.ci_support/osx_arm64_.yaml b/.ci_support/osx_arm64_.yaml
@@ -60,6 +60,8 @@ ndarray:
 - '1'
 numpy:
 - 1.26.4
+openblas:
+- 0.3.*
 pin_run_as_build:
   python:
     min_pin: x.x

diff --git a/build-locally.py b/build-locally.py
diff --git a/recipe/meta.yaml b/recipe/meta.yaml
@@ -1,6 +1,6 @@
 {% set name = "rubin-env" %}
 {% set version = "9.0.0" %}
-{% set build_number = 3 %}
+{% set build_number = 4 %}
 
 package:
   name: {{ name }}
@@ -35,6 +35,7 @@ outputs:
         - liblapack
         - liblapacke
         - log4cxx
+        - openblas
         - minuit2
         - numpy
         - starlink-ast
@@ -63,6 +64,8 @@ outputs:
         - doxygen >=1.9.8
         - eups >=2.2.8
         - flake8 ==7.1.0
+        - libblas * *openblas
+        - openblas
         - make >=4.3
         - meson >=1.3.0
         - nose >=1.3.7
-Original file line number
+Diff line change
@@ Expand Up / @@ -58,6 +58,8 @@ ndarray: @@
     - '1'
     numpy:
     - 1.26.4
+    openblas:
+    - 0.3.*
     pin_run_as_build:
       python:
         min_pin: x.x
@@ Expand Down @@