From c9b85d489dbab249806f0faf32af1f5b4b489a9e Mon Sep 17 00:00:00 2001 From: Anton Volkov Date: Wed, 14 Oct 2026 14:33:02 +0200 Subject: [PATCH 1/3] Run the whole test suite in the conda recipes The recipes' test commands only ran test_basic.py, so test_patching.py, test_cli.py and test_freethreading.py were never run against the conda package. Switch both recipes to `pytest --pyargs mkl_umath`, matching the GitHub workflows, and drop source_files since the tests are installed with the package. Remove the run_tests.{sh,bat} scripts: they ran test_basic.py as a plain script, which runs no tests since it moved to pytest, and nothing calls them, as conda-build only picks up run_test.* (singular). --- CHANGELOG.md | 1 + conda-recipe-cf/AGENTS.md | 3 +-- conda-recipe-cf/meta.yaml | 4 +--- conda-recipe-cf/run_tests.bat | 1 - conda-recipe-cf/run_tests.sh | 2 -- conda-recipe/AGENTS.md | 3 +-- conda-recipe/meta.yaml | 4 +--- conda-recipe/run_tests.bat | 1 - conda-recipe/run_tests.sh | 2 -- 9 files changed, 5 insertions(+), 16 deletions(-) delete mode 100644 conda-recipe-cf/run_tests.bat delete mode 100644 conda-recipe-cf/run_tests.sh delete mode 100644 conda-recipe/run_tests.bat delete mode 100644 conda-recipe/run_tests.sh diff --git a/CHANGELOG.md b/CHANGELOG.md index 1e2fdd3e..7d136fa7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -13,6 +13,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Changed * Raised the minimum build-time `Cython` requirement to `3.1.0`, the first release providing the `freethreading_compatible` directive [gh-255](https://github.com/IntelPython/mkl_umath/pull/255) * Pinned Cython in the Coverity Scan workflow so generated code stays stable between scans, and added `coverity/README.md` documenting the known Cython-boilerplate false positives and the scan review checklist [gh-266](https://github.com/IntelPython/mkl_umath/pull/266) +* Conda recipes now run the whole test suite with `pytest --pyargs mkl_umath` instead of only `test_basic.py`, and the unused `run_tests.{sh,bat}` scripts were removed ### Fixed * Fixed `absolute` (float32/float64) returning `-NaN` for `+NaN` input on the scalar fallback path (same issue as numpy/numpy@dc478c58b9, gh-31433) [gh-269](https://github.com/IntelPython/mkl_umath/pull/269) diff --git a/conda-recipe-cf/AGENTS.md b/conda-recipe-cf/AGENTS.md index cea38d84..dcc7eef5 100644 --- a/conda-recipe-cf/AGENTS.md +++ b/conda-recipe-cf/AGENTS.md @@ -8,9 +8,8 @@ Conda-forge compatible build recipe (alternative to Intel channel recipe). - For conda-forge feedstock integration (if upstreamed) ## Files -- **meta.yaml** — conda-forge compatible metadata +- **meta.yaml** — conda-forge compatible metadata, test commands (`pytest --pyargs mkl_umath`) - **build.sh** / **bld.bat** — platform build scripts -- **run_tests.{sh,bat}** — test invocation ## Status - Not currently used in main CI workflows diff --git a/conda-recipe-cf/meta.yaml b/conda-recipe-cf/meta.yaml index 115a357d..583cbcd5 100644 --- a/conda-recipe-cf/meta.yaml +++ b/conda-recipe-cf/meta.yaml @@ -42,11 +42,9 @@ test: requires: - pip - pytest - source_files: - - mkl_umath/tests/test_basic.py commands: - pip check - - pytest mkl_umath/tests/test_basic.py + - pytest --pyargs mkl_umath imports: - mkl_umath - mkl_umath._ufuncs diff --git a/conda-recipe-cf/run_tests.bat b/conda-recipe-cf/run_tests.bat deleted file mode 100644 index 42b23a9e..00000000 --- a/conda-recipe-cf/run_tests.bat +++ /dev/null @@ -1 +0,0 @@ -%PYTHON% tests\test_basic.py diff --git a/conda-recipe-cf/run_tests.sh b/conda-recipe-cf/run_tests.sh deleted file mode 100644 index 219a5595..00000000 --- a/conda-recipe-cf/run_tests.sh +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/bash -$PYTHON tests/test_basic.py diff --git a/conda-recipe/AGENTS.md b/conda-recipe/AGENTS.md index c5bd2f93..e378ac6d 100644 --- a/conda-recipe/AGENTS.md +++ b/conda-recipe/AGENTS.md @@ -3,11 +3,10 @@ Conda package build recipe for Intel channel distribution. ## Files -- **meta.yaml** — package metadata, dependencies, build requirements +- **meta.yaml** — package metadata, dependencies, build requirements, test commands (`pytest --pyargs mkl_umath`) - **build.sh** — Linux build script - **bld.bat** — Windows build script - **conda_build_config.yaml** — build matrix (Python versions, numpy pins) -- **run_tests.{sh,bat}** — post-build test invocation ## Build configuration - **Channels:** `https://software.repos.intel.com/python/conda`, `conda-forge` diff --git a/conda-recipe/meta.yaml b/conda-recipe/meta.yaml index 44932c77..c2740829 100644 --- a/conda-recipe/meta.yaml +++ b/conda-recipe/meta.yaml @@ -44,10 +44,8 @@ requirements: test: requires: - pytest - source_files: - - mkl_umath/tests/test_basic.py commands: - - pytest mkl_umath/tests/test_basic.py + - pytest --pyargs mkl_umath imports: - mkl_umath - mkl_umath._ufuncs diff --git a/conda-recipe/run_tests.bat b/conda-recipe/run_tests.bat deleted file mode 100644 index 42b23a9e..00000000 --- a/conda-recipe/run_tests.bat +++ /dev/null @@ -1 +0,0 @@ -%PYTHON% tests\test_basic.py diff --git a/conda-recipe/run_tests.sh b/conda-recipe/run_tests.sh deleted file mode 100644 index 219a5595..00000000 --- a/conda-recipe/run_tests.sh +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/bash -$PYTHON tests/test_basic.py From 3e54dfba50b0ccbd401858abe083dc58849f6d27 Mon Sep 17 00:00:00 2001 From: Anton Volkov Date: Wed, 14 Oct 2026 14:33:22 +0200 Subject: [PATCH 2/3] Add PR link to the changelog entry --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7d136fa7..79a30081 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -13,7 +13,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Changed * Raised the minimum build-time `Cython` requirement to `3.1.0`, the first release providing the `freethreading_compatible` directive [gh-255](https://github.com/IntelPython/mkl_umath/pull/255) * Pinned Cython in the Coverity Scan workflow so generated code stays stable between scans, and added `coverity/README.md` documenting the known Cython-boilerplate false positives and the scan review checklist [gh-266](https://github.com/IntelPython/mkl_umath/pull/266) -* Conda recipes now run the whole test suite with `pytest --pyargs mkl_umath` instead of only `test_basic.py`, and the unused `run_tests.{sh,bat}` scripts were removed +* Conda recipes now run the whole test suite with `pytest --pyargs mkl_umath` instead of only `test_basic.py`, and the unused `run_tests.{sh,bat}` scripts were removed [gh-283](https://github.com/IntelPython/mkl_umath/pull/283) ### Fixed * Fixed `absolute` (float32/float64) returning `-NaN` for `+NaN` input on the scalar fallback path (same issue as numpy/numpy@dc478c58b9, gh-31433) [gh-269](https://github.com/IntelPython/mkl_umath/pull/269) From 7d57828b0c21d555db45d20a71cb94e612d03423 Mon Sep 17 00:00:00 2001 From: Anton Volkov Date: Thu, 15 Oct 2026 19:45:12 +0200 Subject: [PATCH 3/3] Move the changelog entry under a new [dev] section --- CHANGELOG.md | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 79a30081..16de8ade 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,11 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). +## [dev] - YYYY-MM-DD + +### Changed +* Conda recipes now run the whole test suite with `pytest --pyargs mkl_umath` instead of only `test_basic.py`, and the unused `run_tests.{sh,bat}` scripts were removed [gh-283](https://github.com/IntelPython/mkl_umath/pull/283) + ## [0.6.0] - 2026-10-15 ### Added @@ -13,7 +18,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Changed * Raised the minimum build-time `Cython` requirement to `3.1.0`, the first release providing the `freethreading_compatible` directive [gh-255](https://github.com/IntelPython/mkl_umath/pull/255) * Pinned Cython in the Coverity Scan workflow so generated code stays stable between scans, and added `coverity/README.md` documenting the known Cython-boilerplate false positives and the scan review checklist [gh-266](https://github.com/IntelPython/mkl_umath/pull/266) -* Conda recipes now run the whole test suite with `pytest --pyargs mkl_umath` instead of only `test_basic.py`, and the unused `run_tests.{sh,bat}` scripts were removed [gh-283](https://github.com/IntelPython/mkl_umath/pull/283) ### Fixed * Fixed `absolute` (float32/float64) returning `-NaN` for `+NaN` input on the scalar fallback path (same issue as numpy/numpy@dc478c58b9, gh-31433) [gh-269](https://github.com/IntelPython/mkl_umath/pull/269)