From d18d276bbf111ac5ba91fe65a24558fc05730b2a Mon Sep 17 00:00:00 2001 From: "Harlow, Jordan" Date: Thu, 19 Mar 2026 13:04:53 -0600 Subject: [PATCH] chore: meta.yaml to accommodate numpy-base or numpy --- conda-recipe-cf/meta.yaml | 2 +- conda-recipe/meta.yaml | 13 +++++++++++-- docs/source/conf.py | 2 +- mkl_random/_version.py | 2 +- 4 files changed, 14 insertions(+), 5 deletions(-) diff --git a/conda-recipe-cf/meta.yaml b/conda-recipe-cf/meta.yaml index 47c4634..6eefee6 100644 --- a/conda-recipe-cf/meta.yaml +++ b/conda-recipe-cf/meta.yaml @@ -1,4 +1,4 @@ -{% set version = "1.4.0dev1" %} +{% set version = "1.4.0dev3" %} {% set buildnumber = 0 %} package: diff --git a/conda-recipe/meta.yaml b/conda-recipe/meta.yaml index 6877fec..b7382a3 100644 --- a/conda-recipe/meta.yaml +++ b/conda-recipe/meta.yaml @@ -1,3 +1,5 @@ +{% set use_numpy_base = environ.get('USE_NUMPY_BASE', 'true').lower() == 'true' %} + package: name: mkl_random version: {{ GIT_DESCRIBE_TAG }} @@ -23,14 +25,21 @@ requirements: - setuptools >=77 - mkl-devel - cython + {% if use_numpy_base %} - numpy-base + {% else %} + - numpy >=1.26.4 + {% endif %} - pip - wheel >=0.41.3 run: - python - python-gil # [py>=314] - - {{ pin_compatible('mkl', min_pin="x.x", max_pin="x") }} - - {{ pin_compatible('numpy-base', min_pin="x.x", max_pin="x") }} + {% if use_numpy_base %} + - numpy-base + {% else %} + - numpy >=1.26.4 + {% endif %} test: commands: diff --git a/docs/source/conf.py b/docs/source/conf.py index 666e0b3..a46a611 100644 --- a/docs/source/conf.py +++ b/docs/source/conf.py @@ -9,7 +9,7 @@ project = "mkl_random" copyright = "2017-2025, Intel Corp." author = "Intel Corp." -release = "1.4.0dev1" +release = "1.4.0dev3" # -- General configuration --------------------------------------------------- # https://www.sphinx-doc.org/en/master/usage/configuration.html#general-configuration diff --git a/mkl_random/_version.py b/mkl_random/_version.py index 2e16e46..94d7004 100644 --- a/mkl_random/_version.py +++ b/mkl_random/_version.py @@ -1 +1 @@ -__version__ = "1.4.0dev1" +__version__ = "1.4.0dev3"