From 87f59ad52a9ad31879ebcf3746ed8a2426530187 Mon Sep 17 00:00:00 2001 From: Matthew Feickert Date: Thu, 7 Sep 2023 19:34:43 -0500 Subject: [PATCH 1/3] MNT: Move pooch to a test dependency * Remove pooch as an install dependency to avoid distributing optional dependencies without user request. --- recipe/meta.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 7eaafdd5..86a040e0 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -32,7 +32,7 @@ source: folder: base/scipy/sparse/linalg/_propack/PROPACK build: - number: 0 + number: 1 skip: true # [py<39] requirements: @@ -106,8 +106,6 @@ outputs: - python # see np_maxversion in https://github.com/scipy/scipy/blob/v{{ version }}/setup.py - {{ pin_compatible('numpy', upper_bound='1.28') }} - # needed for scipy.datasets - - pooch test: requires: - pytest @@ -233,6 +231,8 @@ outputs: - pytest-timeout - pytest-xdist # [not (win and python_impl == "pypy")] - mpmath + # needed for scipy.datasets + - pooch commands: {% set tests_to_skip = "_not_a_real_test" %} # skip a test that fails with MKL + AVX512 (non-AVX512 passes), scipy/scipy#15533 From d9699631f92b66bfebead76e9f757a7ccfbb579f Mon Sep 17 00:00:00 2001 From: "conda-forge-webservices[bot]" <91080706+conda-forge-webservices[bot]@users.noreply.github.com> Date: Fri, 8 Sep 2023 00:40:11 +0000 Subject: [PATCH 2/3] MNT: Re-rendered with conda-build 3.26.1, conda-smithy 3.25.1, and conda-forge-pinning 2023.09.07.15.45.04 --- .azure-pipelines/azure-pipelines-linux.yml | 36 +++++----- .azure-pipelines/azure-pipelines-osx.yml | 20 +++--- .azure-pipelines/azure-pipelines-win.yml | 12 ++-- ...on3.10.____cpythonpython_implcpython.yaml} | 2 +- ...python3.9.____73_pypypython_implpypy.yaml} | 2 +- ...hon3.9.____cpythonpython_implcpython.yaml} | 2 +- ...on3.10.____cpythonpython_implcpython.yaml} | 2 +- ...python3.9.____73_pypypython_implpypy.yaml} | 2 +- ...hon3.9.____cpythonpython_implcpython.yaml} | 2 +- ...on3.10.____cpythonpython_implcpython.yaml} | 2 +- ...python3.9.____73_pypypython_implpypy.yaml} | 2 +- ...hon3.9.____cpythonpython_implcpython.yaml} | 2 +- ...on3.10.____cpythonpython_implcpython.yaml} | 2 +- ...python3.9.____73_pypypython_implpypy.yaml} | 2 +- ...hon3.9.____cpythonpython_implcpython.yaml} | 2 +- ...rm64_numpy1.22python3.10.____cpython.yaml} | 2 +- ...arm64_numpy1.22python3.9.____cpython.yaml} | 2 +- ...on3.10.____cpythonpython_implcpython.yaml} | 2 +- ...python3.9.____73_pypypython_implpypy.yaml} | 2 +- ...hon3.9.____cpythonpython_implcpython.yaml} | 2 +- README.md | 68 +++++++++---------- 21 files changed, 85 insertions(+), 85 deletions(-) rename .ci_support/{linux_64_numpy1.21python3.10.____cpythonpython_implcpython.yaml => linux_64_numpy1.22python3.10.____cpythonpython_implcpython.yaml} (98%) rename .ci_support/{linux_64_numpy1.21python3.9.____73_pypypython_implpypy.yaml => linux_64_numpy1.22python3.9.____73_pypypython_implpypy.yaml} (98%) rename .ci_support/{linux_64_numpy1.21python3.9.____cpythonpython_implcpython.yaml => linux_64_numpy1.22python3.9.____cpythonpython_implcpython.yaml} (98%) rename .ci_support/{linux_aarch64_numpy1.21python3.10.____cpythonpython_implcpython.yaml => linux_aarch64_numpy1.22python3.10.____cpythonpython_implcpython.yaml} (98%) rename .ci_support/{linux_aarch64_numpy1.21python3.9.____73_pypypython_implpypy.yaml => linux_aarch64_numpy1.22python3.9.____73_pypypython_implpypy.yaml} (98%) rename .ci_support/{linux_aarch64_numpy1.21python3.9.____cpythonpython_implcpython.yaml => linux_aarch64_numpy1.22python3.9.____cpythonpython_implcpython.yaml} (98%) rename .ci_support/{linux_ppc64le_numpy1.21python3.10.____cpythonpython_implcpython.yaml => linux_ppc64le_numpy1.22python3.10.____cpythonpython_implcpython.yaml} (98%) rename .ci_support/{linux_ppc64le_numpy1.21python3.9.____73_pypypython_implpypy.yaml => linux_ppc64le_numpy1.22python3.9.____73_pypypython_implpypy.yaml} (98%) rename .ci_support/{linux_ppc64le_numpy1.21python3.9.____cpythonpython_implcpython.yaml => linux_ppc64le_numpy1.22python3.9.____cpythonpython_implcpython.yaml} (98%) rename .ci_support/{osx_64_numpy1.21python3.10.____cpythonpython_implcpython.yaml => osx_64_numpy1.22python3.10.____cpythonpython_implcpython.yaml} (98%) rename .ci_support/{osx_64_numpy1.21python3.9.____73_pypypython_implpypy.yaml => osx_64_numpy1.22python3.9.____73_pypypython_implpypy.yaml} (98%) rename .ci_support/{osx_64_numpy1.21python3.9.____cpythonpython_implcpython.yaml => osx_64_numpy1.22python3.9.____cpythonpython_implcpython.yaml} (98%) rename .ci_support/{osx_arm64_numpy1.21python3.10.____cpython.yaml => osx_arm64_numpy1.22python3.10.____cpython.yaml} (98%) rename .ci_support/{osx_arm64_numpy1.21python3.9.____cpython.yaml => osx_arm64_numpy1.22python3.9.____cpython.yaml} (98%) rename .ci_support/{win_64_numpy1.21python3.10.____cpythonpython_implcpython.yaml => win_64_numpy1.22python3.10.____cpythonpython_implcpython.yaml} (97%) rename .ci_support/{win_64_numpy1.21python3.9.____73_pypypython_implpypy.yaml => win_64_numpy1.22python3.9.____73_pypypython_implpypy.yaml} (97%) rename .ci_support/{win_64_numpy1.21python3.9.____cpythonpython_implcpython.yaml => win_64_numpy1.22python3.9.____cpythonpython_implcpython.yaml} (97%) diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml index 60b4c974..18999872 100755 --- a/.azure-pipelines/azure-pipelines-linux.yml +++ b/.azure-pipelines/azure-pipelines-linux.yml @@ -8,48 +8,48 @@ jobs: vmImage: ubuntu-latest strategy: matrix: - linux_64_numpy1.21python3.10.____cpythonpython_implcpython: - CONFIG: linux_64_numpy1.21python3.10.____cpythonpython_implcpython + linux_64_numpy1.22python3.10.____cpythonpython_implcpython: + CONFIG: linux_64_numpy1.22python3.10.____cpythonpython_implcpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_64_numpy1.21python3.9.____73_pypypython_implpypy: - CONFIG: linux_64_numpy1.21python3.9.____73_pypypython_implpypy + linux_64_numpy1.22python3.9.____73_pypypython_implpypy: + CONFIG: linux_64_numpy1.22python3.9.____73_pypypython_implpypy UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_64_numpy1.21python3.9.____cpythonpython_implcpython: - CONFIG: linux_64_numpy1.21python3.9.____cpythonpython_implcpython + linux_64_numpy1.22python3.9.____cpythonpython_implcpython: + CONFIG: linux_64_numpy1.22python3.9.____cpythonpython_implcpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 linux_64_numpy1.23python3.11.____cpythonpython_implcpython: CONFIG: linux_64_numpy1.23python3.11.____cpythonpython_implcpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_aarch64_numpy1.21python3.10.____cpythonpython_implcpython: - CONFIG: linux_aarch64_numpy1.21python3.10.____cpythonpython_implcpython + linux_aarch64_numpy1.22python3.10.____cpythonpython_implcpython: + CONFIG: linux_aarch64_numpy1.22python3.10.____cpythonpython_implcpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_aarch64_numpy1.21python3.9.____73_pypypython_implpypy: - CONFIG: linux_aarch64_numpy1.21python3.9.____73_pypypython_implpypy + linux_aarch64_numpy1.22python3.9.____73_pypypython_implpypy: + CONFIG: linux_aarch64_numpy1.22python3.9.____73_pypypython_implpypy UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_aarch64_numpy1.21python3.9.____cpythonpython_implcpython: - CONFIG: linux_aarch64_numpy1.21python3.9.____cpythonpython_implcpython + linux_aarch64_numpy1.22python3.9.____cpythonpython_implcpython: + CONFIG: linux_aarch64_numpy1.22python3.9.____cpythonpython_implcpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 linux_aarch64_numpy1.23python3.11.____cpythonpython_implcpython: CONFIG: linux_aarch64_numpy1.23python3.11.____cpythonpython_implcpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_ppc64le_numpy1.21python3.10.____cpythonpython_implcpython: - CONFIG: linux_ppc64le_numpy1.21python3.10.____cpythonpython_implcpython + linux_ppc64le_numpy1.22python3.10.____cpythonpython_implcpython: + CONFIG: linux_ppc64le_numpy1.22python3.10.____cpythonpython_implcpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_ppc64le_numpy1.21python3.9.____73_pypypython_implpypy: - CONFIG: linux_ppc64le_numpy1.21python3.9.____73_pypypython_implpypy + linux_ppc64le_numpy1.22python3.9.____73_pypypython_implpypy: + CONFIG: linux_ppc64le_numpy1.22python3.9.____73_pypypython_implpypy UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_ppc64le_numpy1.21python3.9.____cpythonpython_implcpython: - CONFIG: linux_ppc64le_numpy1.21python3.9.____cpythonpython_implcpython + linux_ppc64le_numpy1.22python3.9.____cpythonpython_implcpython: + CONFIG: linux_ppc64le_numpy1.22python3.9.____cpythonpython_implcpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 linux_ppc64le_numpy1.23python3.11.____cpythonpython_implcpython: diff --git a/.azure-pipelines/azure-pipelines-osx.yml b/.azure-pipelines/azure-pipelines-osx.yml index fd31c900..333fb552 100755 --- a/.azure-pipelines/azure-pipelines-osx.yml +++ b/.azure-pipelines/azure-pipelines-osx.yml @@ -8,23 +8,23 @@ jobs: vmImage: macOS-11 strategy: matrix: - osx_64_numpy1.21python3.10.____cpythonpython_implcpython: - CONFIG: osx_64_numpy1.21python3.10.____cpythonpython_implcpython + osx_64_numpy1.22python3.10.____cpythonpython_implcpython: + CONFIG: osx_64_numpy1.22python3.10.____cpythonpython_implcpython UPLOAD_PACKAGES: 'True' - osx_64_numpy1.21python3.9.____73_pypypython_implpypy: - CONFIG: osx_64_numpy1.21python3.9.____73_pypypython_implpypy + osx_64_numpy1.22python3.9.____73_pypypython_implpypy: + CONFIG: osx_64_numpy1.22python3.9.____73_pypypython_implpypy UPLOAD_PACKAGES: 'True' - osx_64_numpy1.21python3.9.____cpythonpython_implcpython: - CONFIG: osx_64_numpy1.21python3.9.____cpythonpython_implcpython + osx_64_numpy1.22python3.9.____cpythonpython_implcpython: + CONFIG: osx_64_numpy1.22python3.9.____cpythonpython_implcpython UPLOAD_PACKAGES: 'True' osx_64_numpy1.23python3.11.____cpythonpython_implcpython: CONFIG: osx_64_numpy1.23python3.11.____cpythonpython_implcpython UPLOAD_PACKAGES: 'True' - osx_arm64_numpy1.21python3.10.____cpython: - CONFIG: osx_arm64_numpy1.21python3.10.____cpython + osx_arm64_numpy1.22python3.10.____cpython: + CONFIG: osx_arm64_numpy1.22python3.10.____cpython UPLOAD_PACKAGES: 'True' - osx_arm64_numpy1.21python3.9.____cpython: - CONFIG: osx_arm64_numpy1.21python3.9.____cpython + osx_arm64_numpy1.22python3.9.____cpython: + CONFIG: osx_arm64_numpy1.22python3.9.____cpython UPLOAD_PACKAGES: 'True' osx_arm64_numpy1.23python3.11.____cpython: CONFIG: osx_arm64_numpy1.23python3.11.____cpython diff --git a/.azure-pipelines/azure-pipelines-win.yml b/.azure-pipelines/azure-pipelines-win.yml index a2e4913d..7eb350f0 100755 --- a/.azure-pipelines/azure-pipelines-win.yml +++ b/.azure-pipelines/azure-pipelines-win.yml @@ -8,14 +8,14 @@ jobs: vmImage: windows-2022 strategy: matrix: - win_64_numpy1.21python3.10.____cpythonpython_implcpython: - CONFIG: win_64_numpy1.21python3.10.____cpythonpython_implcpython + win_64_numpy1.22python3.10.____cpythonpython_implcpython: + CONFIG: win_64_numpy1.22python3.10.____cpythonpython_implcpython UPLOAD_PACKAGES: 'True' - win_64_numpy1.21python3.9.____73_pypypython_implpypy: - CONFIG: win_64_numpy1.21python3.9.____73_pypypython_implpypy + win_64_numpy1.22python3.9.____73_pypypython_implpypy: + CONFIG: win_64_numpy1.22python3.9.____73_pypypython_implpypy UPLOAD_PACKAGES: 'True' - win_64_numpy1.21python3.9.____cpythonpython_implcpython: - CONFIG: win_64_numpy1.21python3.9.____cpythonpython_implcpython + win_64_numpy1.22python3.9.____cpythonpython_implcpython: + CONFIG: win_64_numpy1.22python3.9.____cpythonpython_implcpython UPLOAD_PACKAGES: 'True' win_64_numpy1.23python3.11.____cpythonpython_implcpython: CONFIG: win_64_numpy1.23python3.11.____cpythonpython_implcpython diff --git a/.ci_support/linux_64_numpy1.21python3.10.____cpythonpython_implcpython.yaml b/.ci_support/linux_64_numpy1.22python3.10.____cpythonpython_implcpython.yaml similarity index 98% rename from .ci_support/linux_64_numpy1.21python3.10.____cpythonpython_implcpython.yaml rename to .ci_support/linux_64_numpy1.22python3.10.____cpythonpython_implcpython.yaml index a07c39a8..fde8762e 100644 --- a/.ci_support/linux_64_numpy1.21python3.10.____cpythonpython_implcpython.yaml +++ b/.ci_support/linux_64_numpy1.22python3.10.____cpythonpython_implcpython.yaml @@ -25,7 +25,7 @@ libcblas: liblapack: - 3.9 *netlib numpy: -- '1.21' +- '1.22' pin_run_as_build: python: min_pin: x.x diff --git a/.ci_support/linux_64_numpy1.21python3.9.____73_pypypython_implpypy.yaml b/.ci_support/linux_64_numpy1.22python3.9.____73_pypypython_implpypy.yaml similarity index 98% rename from .ci_support/linux_64_numpy1.21python3.9.____73_pypypython_implpypy.yaml rename to .ci_support/linux_64_numpy1.22python3.9.____73_pypypython_implpypy.yaml index 8eec74eb..25056690 100644 --- a/.ci_support/linux_64_numpy1.21python3.9.____73_pypypython_implpypy.yaml +++ b/.ci_support/linux_64_numpy1.22python3.9.____73_pypypython_implpypy.yaml @@ -25,7 +25,7 @@ libcblas: liblapack: - 3.9 *netlib numpy: -- '1.21' +- '1.22' pin_run_as_build: python: min_pin: x.x diff --git a/.ci_support/linux_64_numpy1.21python3.9.____cpythonpython_implcpython.yaml b/.ci_support/linux_64_numpy1.22python3.9.____cpythonpython_implcpython.yaml similarity index 98% rename from .ci_support/linux_64_numpy1.21python3.9.____cpythonpython_implcpython.yaml rename to .ci_support/linux_64_numpy1.22python3.9.____cpythonpython_implcpython.yaml index 3c3d5f1e..e88fa4ea 100644 --- a/.ci_support/linux_64_numpy1.21python3.9.____cpythonpython_implcpython.yaml +++ b/.ci_support/linux_64_numpy1.22python3.9.____cpythonpython_implcpython.yaml @@ -25,7 +25,7 @@ libcblas: liblapack: - 3.9 *netlib numpy: -- '1.21' +- '1.22' pin_run_as_build: python: min_pin: x.x diff --git a/.ci_support/linux_aarch64_numpy1.21python3.10.____cpythonpython_implcpython.yaml b/.ci_support/linux_aarch64_numpy1.22python3.10.____cpythonpython_implcpython.yaml similarity index 98% rename from .ci_support/linux_aarch64_numpy1.21python3.10.____cpythonpython_implcpython.yaml rename to .ci_support/linux_aarch64_numpy1.22python3.10.____cpythonpython_implcpython.yaml index ce771a18..79bfc9a4 100644 --- a/.ci_support/linux_aarch64_numpy1.21python3.10.____cpythonpython_implcpython.yaml +++ b/.ci_support/linux_aarch64_numpy1.22python3.10.____cpythonpython_implcpython.yaml @@ -29,7 +29,7 @@ libcblas: liblapack: - 3.9 *netlib numpy: -- '1.21' +- '1.22' pin_run_as_build: python: min_pin: x.x diff --git a/.ci_support/linux_aarch64_numpy1.21python3.9.____73_pypypython_implpypy.yaml b/.ci_support/linux_aarch64_numpy1.22python3.9.____73_pypypython_implpypy.yaml similarity index 98% rename from .ci_support/linux_aarch64_numpy1.21python3.9.____73_pypypython_implpypy.yaml rename to .ci_support/linux_aarch64_numpy1.22python3.9.____73_pypypython_implpypy.yaml index 070a9408..2f0c61e6 100644 --- a/.ci_support/linux_aarch64_numpy1.21python3.9.____73_pypypython_implpypy.yaml +++ b/.ci_support/linux_aarch64_numpy1.22python3.9.____73_pypypython_implpypy.yaml @@ -29,7 +29,7 @@ libcblas: liblapack: - 3.9 *netlib numpy: -- '1.21' +- '1.22' pin_run_as_build: python: min_pin: x.x diff --git a/.ci_support/linux_aarch64_numpy1.21python3.9.____cpythonpython_implcpython.yaml b/.ci_support/linux_aarch64_numpy1.22python3.9.____cpythonpython_implcpython.yaml similarity index 98% rename from .ci_support/linux_aarch64_numpy1.21python3.9.____cpythonpython_implcpython.yaml rename to .ci_support/linux_aarch64_numpy1.22python3.9.____cpythonpython_implcpython.yaml index 881f6cc7..ecaa21b9 100644 --- a/.ci_support/linux_aarch64_numpy1.21python3.9.____cpythonpython_implcpython.yaml +++ b/.ci_support/linux_aarch64_numpy1.22python3.9.____cpythonpython_implcpython.yaml @@ -29,7 +29,7 @@ libcblas: liblapack: - 3.9 *netlib numpy: -- '1.21' +- '1.22' pin_run_as_build: python: min_pin: x.x diff --git a/.ci_support/linux_ppc64le_numpy1.21python3.10.____cpythonpython_implcpython.yaml b/.ci_support/linux_ppc64le_numpy1.22python3.10.____cpythonpython_implcpython.yaml similarity index 98% rename from .ci_support/linux_ppc64le_numpy1.21python3.10.____cpythonpython_implcpython.yaml rename to .ci_support/linux_ppc64le_numpy1.22python3.10.____cpythonpython_implcpython.yaml index 1af1b9cb..e9c81a3d 100644 --- a/.ci_support/linux_ppc64le_numpy1.21python3.10.____cpythonpython_implcpython.yaml +++ b/.ci_support/linux_ppc64le_numpy1.22python3.10.____cpythonpython_implcpython.yaml @@ -25,7 +25,7 @@ libcblas: liblapack: - 3.9 *netlib numpy: -- '1.21' +- '1.22' pin_run_as_build: python: min_pin: x.x diff --git a/.ci_support/linux_ppc64le_numpy1.21python3.9.____73_pypypython_implpypy.yaml b/.ci_support/linux_ppc64le_numpy1.22python3.9.____73_pypypython_implpypy.yaml similarity index 98% rename from .ci_support/linux_ppc64le_numpy1.21python3.9.____73_pypypython_implpypy.yaml rename to .ci_support/linux_ppc64le_numpy1.22python3.9.____73_pypypython_implpypy.yaml index faeb3ebe..259e2e94 100644 --- a/.ci_support/linux_ppc64le_numpy1.21python3.9.____73_pypypython_implpypy.yaml +++ b/.ci_support/linux_ppc64le_numpy1.22python3.9.____73_pypypython_implpypy.yaml @@ -25,7 +25,7 @@ libcblas: liblapack: - 3.9 *netlib numpy: -- '1.21' +- '1.22' pin_run_as_build: python: min_pin: x.x diff --git a/.ci_support/linux_ppc64le_numpy1.21python3.9.____cpythonpython_implcpython.yaml b/.ci_support/linux_ppc64le_numpy1.22python3.9.____cpythonpython_implcpython.yaml similarity index 98% rename from .ci_support/linux_ppc64le_numpy1.21python3.9.____cpythonpython_implcpython.yaml rename to .ci_support/linux_ppc64le_numpy1.22python3.9.____cpythonpython_implcpython.yaml index 3a5d37b1..6439e4a9 100644 --- a/.ci_support/linux_ppc64le_numpy1.21python3.9.____cpythonpython_implcpython.yaml +++ b/.ci_support/linux_ppc64le_numpy1.22python3.9.____cpythonpython_implcpython.yaml @@ -25,7 +25,7 @@ libcblas: liblapack: - 3.9 *netlib numpy: -- '1.21' +- '1.22' pin_run_as_build: python: min_pin: x.x diff --git a/.ci_support/osx_64_numpy1.21python3.10.____cpythonpython_implcpython.yaml b/.ci_support/osx_64_numpy1.22python3.10.____cpythonpython_implcpython.yaml similarity index 98% rename from .ci_support/osx_64_numpy1.21python3.10.____cpythonpython_implcpython.yaml rename to .ci_support/osx_64_numpy1.22python3.10.____cpythonpython_implcpython.yaml index baaa70f1..7bdb9177 100644 --- a/.ci_support/osx_64_numpy1.21python3.10.____cpythonpython_implcpython.yaml +++ b/.ci_support/osx_64_numpy1.22python3.10.____cpythonpython_implcpython.yaml @@ -25,7 +25,7 @@ liblapack: macos_machine: - x86_64-apple-darwin13.4.0 numpy: -- '1.21' +- '1.22' pin_run_as_build: python: min_pin: x.x diff --git a/.ci_support/osx_64_numpy1.21python3.9.____73_pypypython_implpypy.yaml b/.ci_support/osx_64_numpy1.22python3.9.____73_pypypython_implpypy.yaml similarity index 98% rename from .ci_support/osx_64_numpy1.21python3.9.____73_pypypython_implpypy.yaml rename to .ci_support/osx_64_numpy1.22python3.9.____73_pypypython_implpypy.yaml index 2dda71d5..aa53dba6 100644 --- a/.ci_support/osx_64_numpy1.21python3.9.____73_pypypython_implpypy.yaml +++ b/.ci_support/osx_64_numpy1.22python3.9.____73_pypypython_implpypy.yaml @@ -25,7 +25,7 @@ liblapack: macos_machine: - x86_64-apple-darwin13.4.0 numpy: -- '1.21' +- '1.22' pin_run_as_build: python: min_pin: x.x diff --git a/.ci_support/osx_64_numpy1.21python3.9.____cpythonpython_implcpython.yaml b/.ci_support/osx_64_numpy1.22python3.9.____cpythonpython_implcpython.yaml similarity index 98% rename from .ci_support/osx_64_numpy1.21python3.9.____cpythonpython_implcpython.yaml rename to .ci_support/osx_64_numpy1.22python3.9.____cpythonpython_implcpython.yaml index feff130b..42de9a29 100644 --- a/.ci_support/osx_64_numpy1.21python3.9.____cpythonpython_implcpython.yaml +++ b/.ci_support/osx_64_numpy1.22python3.9.____cpythonpython_implcpython.yaml @@ -25,7 +25,7 @@ liblapack: macos_machine: - x86_64-apple-darwin13.4.0 numpy: -- '1.21' +- '1.22' pin_run_as_build: python: min_pin: x.x diff --git a/.ci_support/osx_arm64_numpy1.21python3.10.____cpython.yaml b/.ci_support/osx_arm64_numpy1.22python3.10.____cpython.yaml similarity index 98% rename from .ci_support/osx_arm64_numpy1.21python3.10.____cpython.yaml rename to .ci_support/osx_arm64_numpy1.22python3.10.____cpython.yaml index aff58688..ffb857f1 100644 --- a/.ci_support/osx_arm64_numpy1.21python3.10.____cpython.yaml +++ b/.ci_support/osx_arm64_numpy1.22python3.10.____cpython.yaml @@ -25,7 +25,7 @@ liblapack: macos_machine: - arm64-apple-darwin20.0.0 numpy: -- '1.21' +- '1.22' pin_run_as_build: python: min_pin: x.x diff --git a/.ci_support/osx_arm64_numpy1.21python3.9.____cpython.yaml b/.ci_support/osx_arm64_numpy1.22python3.9.____cpython.yaml similarity index 98% rename from .ci_support/osx_arm64_numpy1.21python3.9.____cpython.yaml rename to .ci_support/osx_arm64_numpy1.22python3.9.____cpython.yaml index 1ab816e6..40b79b01 100644 --- a/.ci_support/osx_arm64_numpy1.21python3.9.____cpython.yaml +++ b/.ci_support/osx_arm64_numpy1.22python3.9.____cpython.yaml @@ -25,7 +25,7 @@ liblapack: macos_machine: - arm64-apple-darwin20.0.0 numpy: -- '1.21' +- '1.22' pin_run_as_build: python: min_pin: x.x diff --git a/.ci_support/win_64_numpy1.21python3.10.____cpythonpython_implcpython.yaml b/.ci_support/win_64_numpy1.22python3.10.____cpythonpython_implcpython.yaml similarity index 97% rename from .ci_support/win_64_numpy1.21python3.10.____cpythonpython_implcpython.yaml rename to .ci_support/win_64_numpy1.22python3.10.____cpythonpython_implcpython.yaml index ec52d017..966a5f08 100644 --- a/.ci_support/win_64_numpy1.21python3.10.____cpythonpython_implcpython.yaml +++ b/.ci_support/win_64_numpy1.22python3.10.____cpythonpython_implcpython.yaml @@ -15,7 +15,7 @@ liblapack: m2w64_fortran_compiler: - m2w64-toolchain numpy: -- '1.21' +- '1.22' pin_run_as_build: python: min_pin: x.x diff --git a/.ci_support/win_64_numpy1.21python3.9.____73_pypypython_implpypy.yaml b/.ci_support/win_64_numpy1.22python3.9.____73_pypypython_implpypy.yaml similarity index 97% rename from .ci_support/win_64_numpy1.21python3.9.____73_pypypython_implpypy.yaml rename to .ci_support/win_64_numpy1.22python3.9.____73_pypypython_implpypy.yaml index dbfddfc0..616e70c3 100644 --- a/.ci_support/win_64_numpy1.21python3.9.____73_pypypython_implpypy.yaml +++ b/.ci_support/win_64_numpy1.22python3.9.____73_pypypython_implpypy.yaml @@ -15,7 +15,7 @@ liblapack: m2w64_fortran_compiler: - m2w64-toolchain numpy: -- '1.21' +- '1.22' pin_run_as_build: python: min_pin: x.x diff --git a/.ci_support/win_64_numpy1.21python3.9.____cpythonpython_implcpython.yaml b/.ci_support/win_64_numpy1.22python3.9.____cpythonpython_implcpython.yaml similarity index 97% rename from .ci_support/win_64_numpy1.21python3.9.____cpythonpython_implcpython.yaml rename to .ci_support/win_64_numpy1.22python3.9.____cpythonpython_implcpython.yaml index e5e8783a..28c2b234 100644 --- a/.ci_support/win_64_numpy1.21python3.9.____cpythonpython_implcpython.yaml +++ b/.ci_support/win_64_numpy1.22python3.9.____cpythonpython_implcpython.yaml @@ -15,7 +15,7 @@ liblapack: m2w64_fortran_compiler: - m2w64-toolchain numpy: -- '1.21' +- '1.22' pin_run_as_build: python: min_pin: x.x diff --git a/README.md b/README.md index 7c4994b3..a2af9490 100644 --- a/README.md +++ b/README.md @@ -35,24 +35,24 @@ Current build status - + - + - + @@ -63,24 +63,24 @@ Current build status - + - + - + @@ -91,24 +91,24 @@ Current build status - + - + - + @@ -119,24 +119,24 @@ Current build status - + - + - + @@ -147,17 +147,17 @@ Current build status - + - + @@ -168,24 +168,24 @@ Current build status - + - + - + From 89ad65323e31034c5eecbc4271cd715bb62a28e1 Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Wed, 13 Sep 2023 18:41:37 +1100 Subject: [PATCH 3/3] backport patch for tolerance miss on osx --- recipe/meta.yaml | 3 + ...test_implicit-test-failure-with-tole.patch | 61 +++++++++++++++++++ 2 files changed, 64 insertions(+) create mode 100644 recipe/patches/0001-TST-fix-TestODR.test_implicit-test-failure-with-tole.patch diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 86a040e0..91faa88b 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -16,6 +16,9 @@ source: sha256: 8bde045d246e5cae53069d73c44b6b673fc03bf2d6aebb830f2ffb0900c84881 # need separate folder to do full reset on windows, see build-output.bat folder: base + patches: + # backport https://github.com/scipy/scipy/pull/19200 + - patches/0001-TST-fix-TestODR.test_implicit-test-failure-with-tole.patch # https://github.com/scipy/scipy/tree/v{{ version }}/scipy/_lib - git_url: https://github.com/boostorg/math.git git_rev: 298a243ccd3639b6eaa59bcdab7ab9d5f008fb36 diff --git a/recipe/patches/0001-TST-fix-TestODR.test_implicit-test-failure-with-tole.patch b/recipe/patches/0001-TST-fix-TestODR.test_implicit-test-failure-with-tole.patch new file mode 100644 index 00000000..780c0bb0 --- /dev/null +++ b/recipe/patches/0001-TST-fix-TestODR.test_implicit-test-failure-with-tole.patch @@ -0,0 +1,61 @@ +From f52afb3b2829375bd83ba92dd06c85480d5308b9 Mon Sep 17 00:00:00 2001 +From: Ralf Gommers +Date: Thu, 7 Sep 2023 16:16:22 +0200 +Subject: [PATCH] TST: fix `TestODR.test_implicit` test failure with tolerance + bump (#19200) + +This was failing on macOS x86-64 in CI with: +``` + E Arrays are not almost equal to 6 decimals +E +E Mismatched elements: 1 / 25 (4%) +E Max absolute difference: 1.52291797e-06 +E Max relative difference: 8.81522156e-07 +E x: array([[ 2.108927e+00, -1.943767e+00, 7.026353e-02, -4.717525e-02, +E 5.251554e-02], +E [-1.943767e+00, 2.048149e+00, -6.160049e-02, 4.626880e-02,... +E y: array([[ 2.108927e+00, -1.943769e+00, 7.026355e-02, -4.717527e-02, +E 5.251558e-02], +E [-1.943769e+00, 2.048151e+00, -6.160052e-02, 4.626883e-02,... +``` + +So it's a very small atol violation (1.52e-6, where decimal=6 implies +1.5e-6). Rather than bump to `decimal=5`, I decided to change the test +to `assert_allclose` so the bump could be smaller. + +[skip ci] +--- + scipy/odr/tests/test_odr.py | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +diff --git a/scipy/odr/tests/test_odr.py b/scipy/odr/tests/test_odr.py +index 6391eb378..c05f764d4 100644 +--- a/scipy/odr/tests/test_odr.py ++++ b/scipy/odr/tests/test_odr.py +@@ -5,7 +5,8 @@ import os + import numpy as np + from numpy import pi + from numpy.testing import (assert_array_almost_equal, +- assert_equal, assert_warns) ++ assert_equal, assert_warns, ++ assert_allclose) + import pytest + from pytest import raises as assert_raises + +@@ -127,7 +128,7 @@ class TestODR: + np.array([0.1113840353364371, 0.1097673310686467, 0.0041060738314314, + 0.0027500347539902, 0.0034962501532468]), + ) +- assert_array_almost_equal( ++ assert_allclose( + out.cov_beta, + np.array([[2.1089274602333052e+00, -1.9437686411979040e+00, + 7.0263550868344446e-02, -4.7175267373474862e-02, +@@ -144,6 +145,7 @@ class TestODR: + [5.2515575927380355e-02, -5.8822307501391467e-02, + 1.4528860663055824e-03, -1.2692942951415293e-03, + 2.0778813389755596e-03]]), ++ rtol=1e-6, atol=2e-6, + ) + + # Multi-variable Example
VariantStatus
linux_64_numpy1.21python3.10.____cpythonpython_implcpythonlinux_64_numpy1.22python3.10.____cpythonpython_implcpython - variant + variant
linux_64_numpy1.21python3.9.____73_pypypython_implpypylinux_64_numpy1.22python3.9.____73_pypypython_implpypy - variant + variant
linux_64_numpy1.21python3.9.____cpythonpython_implcpythonlinux_64_numpy1.22python3.9.____cpythonpython_implcpython - variant + variant
linux_aarch64_numpy1.21python3.10.____cpythonpython_implcpythonlinux_aarch64_numpy1.22python3.10.____cpythonpython_implcpython - variant + variant
linux_aarch64_numpy1.21python3.9.____73_pypypython_implpypylinux_aarch64_numpy1.22python3.9.____73_pypypython_implpypy - variant + variant
linux_aarch64_numpy1.21python3.9.____cpythonpython_implcpythonlinux_aarch64_numpy1.22python3.9.____cpythonpython_implcpython - variant + variant
linux_ppc64le_numpy1.21python3.10.____cpythonpython_implcpythonlinux_ppc64le_numpy1.22python3.10.____cpythonpython_implcpython - variant + variant
linux_ppc64le_numpy1.21python3.9.____73_pypypython_implpypylinux_ppc64le_numpy1.22python3.9.____73_pypypython_implpypy - variant + variant
linux_ppc64le_numpy1.21python3.9.____cpythonpython_implcpythonlinux_ppc64le_numpy1.22python3.9.____cpythonpython_implcpython - variant + variant
osx_64_numpy1.21python3.10.____cpythonpython_implcpythonosx_64_numpy1.22python3.10.____cpythonpython_implcpython - variant + variant
osx_64_numpy1.21python3.9.____73_pypypython_implpypyosx_64_numpy1.22python3.9.____73_pypypython_implpypy - variant + variant
osx_64_numpy1.21python3.9.____cpythonpython_implcpythonosx_64_numpy1.22python3.9.____cpythonpython_implcpython - variant + variant
osx_arm64_numpy1.21python3.10.____cpythonosx_arm64_numpy1.22python3.10.____cpython - variant + variant
osx_arm64_numpy1.21python3.9.____cpythonosx_arm64_numpy1.22python3.9.____cpython - variant + variant
win_64_numpy1.21python3.10.____cpythonpython_implcpythonwin_64_numpy1.22python3.10.____cpythonpython_implcpython - variant + variant
win_64_numpy1.21python3.9.____73_pypypython_implpypywin_64_numpy1.22python3.9.____73_pypypython_implpypy - variant + variant
win_64_numpy1.21python3.9.____cpythonpython_implcpythonwin_64_numpy1.22python3.9.____cpythonpython_implcpython - variant + variant