From 6b6805859ffd92b168c333a7592ffcdf2863954c Mon Sep 17 00:00:00 2001 From: "conda-forge-curator[bot]" <79913779+conda-forge-curator[bot]@users.noreply.github.com> Date: Fri, 15 Mar 2024 19:07:21 +0000 Subject: [PATCH 01/95] [ci skip] [skip ci] [cf admin skip] ***NO_CI*** admin migration CondaForgeYAMLTest --- conda-forge.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conda-forge.yml b/conda-forge.yml index 161cd2e5..1a735061 100644 --- a/conda-forge.yml +++ b/conda-forge.yml @@ -15,6 +15,6 @@ provider: linux_ppc64le: default osx: azure win: azure -test_on_native_only: true conda_build: pkg_format: '2' +test: native_and_emulated From 46fc73ee8002cf9fbde386f8faaa874e5952cbba Mon Sep 17 00:00:00 2001 From: Ryan May Date: Fri, 12 Apr 2024 13:41:56 -0600 Subject: [PATCH 02/95] Bump to 3.9.0rc2 --- recipe/meta.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index e31e335c..c8db98c8 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,7 +1,7 @@ # Full credit goes to https://github.com/conda/conda-recipes for providing this recipe. # It has been subsequently adapted for automated building with conda-forge. -{% set version = "3.8.4" %} +{% set version = "3.9.0rc2" %} package: name: matplotlib-suite @@ -9,7 +9,7 @@ package: source: url: https://github.com/matplotlib/matplotlib/archive/v{{ version }}.tar.gz - sha256: 7c4f370b7550eec8342c102f9dd80da3bec2895d7f514f5f6378764db4cb0e35 + sha256: de121ae7f788877f0e6e61ca2291a2e76a791963a912768f7faf24df7c8fe71c build: number: 0 From cc8e33b2035496e1dcd7bace9fdb0d64f64ced85 Mon Sep 17 00:00:00 2001 From: Ryan May Date: Thu, 25 Apr 2024 15:06:21 -0600 Subject: [PATCH 03/95] Update for new meson-based builds --- recipe/build_base.sh | 1 - recipe/meta.yaml | 2 ++ 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/recipe/build_base.sh b/recipe/build_base.sh index c2b84c9a..7847534c 100644 --- a/recipe/build_base.sh +++ b/recipe/build_base.sh @@ -15,7 +15,6 @@ system_freetype = True EOF cat conda_mpl_config.cfg -sed -i.bak "s|/usr/local|${PREFIX}|" setupext.py export MPLSETUPCFG=conda_mpl_config.cfg diff --git a/recipe/meta.yaml b/recipe/meta.yaml index c8db98c8..3725d14a 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -27,6 +27,7 @@ outputs: - python # [build_platform != target_platform] - cross-python_{{ target_platform }} # [build_platform != target_platform] - numpy # [build_platform != target_platform] + - meson-python>=0.13.1 # [build_platform != target_platform] - pybind11 >=2.6 # [build_platform != target_platform] - pkg-config # [not win] - {{ compiler('c') }} @@ -35,6 +36,7 @@ outputs: host: - python - pip + - meson-python>=0.13.1 - certifi>=2020.06.20 - pybind11 >=2.6 - freetype From 016be80cfdb1395da943e5031e167d623ac5f3cc Mon Sep 17 00:00:00 2001 From: "conda-forge-curator[bot]" <79913779+conda-forge-curator[bot]@users.noreply.github.com> Date: Sun, 12 May 2024 17:44:55 +0000 Subject: [PATCH 04/95] [ci skip] [skip ci] [cf admin skip] ***NO_CI*** admin migration CondaForgeAutomergeUpdate --- .github/workflows/automerge.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/automerge.yml b/.github/workflows/automerge.yml index da1368a1..0535f6aa 100644 --- a/.github/workflows/automerge.yml +++ b/.github/workflows/automerge.yml @@ -9,8 +9,6 @@ jobs: runs-on: ubuntu-latest name: automerge steps: - - name: checkout - uses: actions/checkout@v3 - name: automerge-action id: automerge-action uses: conda-forge/automerge-action@main From 5c853e823f69dfa9c0e7d760590bee5ede6d59f6 Mon Sep 17 00:00:00 2001 From: Thomas A Caswell Date: Wed, 26 Jun 2024 11:51:35 -0400 Subject: [PATCH 05/95] MNT: attempt to fix build --- recipe/build_base.sh | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/recipe/build_base.sh b/recipe/build_base.sh index 7847534c..c60741c0 100644 --- a/recipe/build_base.sh +++ b/recipe/build_base.sh @@ -9,13 +9,11 @@ tests = False toolkit_tests = False sample_data = False -[libs] -system_freetype = True - EOF cat conda_mpl_config.cfg export MPLSETUPCFG=conda_mpl_config.cfg +export AR=$GCC_AR -$PYTHON -m pip install --no-deps --no-build-isolation -vv . +$PYTHON -m pip install --no-deps --no-build-isolation -vv . --config-settings=setup-args="-Dsystem-freetype=true" From 3121712b5f7b05b660eb802f67c77637c57c7ba6 Mon Sep 17 00:00:00 2001 From: Thomas A Caswell Date: Wed, 26 Jun 2024 12:09:23 -0400 Subject: [PATCH 06/95] bump to 3.9.0 --- recipe/meta.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 3725d14a..ba9725c6 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,7 +1,7 @@ # Full credit goes to https://github.com/conda/conda-recipes for providing this recipe. # It has been subsequently adapted for automated building with conda-forge. -{% set version = "3.9.0rc2" %} +{% set version = "3.9.0" %} package: name: matplotlib-suite @@ -9,7 +9,7 @@ package: source: url: https://github.com/matplotlib/matplotlib/archive/v{{ version }}.tar.gz - sha256: de121ae7f788877f0e6e61ca2291a2e76a791963a912768f7faf24df7c8fe71c + sha256: 89877b314fe950b7abc118c1e518b0cc82fa9bb6e1228d26560e82be96ac009a build: number: 0 From ec6fd6be9bdf39aac994e029f425a334e084ce7d Mon Sep 17 00:00:00 2001 From: Thomas A Caswell Date: Wed, 26 Jun 2024 14:44:59 -0400 Subject: [PATCH 07/95] win: use system freetype --- recipe/build_base.bat | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/recipe/build_base.bat b/recipe/build_base.bat index ec835b6d..36ecd0eb 100644 --- a/recipe/build_base.bat +++ b/recipe/build_base.bat @@ -8,10 +8,8 @@ ECHO [packages] >> mplsetup.cfg ECHO tests = False >> mplsetup.cfg ECHO sample_data = False >> mplsetup.cfg ECHO toolkits_tests = False >> mplsetup.cfg -ECHO [libs] >> mplsetup.cfg -ECHO system_freetype = True >> mplsetup.cfg set MPLSETUPCFG=mplsetup.cfg -%PYTHON% -m pip install --no-deps --no-build-isolation -vv . +%PYTHON% -m pip install --no-deps --no-build-isolation -vv . --config-settings=setup-args="-Dsystem-freetype=true" if errorlevel 1 exit 1 From 009edaf0a09953dddad948622dd103b371c40f4a Mon Sep 17 00:00:00 2001 From: Thomas A Caswell Date: Wed, 26 Jun 2024 14:45:07 -0400 Subject: [PATCH 08/95] MNT: try to fix windows compliers --- recipe/build_base.bat | 3 --- 1 file changed, 3 deletions(-) diff --git a/recipe/build_base.bat b/recipe/build_base.bat index 36ecd0eb..b8975f95 100644 --- a/recipe/build_base.bat +++ b/recipe/build_base.bat @@ -1,6 +1,3 @@ -set LIB=%LIBRARY_LIB%;%LIB% -set LIBPATH=%LIBRARY_LIB%;%LIBPATH% -set INCLUDE=%LIBRARY_INC%;%INCLUDE% ECHO [directories] > mplsetup.cfg ECHO basedirlist = %LIBRARY_PREFIX% >> mplsetup.cfg From 668b1517b42b556310b743a0e40ed0c9eb6a2ab3 Mon Sep 17 00:00:00 2001 From: Thomas A Caswell Date: Wed, 26 Jun 2024 14:59:55 -0400 Subject: [PATCH 09/95] Update recipe/meta.yaml Co-authored-by: jakirkham --- recipe/meta.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index ba9725c6..6c105593 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -30,6 +30,7 @@ outputs: - meson-python>=0.13.1 # [build_platform != target_platform] - pybind11 >=2.6 # [build_platform != target_platform] - pkg-config # [not win] + - {{ stdlib('c') }} - {{ compiler('c') }} - {{ compiler('cxx') }} - libtool # [unix] From b8dc91a4b926e9a5afaf5a32576d1c6147f90b03 Mon Sep 17 00:00:00 2001 From: Thomas A Caswell Date: Wed, 26 Jun 2024 15:17:50 -0400 Subject: [PATCH 10/95] undo change --- recipe/build_base.bat | 3 +++ 1 file changed, 3 insertions(+) diff --git a/recipe/build_base.bat b/recipe/build_base.bat index b8975f95..36ecd0eb 100644 --- a/recipe/build_base.bat +++ b/recipe/build_base.bat @@ -1,3 +1,6 @@ +set LIB=%LIBRARY_LIB%;%LIB% +set LIBPATH=%LIBRARY_LIB%;%LIBPATH% +set INCLUDE=%LIBRARY_INC%;%INCLUDE% ECHO [directories] > mplsetup.cfg ECHO basedirlist = %LIBRARY_PREFIX% >> mplsetup.cfg From 2182d922760686f47f1022809093c2cdc1e13b48 Mon Sep 17 00:00:00 2001 From: Thomas A Caswell Date: Wed, 26 Jun 2024 15:20:40 -0400 Subject: [PATCH 11/95] MNT: use pkgconfig on windows? --- recipe/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 6c105593..042e6289 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -29,7 +29,7 @@ outputs: - numpy # [build_platform != target_platform] - meson-python>=0.13.1 # [build_platform != target_platform] - pybind11 >=2.6 # [build_platform != target_platform] - - pkg-config # [not win] + - pkg-config - {{ stdlib('c') }} - {{ compiler('c') }} - {{ compiler('cxx') }} From 7895d7dd6bee96c2316975e3d237af7e480c59ea Mon Sep 17 00:00:00 2001 From: Thomas A Caswell Date: Wed, 26 Jun 2024 15:36:46 -0400 Subject: [PATCH 12/95] MNT: try to modernize stdlib pinning --- recipe/conda_build_config.yaml | 13 +++++++++---- recipe/meta.yaml | 1 - 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/recipe/conda_build_config.yaml b/recipe/conda_build_config.yaml index 79c2e399..05be8e12 100644 --- a/recipe/conda_build_config.yaml +++ b/recipe/conda_build_config.yaml @@ -1,4 +1,9 @@ -MACOSX_DEPLOYMENT_TARGET: # [osx and x86_64] - - "10.12" # [osx and x86_64] -MACOSX_SDK_VERSION: # [osx and x86_64] - - 10.12 # [osx and x86_64] \ No newline at end of file +c_stdlib: + - sysroot # [linux] + - macosx_deployment_target # [osx] + - vs # [win] +c_stdlib_version: # [unix] + - 2.12 # [linux and x86_64] + - 2.17 # [linux and not x86_64] + - 10.12 # [osx and x86_64] + - 11.0 # [osx and arm64] diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 042e6289..e7c69c1e 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -50,7 +50,6 @@ outputs: - tk # [linux] run: - python - - __osx >={{ MACOSX_DEPLOYMENT_TARGET|default("10.9") }} # [osx and x86_64] - certifi >=2020.06.20 - contourpy >=1.0.1 - cycler >=0.10 From a3a0cb90dbd0047cf08615dedd2c0b1b01ca7b03 Mon Sep 17 00:00:00 2001 From: Thomas A Caswell Date: Wed, 26 Jun 2024 15:37:37 -0400 Subject: [PATCH 13/95] OSX: to the future! --- recipe/conda_build_config.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipe/conda_build_config.yaml b/recipe/conda_build_config.yaml index 05be8e12..3b76ff30 100644 --- a/recipe/conda_build_config.yaml +++ b/recipe/conda_build_config.yaml @@ -5,5 +5,5 @@ c_stdlib: c_stdlib_version: # [unix] - 2.12 # [linux and x86_64] - 2.17 # [linux and not x86_64] - - 10.12 # [osx and x86_64] + - 10.13 # [osx and x86_64] - 11.0 # [osx and arm64] From 7e3ca27e17d996abef9f0ae8ff878dac955b33eb Mon Sep 17 00:00:00 2001 From: "conda-forge-webservices[bot]" <91080706+conda-forge-webservices[bot]@users.noreply.github.com> Date: Wed, 26 Jun 2024 19:41:12 +0000 Subject: [PATCH 14/95] MNT: Re-rendered with conda-build 24.5.1, conda-smithy 3.36.2, and conda-forge-pinning 2024.06.26.07.13.35 --- .azure-pipelines/azure-pipelines-osx.yml | 2 +- .ci_support/linux_64_numpy1.22python3.10.____cpython.yaml | 2 +- .ci_support/linux_64_numpy1.22python3.8.____cpython.yaml | 2 +- .ci_support/linux_64_numpy1.22python3.9.____73_pypy.yaml | 2 +- .ci_support/linux_64_numpy1.22python3.9.____cpython.yaml | 2 +- .ci_support/linux_64_numpy1.23python3.11.____cpython.yaml | 2 +- .ci_support/linux_64_numpy1.26python3.12.____cpython.yaml | 2 +- .../linux_aarch64_numpy1.22python3.10.____cpython.yaml | 2 +- .../linux_aarch64_numpy1.22python3.8.____cpython.yaml | 2 +- .../linux_aarch64_numpy1.22python3.9.____73_pypy.yaml | 2 +- .../linux_aarch64_numpy1.22python3.9.____cpython.yaml | 2 +- .../linux_aarch64_numpy1.23python3.11.____cpython.yaml | 2 +- .../linux_aarch64_numpy1.26python3.12.____cpython.yaml | 2 +- .../linux_ppc64le_numpy1.22python3.10.____cpython.yaml | 2 +- .../linux_ppc64le_numpy1.22python3.8.____cpython.yaml | 2 +- .../linux_ppc64le_numpy1.22python3.9.____73_pypy.yaml | 2 +- .../linux_ppc64le_numpy1.22python3.9.____cpython.yaml | 2 +- .../linux_ppc64le_numpy1.23python3.11.____cpython.yaml | 2 +- .../linux_ppc64le_numpy1.26python3.12.____cpython.yaml | 2 +- .ci_support/osx_64_numpy1.22python3.10.____cpython.yaml | 8 ++++---- .ci_support/osx_64_numpy1.22python3.8.____cpython.yaml | 8 ++++---- .ci_support/osx_64_numpy1.22python3.9.____73_pypy.yaml | 8 ++++---- .ci_support/osx_64_numpy1.22python3.9.____cpython.yaml | 8 ++++---- .ci_support/osx_64_numpy1.23python3.11.____cpython.yaml | 8 ++++---- .ci_support/osx_64_numpy1.26python3.12.____cpython.yaml | 8 ++++---- .../osx_arm64_numpy1.22python3.10.____cpython.yaml | 4 +++- .ci_support/osx_arm64_numpy1.22python3.8.____cpython.yaml | 4 +++- .ci_support/osx_arm64_numpy1.22python3.9.____cpython.yaml | 4 +++- .../osx_arm64_numpy1.23python3.11.____cpython.yaml | 4 +++- .../osx_arm64_numpy1.26python3.12.____cpython.yaml | 4 +++- .ci_support/win_64_numpy1.22python3.10.____cpython.yaml | 2 +- .ci_support/win_64_numpy1.22python3.8.____cpython.yaml | 2 +- .ci_support/win_64_numpy1.22python3.9.____73_pypy.yaml | 2 +- .ci_support/win_64_numpy1.22python3.9.____cpython.yaml | 2 +- .ci_support/win_64_numpy1.23python3.11.____cpython.yaml | 2 +- .ci_support/win_64_numpy1.26python3.12.____cpython.yaml | 2 +- .gitattributes | 4 ++-- .scripts/build_steps.sh | 7 +++++++ .scripts/run_osx_build.sh | 7 +++++++ .scripts/run_win_build.bat | 5 +++++ 40 files changed, 85 insertions(+), 56 deletions(-) diff --git a/.azure-pipelines/azure-pipelines-osx.yml b/.azure-pipelines/azure-pipelines-osx.yml index c5d472bb..27ddd14f 100755 --- a/.azure-pipelines/azure-pipelines-osx.yml +++ b/.azure-pipelines/azure-pipelines-osx.yml @@ -5,7 +5,7 @@ jobs: - job: osx pool: - vmImage: macOS-11 + vmImage: macOS-12 strategy: matrix: osx_64_numpy1.22python3.10.____cpython: diff --git a/.ci_support/linux_64_numpy1.22python3.10.____cpython.yaml b/.ci_support/linux_64_numpy1.22python3.10.____cpython.yaml index 516eaaf8..d330becd 100644 --- a/.ci_support/linux_64_numpy1.22python3.10.____cpython.yaml +++ b/.ci_support/linux_64_numpy1.22python3.10.____cpython.yaml @@ -43,4 +43,4 @@ zip_keys: - numpy - python_impl zlib: -- '1.2' +- '1' diff --git a/.ci_support/linux_64_numpy1.22python3.8.____cpython.yaml b/.ci_support/linux_64_numpy1.22python3.8.____cpython.yaml index ec089720..f88b74ed 100644 --- a/.ci_support/linux_64_numpy1.22python3.8.____cpython.yaml +++ b/.ci_support/linux_64_numpy1.22python3.8.____cpython.yaml @@ -43,4 +43,4 @@ zip_keys: - numpy - python_impl zlib: -- '1.2' +- '1' diff --git a/.ci_support/linux_64_numpy1.22python3.9.____73_pypy.yaml b/.ci_support/linux_64_numpy1.22python3.9.____73_pypy.yaml index e2e77026..0b2b1287 100644 --- a/.ci_support/linux_64_numpy1.22python3.9.____73_pypy.yaml +++ b/.ci_support/linux_64_numpy1.22python3.9.____73_pypy.yaml @@ -43,4 +43,4 @@ zip_keys: - numpy - python_impl zlib: -- '1.2' +- '1' diff --git a/.ci_support/linux_64_numpy1.22python3.9.____cpython.yaml b/.ci_support/linux_64_numpy1.22python3.9.____cpython.yaml index 01f92eb8..cf3ddd18 100644 --- a/.ci_support/linux_64_numpy1.22python3.9.____cpython.yaml +++ b/.ci_support/linux_64_numpy1.22python3.9.____cpython.yaml @@ -43,4 +43,4 @@ zip_keys: - numpy - python_impl zlib: -- '1.2' +- '1' diff --git a/.ci_support/linux_64_numpy1.23python3.11.____cpython.yaml b/.ci_support/linux_64_numpy1.23python3.11.____cpython.yaml index 1d77488b..8391215a 100644 --- a/.ci_support/linux_64_numpy1.23python3.11.____cpython.yaml +++ b/.ci_support/linux_64_numpy1.23python3.11.____cpython.yaml @@ -43,4 +43,4 @@ zip_keys: - numpy - python_impl zlib: -- '1.2' +- '1' diff --git a/.ci_support/linux_64_numpy1.26python3.12.____cpython.yaml b/.ci_support/linux_64_numpy1.26python3.12.____cpython.yaml index 59b44488..8ef25e0d 100644 --- a/.ci_support/linux_64_numpy1.26python3.12.____cpython.yaml +++ b/.ci_support/linux_64_numpy1.26python3.12.____cpython.yaml @@ -43,4 +43,4 @@ zip_keys: - numpy - python_impl zlib: -- '1.2' +- '1' diff --git a/.ci_support/linux_aarch64_numpy1.22python3.10.____cpython.yaml b/.ci_support/linux_aarch64_numpy1.22python3.10.____cpython.yaml index eb257146..5834185f 100644 --- a/.ci_support/linux_aarch64_numpy1.22python3.10.____cpython.yaml +++ b/.ci_support/linux_aarch64_numpy1.22python3.10.____cpython.yaml @@ -47,4 +47,4 @@ zip_keys: - numpy - python_impl zlib: -- '1.2' +- '1' diff --git a/.ci_support/linux_aarch64_numpy1.22python3.8.____cpython.yaml b/.ci_support/linux_aarch64_numpy1.22python3.8.____cpython.yaml index c30e3fe7..9f8bff2e 100644 --- a/.ci_support/linux_aarch64_numpy1.22python3.8.____cpython.yaml +++ b/.ci_support/linux_aarch64_numpy1.22python3.8.____cpython.yaml @@ -47,4 +47,4 @@ zip_keys: - numpy - python_impl zlib: -- '1.2' +- '1' diff --git a/.ci_support/linux_aarch64_numpy1.22python3.9.____73_pypy.yaml b/.ci_support/linux_aarch64_numpy1.22python3.9.____73_pypy.yaml index 1ba268a4..d06303f6 100644 --- a/.ci_support/linux_aarch64_numpy1.22python3.9.____73_pypy.yaml +++ b/.ci_support/linux_aarch64_numpy1.22python3.9.____73_pypy.yaml @@ -47,4 +47,4 @@ zip_keys: - numpy - python_impl zlib: -- '1.2' +- '1' diff --git a/.ci_support/linux_aarch64_numpy1.22python3.9.____cpython.yaml b/.ci_support/linux_aarch64_numpy1.22python3.9.____cpython.yaml index ced21dd6..eaeae96d 100644 --- a/.ci_support/linux_aarch64_numpy1.22python3.9.____cpython.yaml +++ b/.ci_support/linux_aarch64_numpy1.22python3.9.____cpython.yaml @@ -47,4 +47,4 @@ zip_keys: - numpy - python_impl zlib: -- '1.2' +- '1' diff --git a/.ci_support/linux_aarch64_numpy1.23python3.11.____cpython.yaml b/.ci_support/linux_aarch64_numpy1.23python3.11.____cpython.yaml index 06fad8dc..3bfd3b2a 100644 --- a/.ci_support/linux_aarch64_numpy1.23python3.11.____cpython.yaml +++ b/.ci_support/linux_aarch64_numpy1.23python3.11.____cpython.yaml @@ -47,4 +47,4 @@ zip_keys: - numpy - python_impl zlib: -- '1.2' +- '1' diff --git a/.ci_support/linux_aarch64_numpy1.26python3.12.____cpython.yaml b/.ci_support/linux_aarch64_numpy1.26python3.12.____cpython.yaml index 063dc98f..8a399aca 100644 --- a/.ci_support/linux_aarch64_numpy1.26python3.12.____cpython.yaml +++ b/.ci_support/linux_aarch64_numpy1.26python3.12.____cpython.yaml @@ -47,4 +47,4 @@ zip_keys: - numpy - python_impl zlib: -- '1.2' +- '1' diff --git a/.ci_support/linux_ppc64le_numpy1.22python3.10.____cpython.yaml b/.ci_support/linux_ppc64le_numpy1.22python3.10.____cpython.yaml index 8b7618b9..61b83479 100644 --- a/.ci_support/linux_ppc64le_numpy1.22python3.10.____cpython.yaml +++ b/.ci_support/linux_ppc64le_numpy1.22python3.10.____cpython.yaml @@ -41,4 +41,4 @@ zip_keys: - numpy - python_impl zlib: -- '1.2' +- '1' diff --git a/.ci_support/linux_ppc64le_numpy1.22python3.8.____cpython.yaml b/.ci_support/linux_ppc64le_numpy1.22python3.8.____cpython.yaml index 99756389..e503d1d2 100644 --- a/.ci_support/linux_ppc64le_numpy1.22python3.8.____cpython.yaml +++ b/.ci_support/linux_ppc64le_numpy1.22python3.8.____cpython.yaml @@ -41,4 +41,4 @@ zip_keys: - numpy - python_impl zlib: -- '1.2' +- '1' diff --git a/.ci_support/linux_ppc64le_numpy1.22python3.9.____73_pypy.yaml b/.ci_support/linux_ppc64le_numpy1.22python3.9.____73_pypy.yaml index fd1b8280..f077c36e 100644 --- a/.ci_support/linux_ppc64le_numpy1.22python3.9.____73_pypy.yaml +++ b/.ci_support/linux_ppc64le_numpy1.22python3.9.____73_pypy.yaml @@ -41,4 +41,4 @@ zip_keys: - numpy - python_impl zlib: -- '1.2' +- '1' diff --git a/.ci_support/linux_ppc64le_numpy1.22python3.9.____cpython.yaml b/.ci_support/linux_ppc64le_numpy1.22python3.9.____cpython.yaml index ca0b65aa..a3fbacda 100644 --- a/.ci_support/linux_ppc64le_numpy1.22python3.9.____cpython.yaml +++ b/.ci_support/linux_ppc64le_numpy1.22python3.9.____cpython.yaml @@ -41,4 +41,4 @@ zip_keys: - numpy - python_impl zlib: -- '1.2' +- '1' diff --git a/.ci_support/linux_ppc64le_numpy1.23python3.11.____cpython.yaml b/.ci_support/linux_ppc64le_numpy1.23python3.11.____cpython.yaml index cb7df79e..f973acb7 100644 --- a/.ci_support/linux_ppc64le_numpy1.23python3.11.____cpython.yaml +++ b/.ci_support/linux_ppc64le_numpy1.23python3.11.____cpython.yaml @@ -41,4 +41,4 @@ zip_keys: - numpy - python_impl zlib: -- '1.2' +- '1' diff --git a/.ci_support/linux_ppc64le_numpy1.26python3.12.____cpython.yaml b/.ci_support/linux_ppc64le_numpy1.26python3.12.____cpython.yaml index c18acf7c..8965a2d4 100644 --- a/.ci_support/linux_ppc64le_numpy1.26python3.12.____cpython.yaml +++ b/.ci_support/linux_ppc64le_numpy1.26python3.12.____cpython.yaml @@ -41,4 +41,4 @@ zip_keys: - numpy - python_impl zlib: -- '1.2' +- '1' diff --git a/.ci_support/osx_64_numpy1.22python3.10.____cpython.yaml b/.ci_support/osx_64_numpy1.22python3.10.____cpython.yaml index 7ebed16d..215be45e 100644 --- a/.ci_support/osx_64_numpy1.22python3.10.____cpython.yaml +++ b/.ci_support/osx_64_numpy1.22python3.10.____cpython.yaml @@ -1,7 +1,7 @@ MACOSX_DEPLOYMENT_TARGET: -- '10.12' +- '10.13' MACOSX_SDK_VERSION: -- '10.12' +- '10.13' c_compiler: - clang c_compiler_version: @@ -9,7 +9,7 @@ c_compiler_version: c_stdlib: - macosx_deployment_target c_stdlib_version: -- '10.12' +- '10.13' channel_sources: - conda-forge channel_targets: @@ -41,4 +41,4 @@ zip_keys: - numpy - python_impl zlib: -- '1.2' +- '1' diff --git a/.ci_support/osx_64_numpy1.22python3.8.____cpython.yaml b/.ci_support/osx_64_numpy1.22python3.8.____cpython.yaml index 4d72808c..113c421f 100644 --- a/.ci_support/osx_64_numpy1.22python3.8.____cpython.yaml +++ b/.ci_support/osx_64_numpy1.22python3.8.____cpython.yaml @@ -1,7 +1,7 @@ MACOSX_DEPLOYMENT_TARGET: -- '10.12' +- '10.13' MACOSX_SDK_VERSION: -- '10.12' +- '10.13' c_compiler: - clang c_compiler_version: @@ -9,7 +9,7 @@ c_compiler_version: c_stdlib: - macosx_deployment_target c_stdlib_version: -- '10.12' +- '10.13' channel_sources: - conda-forge channel_targets: @@ -41,4 +41,4 @@ zip_keys: - numpy - python_impl zlib: -- '1.2' +- '1' diff --git a/.ci_support/osx_64_numpy1.22python3.9.____73_pypy.yaml b/.ci_support/osx_64_numpy1.22python3.9.____73_pypy.yaml index fffbbbc9..5ca09b0d 100644 --- a/.ci_support/osx_64_numpy1.22python3.9.____73_pypy.yaml +++ b/.ci_support/osx_64_numpy1.22python3.9.____73_pypy.yaml @@ -1,7 +1,7 @@ MACOSX_DEPLOYMENT_TARGET: -- '10.12' +- '10.13' MACOSX_SDK_VERSION: -- '10.12' +- '10.13' c_compiler: - clang c_compiler_version: @@ -9,7 +9,7 @@ c_compiler_version: c_stdlib: - macosx_deployment_target c_stdlib_version: -- '10.12' +- '10.13' channel_sources: - conda-forge channel_targets: @@ -41,4 +41,4 @@ zip_keys: - numpy - python_impl zlib: -- '1.2' +- '1' diff --git a/.ci_support/osx_64_numpy1.22python3.9.____cpython.yaml b/.ci_support/osx_64_numpy1.22python3.9.____cpython.yaml index 1332f30d..97e982a9 100644 --- a/.ci_support/osx_64_numpy1.22python3.9.____cpython.yaml +++ b/.ci_support/osx_64_numpy1.22python3.9.____cpython.yaml @@ -1,7 +1,7 @@ MACOSX_DEPLOYMENT_TARGET: -- '10.12' +- '10.13' MACOSX_SDK_VERSION: -- '10.12' +- '10.13' c_compiler: - clang c_compiler_version: @@ -9,7 +9,7 @@ c_compiler_version: c_stdlib: - macosx_deployment_target c_stdlib_version: -- '10.12' +- '10.13' channel_sources: - conda-forge channel_targets: @@ -41,4 +41,4 @@ zip_keys: - numpy - python_impl zlib: -- '1.2' +- '1' diff --git a/.ci_support/osx_64_numpy1.23python3.11.____cpython.yaml b/.ci_support/osx_64_numpy1.23python3.11.____cpython.yaml index 9ee7ab4e..80c0dd52 100644 --- a/.ci_support/osx_64_numpy1.23python3.11.____cpython.yaml +++ b/.ci_support/osx_64_numpy1.23python3.11.____cpython.yaml @@ -1,7 +1,7 @@ MACOSX_DEPLOYMENT_TARGET: -- '10.12' +- '10.13' MACOSX_SDK_VERSION: -- '10.12' +- '10.13' c_compiler: - clang c_compiler_version: @@ -9,7 +9,7 @@ c_compiler_version: c_stdlib: - macosx_deployment_target c_stdlib_version: -- '10.12' +- '10.13' channel_sources: - conda-forge channel_targets: @@ -41,4 +41,4 @@ zip_keys: - numpy - python_impl zlib: -- '1.2' +- '1' diff --git a/.ci_support/osx_64_numpy1.26python3.12.____cpython.yaml b/.ci_support/osx_64_numpy1.26python3.12.____cpython.yaml index f648a435..a507889d 100644 --- a/.ci_support/osx_64_numpy1.26python3.12.____cpython.yaml +++ b/.ci_support/osx_64_numpy1.26python3.12.____cpython.yaml @@ -1,7 +1,7 @@ MACOSX_DEPLOYMENT_TARGET: -- '10.12' +- '10.13' MACOSX_SDK_VERSION: -- '10.12' +- '10.13' c_compiler: - clang c_compiler_version: @@ -9,7 +9,7 @@ c_compiler_version: c_stdlib: - macosx_deployment_target c_stdlib_version: -- '10.12' +- '10.13' channel_sources: - conda-forge channel_targets: @@ -41,4 +41,4 @@ zip_keys: - numpy - python_impl zlib: -- '1.2' +- '1' diff --git a/.ci_support/osx_arm64_numpy1.22python3.10.____cpython.yaml b/.ci_support/osx_arm64_numpy1.22python3.10.____cpython.yaml index a9c9856a..cca4ffaa 100644 --- a/.ci_support/osx_arm64_numpy1.22python3.10.____cpython.yaml +++ b/.ci_support/osx_arm64_numpy1.22python3.10.____cpython.yaml @@ -1,5 +1,7 @@ MACOSX_DEPLOYMENT_TARGET: - '11.0' +MACOSX_SDK_VERSION: +- '11.0' c_compiler: - clang c_compiler_version: @@ -39,4 +41,4 @@ zip_keys: - numpy - python_impl zlib: -- '1.2' +- '1' diff --git a/.ci_support/osx_arm64_numpy1.22python3.8.____cpython.yaml b/.ci_support/osx_arm64_numpy1.22python3.8.____cpython.yaml index 8f639d2f..4daea10d 100644 --- a/.ci_support/osx_arm64_numpy1.22python3.8.____cpython.yaml +++ b/.ci_support/osx_arm64_numpy1.22python3.8.____cpython.yaml @@ -1,5 +1,7 @@ MACOSX_DEPLOYMENT_TARGET: - '11.0' +MACOSX_SDK_VERSION: +- '11.0' c_compiler: - clang c_compiler_version: @@ -39,4 +41,4 @@ zip_keys: - numpy - python_impl zlib: -- '1.2' +- '1' diff --git a/.ci_support/osx_arm64_numpy1.22python3.9.____cpython.yaml b/.ci_support/osx_arm64_numpy1.22python3.9.____cpython.yaml index 57f965a3..7dbfad69 100644 --- a/.ci_support/osx_arm64_numpy1.22python3.9.____cpython.yaml +++ b/.ci_support/osx_arm64_numpy1.22python3.9.____cpython.yaml @@ -1,5 +1,7 @@ MACOSX_DEPLOYMENT_TARGET: - '11.0' +MACOSX_SDK_VERSION: +- '11.0' c_compiler: - clang c_compiler_version: @@ -39,4 +41,4 @@ zip_keys: - numpy - python_impl zlib: -- '1.2' +- '1' diff --git a/.ci_support/osx_arm64_numpy1.23python3.11.____cpython.yaml b/.ci_support/osx_arm64_numpy1.23python3.11.____cpython.yaml index c4507b98..c304d66b 100644 --- a/.ci_support/osx_arm64_numpy1.23python3.11.____cpython.yaml +++ b/.ci_support/osx_arm64_numpy1.23python3.11.____cpython.yaml @@ -1,5 +1,7 @@ MACOSX_DEPLOYMENT_TARGET: - '11.0' +MACOSX_SDK_VERSION: +- '11.0' c_compiler: - clang c_compiler_version: @@ -39,4 +41,4 @@ zip_keys: - numpy - python_impl zlib: -- '1.2' +- '1' diff --git a/.ci_support/osx_arm64_numpy1.26python3.12.____cpython.yaml b/.ci_support/osx_arm64_numpy1.26python3.12.____cpython.yaml index 1971082b..9f658488 100644 --- a/.ci_support/osx_arm64_numpy1.26python3.12.____cpython.yaml +++ b/.ci_support/osx_arm64_numpy1.26python3.12.____cpython.yaml @@ -1,5 +1,7 @@ MACOSX_DEPLOYMENT_TARGET: - '11.0' +MACOSX_SDK_VERSION: +- '11.0' c_compiler: - clang c_compiler_version: @@ -39,4 +41,4 @@ zip_keys: - numpy - python_impl zlib: -- '1.2' +- '1' diff --git a/.ci_support/win_64_numpy1.22python3.10.____cpython.yaml b/.ci_support/win_64_numpy1.22python3.10.____cpython.yaml index 76bfba5b..7f955d39 100644 --- a/.ci_support/win_64_numpy1.22python3.10.____cpython.yaml +++ b/.ci_support/win_64_numpy1.22python3.10.____cpython.yaml @@ -27,4 +27,4 @@ zip_keys: - numpy - python_impl zlib: -- '1.2' +- '1' diff --git a/.ci_support/win_64_numpy1.22python3.8.____cpython.yaml b/.ci_support/win_64_numpy1.22python3.8.____cpython.yaml index a35a50d7..d33d61c3 100644 --- a/.ci_support/win_64_numpy1.22python3.8.____cpython.yaml +++ b/.ci_support/win_64_numpy1.22python3.8.____cpython.yaml @@ -27,4 +27,4 @@ zip_keys: - numpy - python_impl zlib: -- '1.2' +- '1' diff --git a/.ci_support/win_64_numpy1.22python3.9.____73_pypy.yaml b/.ci_support/win_64_numpy1.22python3.9.____73_pypy.yaml index 35fb632e..32f7edd5 100644 --- a/.ci_support/win_64_numpy1.22python3.9.____73_pypy.yaml +++ b/.ci_support/win_64_numpy1.22python3.9.____73_pypy.yaml @@ -27,4 +27,4 @@ zip_keys: - numpy - python_impl zlib: -- '1.2' +- '1' diff --git a/.ci_support/win_64_numpy1.22python3.9.____cpython.yaml b/.ci_support/win_64_numpy1.22python3.9.____cpython.yaml index 41143bf6..5d878822 100644 --- a/.ci_support/win_64_numpy1.22python3.9.____cpython.yaml +++ b/.ci_support/win_64_numpy1.22python3.9.____cpython.yaml @@ -27,4 +27,4 @@ zip_keys: - numpy - python_impl zlib: -- '1.2' +- '1' diff --git a/.ci_support/win_64_numpy1.23python3.11.____cpython.yaml b/.ci_support/win_64_numpy1.23python3.11.____cpython.yaml index 7dce0932..6fb1eb35 100644 --- a/.ci_support/win_64_numpy1.23python3.11.____cpython.yaml +++ b/.ci_support/win_64_numpy1.23python3.11.____cpython.yaml @@ -27,4 +27,4 @@ zip_keys: - numpy - python_impl zlib: -- '1.2' +- '1' diff --git a/.ci_support/win_64_numpy1.26python3.12.____cpython.yaml b/.ci_support/win_64_numpy1.26python3.12.____cpython.yaml index 54f2f0e6..f077560f 100644 --- a/.ci_support/win_64_numpy1.26python3.12.____cpython.yaml +++ b/.ci_support/win_64_numpy1.26python3.12.____cpython.yaml @@ -27,4 +27,4 @@ zip_keys: - numpy - python_impl zlib: -- '1.2' +- '1' diff --git a/.gitattributes b/.gitattributes index 7f327638..18f114a1 100644 --- a/.gitattributes +++ b/.gitattributes @@ -20,8 +20,8 @@ bld.bat text eol=crlf .travis.yml linguist-generated=true .scripts/* linguist-generated=true .woodpecker.yml linguist-generated=true -LICENSE.txt linguist-generated=true -README.md linguist-generated=true +/LICENSE.txt linguist-generated=true +/README.md linguist-generated=true azure-pipelines.yml linguist-generated=true build-locally.py linguist-generated=true shippable.yml linguist-generated=true diff --git a/.scripts/build_steps.sh b/.scripts/build_steps.sh index be544a3a..a147fa70 100755 --- a/.scripts/build_steps.sh +++ b/.scripts/build_steps.sh @@ -80,6 +80,13 @@ else --suppress-variables ${EXTRA_CB_OPTIONS:-} \ --clobber-file "${CI_SUPPORT}/clobber_${CONFIG}.yaml" \ --extra-meta flow_run_id="${flow_run_id:-}" remote_url="${remote_url:-}" sha="${sha:-}" + + ( startgroup "Inspecting artifacts" ) 2> /dev/null + + # inspect_artifacts was only added in conda-forge-ci-setup 4.6.0 + command -v inspect_artifacts >/dev/null 2>&1 && inspect_artifacts || echo "inspect_artifacts needs conda-forge-ci-setup >=4.6.0" + + ( endgroup "Inspecting artifacts" ) 2> /dev/null ( startgroup "Validating outputs" ) 2> /dev/null validate_recipe_outputs "${FEEDSTOCK_NAME}" diff --git a/.scripts/run_osx_build.sh b/.scripts/run_osx_build.sh index 07dff219..ba0c8791 100755 --- a/.scripts/run_osx_build.sh +++ b/.scripts/run_osx_build.sh @@ -85,6 +85,13 @@ else --suppress-variables ${EXTRA_CB_OPTIONS:-} \ --clobber-file ./.ci_support/clobber_${CONFIG}.yaml \ --extra-meta flow_run_id="$flow_run_id" remote_url="$remote_url" sha="$sha" + + ( startgroup "Inspecting artifacts" ) 2> /dev/null + + # inspect_artifacts was only added in conda-forge-ci-setup 4.6.0 + command -v inspect_artifacts >/dev/null 2>&1 && inspect_artifacts || echo "inspect_artifacts needs conda-forge-ci-setup >=4.6.0" + + ( endgroup "Inspecting artifacts" ) 2> /dev/null ( startgroup "Validating outputs" ) 2> /dev/null validate_recipe_outputs "${FEEDSTOCK_NAME}" diff --git a/.scripts/run_win_build.bat b/.scripts/run_win_build.bat index 6d546976..65650bf2 100755 --- a/.scripts/run_win_build.bat +++ b/.scripts/run_win_build.bat @@ -58,6 +58,11 @@ echo Building recipe conda-build.exe "recipe" -m .ci_support\%CONFIG%.yaml --suppress-variables %EXTRA_CB_OPTIONS% if !errorlevel! neq 0 exit /b !errorlevel! +call :start_group "Inspecting artifacts" +:: inspect_artifacts was only added in conda-forge-ci-setup 4.6.0 +WHERE inspect_artifacts >nul 2>nul && inspect_artifacts || echo "inspect_artifacts needs conda-forge-ci-setup >=4.6.0" +call :end_group + :: Prepare some environment variables for the upload step if /i "%CI%" == "github_actions" ( set "FEEDSTOCK_NAME=%GITHUB_REPOSITORY:*/=%" From e66405c6411ae71a306504f97a4fba9703692481 Mon Sep 17 00:00:00 2001 From: jakirkham Date: Wed, 26 Jun 2024 15:58:08 -0700 Subject: [PATCH 15/95] Include fixes for Meson builds --- recipe/build_base.bat | 3 ++- recipe/build_base.sh | 3 ++- recipe/meta.yaml | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/recipe/build_base.bat b/recipe/build_base.bat index 36ecd0eb..a105e04b 100644 --- a/recipe/build_base.bat +++ b/recipe/build_base.bat @@ -11,5 +11,6 @@ ECHO toolkits_tests = False >> mplsetup.cfg set MPLSETUPCFG=mplsetup.cfg -%PYTHON% -m pip install --no-deps --no-build-isolation -vv . --config-settings=setup-args="-Dsystem-freetype=true" +mkdir builddir +%PYTHON% -m mesonbuild.mesonmain setup %MESON_ARGS% builddir if errorlevel 1 exit 1 diff --git a/recipe/build_base.sh b/recipe/build_base.sh index c60741c0..45f9e88f 100644 --- a/recipe/build_base.sh +++ b/recipe/build_base.sh @@ -16,4 +16,5 @@ cat conda_mpl_config.cfg export MPLSETUPCFG=conda_mpl_config.cfg export AR=$GCC_AR -$PYTHON -m pip install --no-deps --no-build-isolation -vv . --config-settings=setup-args="-Dsystem-freetype=true" +mkdir builddir +$PYTHON -m mesonbuild.mesonmain setup $MESON_ARGS builddir diff --git a/recipe/meta.yaml b/recipe/meta.yaml index e7c69c1e..d4207291 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -27,8 +27,8 @@ outputs: - python # [build_platform != target_platform] - cross-python_{{ target_platform }} # [build_platform != target_platform] - numpy # [build_platform != target_platform] - - meson-python>=0.13.1 # [build_platform != target_platform] - pybind11 >=2.6 # [build_platform != target_platform] + - cmake # [win] - pkg-config - {{ stdlib('c') }} - {{ compiler('c') }} From 8c8807577b1ec9784120069921b097eea35b6a36 Mon Sep 17 00:00:00 2001 From: jakirkham Date: Wed, 26 Jun 2024 15:59:47 -0700 Subject: [PATCH 16/95] Drop now unneeded `conda_mpl_config.cfg` --- recipe/build_base.bat | 9 --------- recipe/build_base.sh | 14 -------------- 2 files changed, 23 deletions(-) diff --git a/recipe/build_base.bat b/recipe/build_base.bat index a105e04b..eaee259c 100644 --- a/recipe/build_base.bat +++ b/recipe/build_base.bat @@ -2,15 +2,6 @@ set LIB=%LIBRARY_LIB%;%LIB% set LIBPATH=%LIBRARY_LIB%;%LIBPATH% set INCLUDE=%LIBRARY_INC%;%INCLUDE% -ECHO [directories] > mplsetup.cfg -ECHO basedirlist = %LIBRARY_PREFIX% >> mplsetup.cfg -ECHO [packages] >> mplsetup.cfg -ECHO tests = False >> mplsetup.cfg -ECHO sample_data = False >> mplsetup.cfg -ECHO toolkits_tests = False >> mplsetup.cfg - -set MPLSETUPCFG=mplsetup.cfg - mkdir builddir %PYTHON% -m mesonbuild.mesonmain setup %MESON_ARGS% builddir if errorlevel 1 exit 1 diff --git a/recipe/build_base.sh b/recipe/build_base.sh index 45f9e88f..b82893b5 100644 --- a/recipe/build_base.sh +++ b/recipe/build_base.sh @@ -1,19 +1,5 @@ #!/bin/bash -cat < conda_mpl_config.cfg -[directories] -basedirlist = $PREFIX - -[packages] -tests = False -toolkit_tests = False -sample_data = False - -EOF - -cat conda_mpl_config.cfg - -export MPLSETUPCFG=conda_mpl_config.cfg export AR=$GCC_AR mkdir builddir From 0580bdb9ee8000da87bbd24c4cd0203db0ac06b2 Mon Sep 17 00:00:00 2001 From: "conda-forge-webservices[bot]" <91080706+conda-forge-webservices[bot]@users.noreply.github.com> Date: Wed, 26 Jun 2024 23:02:23 +0000 Subject: [PATCH 17/95] MNT: Re-rendered with conda-build 24.5.1, conda-smithy 3.36.2, and conda-forge-pinning 2024.06.26.07.13.35 From f12d0b6e981284461ccf6a1e1e9c3fd2c11cf5d7 Mon Sep 17 00:00:00 2001 From: jakirkham Date: Wed, 26 Jun 2024 16:02:33 -0700 Subject: [PATCH 18/95] Drop unneeded `conda_build_config.yaml` --- recipe/conda_build_config.yaml | 9 --------- 1 file changed, 9 deletions(-) delete mode 100644 recipe/conda_build_config.yaml diff --git a/recipe/conda_build_config.yaml b/recipe/conda_build_config.yaml deleted file mode 100644 index 3b76ff30..00000000 --- a/recipe/conda_build_config.yaml +++ /dev/null @@ -1,9 +0,0 @@ -c_stdlib: - - sysroot # [linux] - - macosx_deployment_target # [osx] - - vs # [win] -c_stdlib_version: # [unix] - - 2.12 # [linux and x86_64] - - 2.17 # [linux and not x86_64] - - 10.13 # [osx and x86_64] - - 11.0 # [osx and arm64] From 8af3958ddcf82ab2822ba6fd4d56bb56dd5566ae Mon Sep 17 00:00:00 2001 From: "conda-forge-webservices[bot]" <91080706+conda-forge-webservices[bot]@users.noreply.github.com> Date: Wed, 26 Jun 2024 23:04:32 +0000 Subject: [PATCH 19/95] MNT: Re-rendered with conda-build 24.5.1, conda-smithy 3.36.2, and conda-forge-pinning 2024.06.26.07.13.35 From 43c268a996afe8f08a61050fca9e73143537fce6 Mon Sep 17 00:00:00 2001 From: jakirkham Date: Wed, 26 Jun 2024 16:04:57 -0700 Subject: [PATCH 20/95] Use `pkg-config` on Unix only --- recipe/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index d4207291..3c1e82d2 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -29,7 +29,7 @@ outputs: - numpy # [build_platform != target_platform] - pybind11 >=2.6 # [build_platform != target_platform] - cmake # [win] - - pkg-config + - pkg-config # [unix] - {{ stdlib('c') }} - {{ compiler('c') }} - {{ compiler('cxx') }} From bb2b24de1519ec16b05f9e55a9e627bb14ecfdcf Mon Sep 17 00:00:00 2001 From: jakirkham Date: Wed, 26 Jun 2024 16:05:34 -0700 Subject: [PATCH 21/95] Align `libtool` selector --- recipe/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 3c1e82d2..ed6c493e 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -33,7 +33,7 @@ outputs: - {{ stdlib('c') }} - {{ compiler('c') }} - {{ compiler('cxx') }} - - libtool # [unix] + - libtool # [unix] host: - python - pip From 133837caf12bc70265bd77bc48cec2c58b38ed3c Mon Sep 17 00:00:00 2001 From: jakirkham Date: Wed, 26 Jun 2024 16:05:51 -0700 Subject: [PATCH 22/95] Group build tools together after `compiler`s --- recipe/meta.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index ed6c493e..5062ce71 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -28,11 +28,11 @@ outputs: - cross-python_{{ target_platform }} # [build_platform != target_platform] - numpy # [build_platform != target_platform] - pybind11 >=2.6 # [build_platform != target_platform] - - cmake # [win] - - pkg-config # [unix] - {{ stdlib('c') }} - {{ compiler('c') }} - {{ compiler('cxx') }} + - cmake # [win] + - pkg-config # [unix] - libtool # [unix] host: - python From 975712f27a9683501a9feebea6315224174ed05c Mon Sep 17 00:00:00 2001 From: "conda-forge-webservices[bot]" <91080706+conda-forge-webservices[bot]@users.noreply.github.com> Date: Wed, 26 Jun 2024 23:08:24 +0000 Subject: [PATCH 23/95] MNT: Re-rendered with conda-build 24.5.1, conda-smithy 3.36.2, and conda-forge-pinning 2024.06.26.07.13.35 From b48fd458a4133617c75c154658b5b4d10faf0c2a Mon Sep 17 00:00:00 2001 From: jakirkham Date: Wed, 26 Jun 2024 16:25:13 -0700 Subject: [PATCH 24/95] Adjust dependency constraints --- recipe/meta.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 5062ce71..1cc90eb0 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -37,8 +37,8 @@ outputs: host: - python - pip - - meson-python>=0.13.1 - - certifi>=2020.06.20 + - meson-python >=0.13.1 + - certifi >=2020.06.20 - pybind11 >=2.6 - freetype # freetype.pc requires zlib.pc @@ -63,7 +63,7 @@ outputs: - python-dateutil >=2.7 - freetype - tk # [linux] - - importlib-resources>=3.2.0 # [py<310] + - importlib-resources >=3.2.0 # [py<310] test: imports: - matplotlib From 61595a6ef1df22d724197d7b01d6004cc786edb4 Mon Sep 17 00:00:00 2001 From: jakirkham Date: Wed, 26 Jun 2024 16:26:13 -0700 Subject: [PATCH 25/95] Add `qhull` to dependencies --- recipe/meta.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 1cc90eb0..d5efc366 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -41,6 +41,7 @@ outputs: - certifi >=2020.06.20 - pybind11 >=2.6 - freetype + - qhull # freetype.pc requires zlib.pc - zlib - numpy From 8aefa594fe548f9e0e0bc3e5ea2e54192616ca21 Mon Sep 17 00:00:00 2001 From: jakirkham Date: Wed, 26 Jun 2024 16:26:49 -0700 Subject: [PATCH 26/95] Include NumPy 2 migration --- .ci_support/migrations/numpy2.yaml | 48 ++++++++++++++++++++++++++++++ 1 file changed, 48 insertions(+) create mode 100644 .ci_support/migrations/numpy2.yaml diff --git a/.ci_support/migrations/numpy2.yaml b/.ci_support/migrations/numpy2.yaml new file mode 100644 index 00000000..4e6d3ca6 --- /dev/null +++ b/.ci_support/migrations/numpy2.yaml @@ -0,0 +1,48 @@ +__migrator: + build_number: 1 + kind: version + commit_message: | + Rebuild for numpy 2.0 + + TL;DR: The way we build against numpy has changed as of numpy 2.0. This bot + PR has updated the recipe to account for the changes (see below for details). + + The biggest change is that we no longer need to use the oldest available numpy + version at build time in order to support old numpy version at runtime - numpy + will by default use a compatible ABI for the oldest still-supported numpy versions. + + Additionally, we no longer need to use `{{ pin_compatible("numpy") }}` as a + run requirement - this has been handled for more than two years now by a + run-export on the numpy package itself. The migrator will therefore remove + any occurrences of this. + + However, by default, building against numpy 2.0 will assume that the package + is compatible with numpy 2.0, which is not necessarily the case. You should + check that the upstream package explicitly supports numpy 2.0, otherwise you + need to add a `- numpy <2.0dev0` run requirement until that happens (check numpy + issue 26191 for an overview of the most important packages). + + ### To-Dos: + * [ ] Match run-requirements for numpy (i.e. check upstream `pyproject.toml` or however the project specifies numpy compatibility) + * If upstream is not yet compatible with numpy 2.0, add `numpy <2.0dev0` upper bound under `run:`. + * If upstream is already compatible with numpy 2.0, nothing else should be necessary in most cases. + * If upstream requires a minimum numpy version newer than 1.19, you can add `numpy >=x.y` under `run:`. + * [ ] Remove any remaining occurrences of `{{ pin_compatible("numpy") }}` that the bot may have missed. + + PS. If the build does not compile anymore, this is almost certainly a sign that + the upstream project is not yet ready for numpy 2.0; do not close this PR until + a version compatible with numpy 2.0 has been released upstream and on this + feedstock (in the meantime, you can keep the bot from reopening this PR in + case of git conflicts by marking it as a draft). + + migration_number: 1 + +# needs to match length of zip {python, python_impl, numpy} +# as it is in global CBC in order to override it +numpy: + - 1.22 # no py38 support for numpy 2.0 + - 2.0 + - 2.0 + - 2.0 + - 2.0 +migrator_ts: 1713572489.295986 From 11842a727995b0ce5306eca77fcbfe5e3e9309e3 Mon Sep 17 00:00:00 2001 From: jakirkham Date: Wed, 26 Jun 2024 16:29:20 -0700 Subject: [PATCH 27/95] Update NumPy dependency for NumPy 2 --- recipe/meta.yaml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index d5efc366..30e77120 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -56,8 +56,7 @@ outputs: - cycler >=0.10 - fonttools >=4.22.0 - kiwisolver >=1.3.1 - - numpy >=1.21,<2 - - {{ pin_compatible('numpy') }} + - numpy >=1.21 - packaging >=20.0 - pillow >=8 - pyparsing >=2.3.1 From 1f1f629f5a44b457a055028ad3e71ba57364b7d6 Mon Sep 17 00:00:00 2001 From: "conda-forge-webservices[bot]" <91080706+conda-forge-webservices[bot]@users.noreply.github.com> Date: Wed, 26 Jun 2024 23:31:48 +0000 Subject: [PATCH 28/95] MNT: Re-rendered with conda-build 24.5.1, conda-smithy 3.36.2, and conda-forge-pinning 2024.06.26.07.13.35 --- .azure-pipelines/azure-pipelines-linux.yml | 52 ++++----- .azure-pipelines/azure-pipelines-osx.yml | 34 +++--- .azure-pipelines/azure-pipelines-win.yml | 18 +-- ...ux_64_numpy2.0python3.10.____cpython.yaml} | 2 +- ...ux_64_numpy2.0python3.11.____cpython.yaml} | 2 +- ...ux_64_numpy2.0python3.12.____cpython.yaml} | 2 +- ...nux_64_numpy2.0python3.9.____cpython.yaml} | 2 +- ...rch64_numpy2.0python3.10.____cpython.yaml} | 2 +- ...rch64_numpy2.0python3.11.____cpython.yaml} | 2 +- ...rch64_numpy2.0python3.12.____cpython.yaml} | 2 +- ...arch64_numpy2.0python3.9.____cpython.yaml} | 2 +- ...c64le_numpy2.0python3.10.____cpython.yaml} | 2 +- ...c64le_numpy2.0python3.11.____cpython.yaml} | 2 +- ...c64le_numpy2.0python3.12.____cpython.yaml} | 2 +- ...pc64le_numpy2.0python3.9.____cpython.yaml} | 2 +- ...sx_64_numpy2.0python3.10.____cpython.yaml} | 2 +- ...sx_64_numpy2.0python3.11.____cpython.yaml} | 2 +- ...sx_64_numpy2.0python3.12.____cpython.yaml} | 2 +- ...osx_64_numpy2.0python3.9.____cpython.yaml} | 2 +- ...arm64_numpy2.0python3.10.____cpython.yaml} | 2 +- ...arm64_numpy2.0python3.11.____cpython.yaml} | 2 +- ...arm64_numpy2.0python3.12.____cpython.yaml} | 2 +- ..._arm64_numpy2.0python3.9.____cpython.yaml} | 2 +- ...in_64_numpy2.0python3.10.____cpython.yaml} | 2 +- ...in_64_numpy2.0python3.11.____cpython.yaml} | 2 +- ...in_64_numpy2.0python3.12.____cpython.yaml} | 2 +- ...win_64_numpy2.0python3.9.____cpython.yaml} | 2 +- README.md | 106 +++++++++--------- 28 files changed, 129 insertions(+), 129 deletions(-) rename .ci_support/{linux_64_numpy1.22python3.10.____cpython.yaml => linux_64_numpy2.0python3.10.____cpython.yaml} (98%) rename .ci_support/{linux_64_numpy1.23python3.11.____cpython.yaml => linux_64_numpy2.0python3.11.____cpython.yaml} (98%) rename .ci_support/{linux_64_numpy1.26python3.12.____cpython.yaml => linux_64_numpy2.0python3.12.____cpython.yaml} (98%) rename .ci_support/{linux_64_numpy1.22python3.9.____cpython.yaml => linux_64_numpy2.0python3.9.____cpython.yaml} (98%) rename .ci_support/{linux_aarch64_numpy1.22python3.10.____cpython.yaml => linux_aarch64_numpy2.0python3.10.____cpython.yaml} (98%) rename .ci_support/{linux_aarch64_numpy1.23python3.11.____cpython.yaml => linux_aarch64_numpy2.0python3.11.____cpython.yaml} (98%) rename .ci_support/{linux_aarch64_numpy1.26python3.12.____cpython.yaml => linux_aarch64_numpy2.0python3.12.____cpython.yaml} (98%) rename .ci_support/{linux_aarch64_numpy1.22python3.9.____cpython.yaml => linux_aarch64_numpy2.0python3.9.____cpython.yaml} (98%) rename .ci_support/{linux_ppc64le_numpy1.22python3.10.____cpython.yaml => linux_ppc64le_numpy2.0python3.10.____cpython.yaml} (98%) rename .ci_support/{linux_ppc64le_numpy1.23python3.11.____cpython.yaml => linux_ppc64le_numpy2.0python3.11.____cpython.yaml} (98%) rename .ci_support/{linux_ppc64le_numpy1.26python3.12.____cpython.yaml => linux_ppc64le_numpy2.0python3.12.____cpython.yaml} (98%) rename .ci_support/{linux_ppc64le_numpy1.22python3.9.____cpython.yaml => linux_ppc64le_numpy2.0python3.9.____cpython.yaml} (98%) rename .ci_support/{osx_64_numpy1.22python3.10.____cpython.yaml => osx_64_numpy2.0python3.10.____cpython.yaml} (98%) rename .ci_support/{osx_64_numpy1.23python3.11.____cpython.yaml => osx_64_numpy2.0python3.11.____cpython.yaml} (98%) rename .ci_support/{osx_64_numpy1.26python3.12.____cpython.yaml => osx_64_numpy2.0python3.12.____cpython.yaml} (98%) rename .ci_support/{osx_64_numpy1.22python3.9.____cpython.yaml => osx_64_numpy2.0python3.9.____cpython.yaml} (98%) rename .ci_support/{osx_arm64_numpy1.22python3.10.____cpython.yaml => osx_arm64_numpy2.0python3.10.____cpython.yaml} (98%) rename .ci_support/{osx_arm64_numpy1.23python3.11.____cpython.yaml => osx_arm64_numpy2.0python3.11.____cpython.yaml} (98%) rename .ci_support/{osx_arm64_numpy1.26python3.12.____cpython.yaml => osx_arm64_numpy2.0python3.12.____cpython.yaml} (98%) rename .ci_support/{osx_arm64_numpy1.22python3.9.____cpython.yaml => osx_arm64_numpy2.0python3.9.____cpython.yaml} (98%) rename .ci_support/{win_64_numpy1.22python3.10.____cpython.yaml => win_64_numpy2.0python3.10.____cpython.yaml} (97%) rename .ci_support/{win_64_numpy1.23python3.11.____cpython.yaml => win_64_numpy2.0python3.11.____cpython.yaml} (97%) rename .ci_support/{win_64_numpy1.26python3.12.____cpython.yaml => win_64_numpy2.0python3.12.____cpython.yaml} (97%) rename .ci_support/{win_64_numpy1.22python3.9.____cpython.yaml => win_64_numpy2.0python3.9.____cpython.yaml} (97%) diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml index 229a62a6..18e9e16d 100755 --- a/.azure-pipelines/azure-pipelines-linux.yml +++ b/.azure-pipelines/azure-pipelines-linux.yml @@ -8,10 +8,6 @@ jobs: vmImage: ubuntu-latest strategy: matrix: - linux_64_numpy1.22python3.10.____cpython: - CONFIG: linux_64_numpy1.22python3.10.____cpython - UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 linux_64_numpy1.22python3.8.____cpython: CONFIG: linux_64_numpy1.22python3.8.____cpython UPLOAD_PACKAGES: 'True' @@ -20,20 +16,20 @@ jobs: CONFIG: linux_64_numpy1.22python3.9.____73_pypy UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_64_numpy1.22python3.9.____cpython: - CONFIG: linux_64_numpy1.22python3.9.____cpython + linux_64_numpy2.0python3.10.____cpython: + CONFIG: linux_64_numpy2.0python3.10.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_64_numpy1.23python3.11.____cpython: - CONFIG: linux_64_numpy1.23python3.11.____cpython + linux_64_numpy2.0python3.11.____cpython: + CONFIG: linux_64_numpy2.0python3.11.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_64_numpy1.26python3.12.____cpython: - CONFIG: linux_64_numpy1.26python3.12.____cpython + linux_64_numpy2.0python3.12.____cpython: + CONFIG: linux_64_numpy2.0python3.12.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_aarch64_numpy1.22python3.10.____cpython: - CONFIG: linux_aarch64_numpy1.22python3.10.____cpython + linux_64_numpy2.0python3.9.____cpython: + CONFIG: linux_64_numpy2.0python3.9.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 linux_aarch64_numpy1.22python3.8.____cpython: @@ -44,20 +40,20 @@ jobs: CONFIG: linux_aarch64_numpy1.22python3.9.____73_pypy UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_aarch64_numpy1.22python3.9.____cpython: - CONFIG: linux_aarch64_numpy1.22python3.9.____cpython + linux_aarch64_numpy2.0python3.10.____cpython: + CONFIG: linux_aarch64_numpy2.0python3.10.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_aarch64_numpy1.23python3.11.____cpython: - CONFIG: linux_aarch64_numpy1.23python3.11.____cpython + linux_aarch64_numpy2.0python3.11.____cpython: + CONFIG: linux_aarch64_numpy2.0python3.11.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_aarch64_numpy1.26python3.12.____cpython: - CONFIG: linux_aarch64_numpy1.26python3.12.____cpython + linux_aarch64_numpy2.0python3.12.____cpython: + CONFIG: linux_aarch64_numpy2.0python3.12.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_ppc64le_numpy1.22python3.10.____cpython: - CONFIG: linux_ppc64le_numpy1.22python3.10.____cpython + linux_aarch64_numpy2.0python3.9.____cpython: + CONFIG: linux_aarch64_numpy2.0python3.9.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 linux_ppc64le_numpy1.22python3.8.____cpython: @@ -68,16 +64,20 @@ jobs: CONFIG: linux_ppc64le_numpy1.22python3.9.____73_pypy UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_ppc64le_numpy1.22python3.9.____cpython: - CONFIG: linux_ppc64le_numpy1.22python3.9.____cpython + linux_ppc64le_numpy2.0python3.10.____cpython: + CONFIG: linux_ppc64le_numpy2.0python3.10.____cpython + UPLOAD_PACKAGES: 'True' + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 + linux_ppc64le_numpy2.0python3.11.____cpython: + CONFIG: linux_ppc64le_numpy2.0python3.11.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_ppc64le_numpy1.23python3.11.____cpython: - CONFIG: linux_ppc64le_numpy1.23python3.11.____cpython + linux_ppc64le_numpy2.0python3.12.____cpython: + CONFIG: linux_ppc64le_numpy2.0python3.12.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_ppc64le_numpy1.26python3.12.____cpython: - CONFIG: linux_ppc64le_numpy1.26python3.12.____cpython + linux_ppc64le_numpy2.0python3.9.____cpython: + CONFIG: linux_ppc64le_numpy2.0python3.9.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 timeoutInMinutes: 360 diff --git a/.azure-pipelines/azure-pipelines-osx.yml b/.azure-pipelines/azure-pipelines-osx.yml index 27ddd14f..59e6f8f9 100755 --- a/.azure-pipelines/azure-pipelines-osx.yml +++ b/.azure-pipelines/azure-pipelines-osx.yml @@ -8,38 +8,38 @@ jobs: vmImage: macOS-12 strategy: matrix: - osx_64_numpy1.22python3.10.____cpython: - CONFIG: osx_64_numpy1.22python3.10.____cpython - UPLOAD_PACKAGES: 'True' osx_64_numpy1.22python3.8.____cpython: CONFIG: osx_64_numpy1.22python3.8.____cpython UPLOAD_PACKAGES: 'True' osx_64_numpy1.22python3.9.____73_pypy: CONFIG: osx_64_numpy1.22python3.9.____73_pypy UPLOAD_PACKAGES: 'True' - osx_64_numpy1.22python3.9.____cpython: - CONFIG: osx_64_numpy1.22python3.9.____cpython + osx_64_numpy2.0python3.10.____cpython: + CONFIG: osx_64_numpy2.0python3.10.____cpython UPLOAD_PACKAGES: 'True' - osx_64_numpy1.23python3.11.____cpython: - CONFIG: osx_64_numpy1.23python3.11.____cpython + osx_64_numpy2.0python3.11.____cpython: + CONFIG: osx_64_numpy2.0python3.11.____cpython UPLOAD_PACKAGES: 'True' - osx_64_numpy1.26python3.12.____cpython: - CONFIG: osx_64_numpy1.26python3.12.____cpython + osx_64_numpy2.0python3.12.____cpython: + CONFIG: osx_64_numpy2.0python3.12.____cpython UPLOAD_PACKAGES: 'True' - osx_arm64_numpy1.22python3.10.____cpython: - CONFIG: osx_arm64_numpy1.22python3.10.____cpython + osx_64_numpy2.0python3.9.____cpython: + CONFIG: osx_64_numpy2.0python3.9.____cpython UPLOAD_PACKAGES: 'True' osx_arm64_numpy1.22python3.8.____cpython: CONFIG: osx_arm64_numpy1.22python3.8.____cpython UPLOAD_PACKAGES: 'True' - osx_arm64_numpy1.22python3.9.____cpython: - CONFIG: osx_arm64_numpy1.22python3.9.____cpython + osx_arm64_numpy2.0python3.10.____cpython: + CONFIG: osx_arm64_numpy2.0python3.10.____cpython + UPLOAD_PACKAGES: 'True' + osx_arm64_numpy2.0python3.11.____cpython: + CONFIG: osx_arm64_numpy2.0python3.11.____cpython UPLOAD_PACKAGES: 'True' - osx_arm64_numpy1.23python3.11.____cpython: - CONFIG: osx_arm64_numpy1.23python3.11.____cpython + osx_arm64_numpy2.0python3.12.____cpython: + CONFIG: osx_arm64_numpy2.0python3.12.____cpython UPLOAD_PACKAGES: 'True' - osx_arm64_numpy1.26python3.12.____cpython: - CONFIG: osx_arm64_numpy1.26python3.12.____cpython + osx_arm64_numpy2.0python3.9.____cpython: + CONFIG: osx_arm64_numpy2.0python3.9.____cpython UPLOAD_PACKAGES: 'True' timeoutInMinutes: 360 variables: {} diff --git a/.azure-pipelines/azure-pipelines-win.yml b/.azure-pipelines/azure-pipelines-win.yml index 9f5a7811..6e15e527 100755 --- a/.azure-pipelines/azure-pipelines-win.yml +++ b/.azure-pipelines/azure-pipelines-win.yml @@ -8,23 +8,23 @@ jobs: vmImage: windows-2022 strategy: matrix: - win_64_numpy1.22python3.10.____cpython: - CONFIG: win_64_numpy1.22python3.10.____cpython - UPLOAD_PACKAGES: 'True' win_64_numpy1.22python3.8.____cpython: CONFIG: win_64_numpy1.22python3.8.____cpython UPLOAD_PACKAGES: 'True' win_64_numpy1.22python3.9.____73_pypy: CONFIG: win_64_numpy1.22python3.9.____73_pypy UPLOAD_PACKAGES: 'True' - win_64_numpy1.22python3.9.____cpython: - CONFIG: win_64_numpy1.22python3.9.____cpython + win_64_numpy2.0python3.10.____cpython: + CONFIG: win_64_numpy2.0python3.10.____cpython + UPLOAD_PACKAGES: 'True' + win_64_numpy2.0python3.11.____cpython: + CONFIG: win_64_numpy2.0python3.11.____cpython UPLOAD_PACKAGES: 'True' - win_64_numpy1.23python3.11.____cpython: - CONFIG: win_64_numpy1.23python3.11.____cpython + win_64_numpy2.0python3.12.____cpython: + CONFIG: win_64_numpy2.0python3.12.____cpython UPLOAD_PACKAGES: 'True' - win_64_numpy1.26python3.12.____cpython: - CONFIG: win_64_numpy1.26python3.12.____cpython + win_64_numpy2.0python3.9.____cpython: + CONFIG: win_64_numpy2.0python3.9.____cpython UPLOAD_PACKAGES: 'True' timeoutInMinutes: 360 variables: diff --git a/.ci_support/linux_64_numpy1.22python3.10.____cpython.yaml b/.ci_support/linux_64_numpy2.0python3.10.____cpython.yaml similarity index 98% rename from .ci_support/linux_64_numpy1.22python3.10.____cpython.yaml rename to .ci_support/linux_64_numpy2.0python3.10.____cpython.yaml index d330becd..7150aefa 100644 --- a/.ci_support/linux_64_numpy1.22python3.10.____cpython.yaml +++ b/.ci_support/linux_64_numpy2.0python3.10.____cpython.yaml @@ -21,7 +21,7 @@ docker_image: freetype: - '2' numpy: -- '1.22' +- '2.0' pin_run_as_build: python: min_pin: x.x diff --git a/.ci_support/linux_64_numpy1.23python3.11.____cpython.yaml b/.ci_support/linux_64_numpy2.0python3.11.____cpython.yaml similarity index 98% rename from .ci_support/linux_64_numpy1.23python3.11.____cpython.yaml rename to .ci_support/linux_64_numpy2.0python3.11.____cpython.yaml index 8391215a..0cea911d 100644 --- a/.ci_support/linux_64_numpy1.23python3.11.____cpython.yaml +++ b/.ci_support/linux_64_numpy2.0python3.11.____cpython.yaml @@ -21,7 +21,7 @@ docker_image: freetype: - '2' numpy: -- '1.23' +- '2.0' pin_run_as_build: python: min_pin: x.x diff --git a/.ci_support/linux_64_numpy1.26python3.12.____cpython.yaml b/.ci_support/linux_64_numpy2.0python3.12.____cpython.yaml similarity index 98% rename from .ci_support/linux_64_numpy1.26python3.12.____cpython.yaml rename to .ci_support/linux_64_numpy2.0python3.12.____cpython.yaml index 8ef25e0d..f9947d99 100644 --- a/.ci_support/linux_64_numpy1.26python3.12.____cpython.yaml +++ b/.ci_support/linux_64_numpy2.0python3.12.____cpython.yaml @@ -21,7 +21,7 @@ docker_image: freetype: - '2' numpy: -- '1.26' +- '2.0' pin_run_as_build: python: min_pin: x.x diff --git a/.ci_support/linux_64_numpy1.22python3.9.____cpython.yaml b/.ci_support/linux_64_numpy2.0python3.9.____cpython.yaml similarity index 98% rename from .ci_support/linux_64_numpy1.22python3.9.____cpython.yaml rename to .ci_support/linux_64_numpy2.0python3.9.____cpython.yaml index cf3ddd18..addf2311 100644 --- a/.ci_support/linux_64_numpy1.22python3.9.____cpython.yaml +++ b/.ci_support/linux_64_numpy2.0python3.9.____cpython.yaml @@ -21,7 +21,7 @@ docker_image: freetype: - '2' numpy: -- '1.22' +- '2.0' pin_run_as_build: python: min_pin: x.x diff --git a/.ci_support/linux_aarch64_numpy1.22python3.10.____cpython.yaml b/.ci_support/linux_aarch64_numpy2.0python3.10.____cpython.yaml similarity index 98% rename from .ci_support/linux_aarch64_numpy1.22python3.10.____cpython.yaml rename to .ci_support/linux_aarch64_numpy2.0python3.10.____cpython.yaml index 5834185f..82992a08 100644 --- a/.ci_support/linux_aarch64_numpy1.22python3.10.____cpython.yaml +++ b/.ci_support/linux_aarch64_numpy2.0python3.10.____cpython.yaml @@ -25,7 +25,7 @@ docker_image: freetype: - '2' numpy: -- '1.22' +- '2.0' pin_run_as_build: python: min_pin: x.x diff --git a/.ci_support/linux_aarch64_numpy1.23python3.11.____cpython.yaml b/.ci_support/linux_aarch64_numpy2.0python3.11.____cpython.yaml similarity index 98% rename from .ci_support/linux_aarch64_numpy1.23python3.11.____cpython.yaml rename to .ci_support/linux_aarch64_numpy2.0python3.11.____cpython.yaml index 3bfd3b2a..43214185 100644 --- a/.ci_support/linux_aarch64_numpy1.23python3.11.____cpython.yaml +++ b/.ci_support/linux_aarch64_numpy2.0python3.11.____cpython.yaml @@ -25,7 +25,7 @@ docker_image: freetype: - '2' numpy: -- '1.23' +- '2.0' pin_run_as_build: python: min_pin: x.x diff --git a/.ci_support/linux_aarch64_numpy1.26python3.12.____cpython.yaml b/.ci_support/linux_aarch64_numpy2.0python3.12.____cpython.yaml similarity index 98% rename from .ci_support/linux_aarch64_numpy1.26python3.12.____cpython.yaml rename to .ci_support/linux_aarch64_numpy2.0python3.12.____cpython.yaml index 8a399aca..4767e6ed 100644 --- a/.ci_support/linux_aarch64_numpy1.26python3.12.____cpython.yaml +++ b/.ci_support/linux_aarch64_numpy2.0python3.12.____cpython.yaml @@ -25,7 +25,7 @@ docker_image: freetype: - '2' numpy: -- '1.26' +- '2.0' pin_run_as_build: python: min_pin: x.x diff --git a/.ci_support/linux_aarch64_numpy1.22python3.9.____cpython.yaml b/.ci_support/linux_aarch64_numpy2.0python3.9.____cpython.yaml similarity index 98% rename from .ci_support/linux_aarch64_numpy1.22python3.9.____cpython.yaml rename to .ci_support/linux_aarch64_numpy2.0python3.9.____cpython.yaml index eaeae96d..a2cb07db 100644 --- a/.ci_support/linux_aarch64_numpy1.22python3.9.____cpython.yaml +++ b/.ci_support/linux_aarch64_numpy2.0python3.9.____cpython.yaml @@ -25,7 +25,7 @@ docker_image: freetype: - '2' numpy: -- '1.22' +- '2.0' pin_run_as_build: python: min_pin: x.x diff --git a/.ci_support/linux_ppc64le_numpy1.22python3.10.____cpython.yaml b/.ci_support/linux_ppc64le_numpy2.0python3.10.____cpython.yaml similarity index 98% rename from .ci_support/linux_ppc64le_numpy1.22python3.10.____cpython.yaml rename to .ci_support/linux_ppc64le_numpy2.0python3.10.____cpython.yaml index 61b83479..97564b73 100644 --- a/.ci_support/linux_ppc64le_numpy1.22python3.10.____cpython.yaml +++ b/.ci_support/linux_ppc64le_numpy2.0python3.10.____cpython.yaml @@ -21,7 +21,7 @@ docker_image: freetype: - '2' numpy: -- '1.22' +- '2.0' pin_run_as_build: python: min_pin: x.x diff --git a/.ci_support/linux_ppc64le_numpy1.23python3.11.____cpython.yaml b/.ci_support/linux_ppc64le_numpy2.0python3.11.____cpython.yaml similarity index 98% rename from .ci_support/linux_ppc64le_numpy1.23python3.11.____cpython.yaml rename to .ci_support/linux_ppc64le_numpy2.0python3.11.____cpython.yaml index f973acb7..2765f56c 100644 --- a/.ci_support/linux_ppc64le_numpy1.23python3.11.____cpython.yaml +++ b/.ci_support/linux_ppc64le_numpy2.0python3.11.____cpython.yaml @@ -21,7 +21,7 @@ docker_image: freetype: - '2' numpy: -- '1.23' +- '2.0' pin_run_as_build: python: min_pin: x.x diff --git a/.ci_support/linux_ppc64le_numpy1.26python3.12.____cpython.yaml b/.ci_support/linux_ppc64le_numpy2.0python3.12.____cpython.yaml similarity index 98% rename from .ci_support/linux_ppc64le_numpy1.26python3.12.____cpython.yaml rename to .ci_support/linux_ppc64le_numpy2.0python3.12.____cpython.yaml index 8965a2d4..c8c7edda 100644 --- a/.ci_support/linux_ppc64le_numpy1.26python3.12.____cpython.yaml +++ b/.ci_support/linux_ppc64le_numpy2.0python3.12.____cpython.yaml @@ -21,7 +21,7 @@ docker_image: freetype: - '2' numpy: -- '1.26' +- '2.0' pin_run_as_build: python: min_pin: x.x diff --git a/.ci_support/linux_ppc64le_numpy1.22python3.9.____cpython.yaml b/.ci_support/linux_ppc64le_numpy2.0python3.9.____cpython.yaml similarity index 98% rename from .ci_support/linux_ppc64le_numpy1.22python3.9.____cpython.yaml rename to .ci_support/linux_ppc64le_numpy2.0python3.9.____cpython.yaml index a3fbacda..ff3c70d6 100644 --- a/.ci_support/linux_ppc64le_numpy1.22python3.9.____cpython.yaml +++ b/.ci_support/linux_ppc64le_numpy2.0python3.9.____cpython.yaml @@ -21,7 +21,7 @@ docker_image: freetype: - '2' numpy: -- '1.22' +- '2.0' pin_run_as_build: python: min_pin: x.x diff --git a/.ci_support/osx_64_numpy1.22python3.10.____cpython.yaml b/.ci_support/osx_64_numpy2.0python3.10.____cpython.yaml similarity index 98% rename from .ci_support/osx_64_numpy1.22python3.10.____cpython.yaml rename to .ci_support/osx_64_numpy2.0python3.10.____cpython.yaml index 215be45e..ae425568 100644 --- a/.ci_support/osx_64_numpy1.22python3.10.____cpython.yaml +++ b/.ci_support/osx_64_numpy2.0python3.10.____cpython.yaml @@ -23,7 +23,7 @@ freetype: macos_machine: - x86_64-apple-darwin13.4.0 numpy: -- '1.22' +- '2.0' pin_run_as_build: python: min_pin: x.x diff --git a/.ci_support/osx_64_numpy1.23python3.11.____cpython.yaml b/.ci_support/osx_64_numpy2.0python3.11.____cpython.yaml similarity index 98% rename from .ci_support/osx_64_numpy1.23python3.11.____cpython.yaml rename to .ci_support/osx_64_numpy2.0python3.11.____cpython.yaml index 80c0dd52..f10f6530 100644 --- a/.ci_support/osx_64_numpy1.23python3.11.____cpython.yaml +++ b/.ci_support/osx_64_numpy2.0python3.11.____cpython.yaml @@ -23,7 +23,7 @@ freetype: macos_machine: - x86_64-apple-darwin13.4.0 numpy: -- '1.23' +- '2.0' pin_run_as_build: python: min_pin: x.x diff --git a/.ci_support/osx_64_numpy1.26python3.12.____cpython.yaml b/.ci_support/osx_64_numpy2.0python3.12.____cpython.yaml similarity index 98% rename from .ci_support/osx_64_numpy1.26python3.12.____cpython.yaml rename to .ci_support/osx_64_numpy2.0python3.12.____cpython.yaml index a507889d..d78ccf0f 100644 --- a/.ci_support/osx_64_numpy1.26python3.12.____cpython.yaml +++ b/.ci_support/osx_64_numpy2.0python3.12.____cpython.yaml @@ -23,7 +23,7 @@ freetype: macos_machine: - x86_64-apple-darwin13.4.0 numpy: -- '1.26' +- '2.0' pin_run_as_build: python: min_pin: x.x diff --git a/.ci_support/osx_64_numpy1.22python3.9.____cpython.yaml b/.ci_support/osx_64_numpy2.0python3.9.____cpython.yaml similarity index 98% rename from .ci_support/osx_64_numpy1.22python3.9.____cpython.yaml rename to .ci_support/osx_64_numpy2.0python3.9.____cpython.yaml index 97e982a9..8e6f2037 100644 --- a/.ci_support/osx_64_numpy1.22python3.9.____cpython.yaml +++ b/.ci_support/osx_64_numpy2.0python3.9.____cpython.yaml @@ -23,7 +23,7 @@ freetype: macos_machine: - x86_64-apple-darwin13.4.0 numpy: -- '1.22' +- '2.0' pin_run_as_build: python: min_pin: x.x diff --git a/.ci_support/osx_arm64_numpy1.22python3.10.____cpython.yaml b/.ci_support/osx_arm64_numpy2.0python3.10.____cpython.yaml similarity index 98% rename from .ci_support/osx_arm64_numpy1.22python3.10.____cpython.yaml rename to .ci_support/osx_arm64_numpy2.0python3.10.____cpython.yaml index cca4ffaa..19e96a7d 100644 --- a/.ci_support/osx_arm64_numpy1.22python3.10.____cpython.yaml +++ b/.ci_support/osx_arm64_numpy2.0python3.10.____cpython.yaml @@ -23,7 +23,7 @@ freetype: macos_machine: - arm64-apple-darwin20.0.0 numpy: -- '1.22' +- '2.0' pin_run_as_build: python: min_pin: x.x diff --git a/.ci_support/osx_arm64_numpy1.23python3.11.____cpython.yaml b/.ci_support/osx_arm64_numpy2.0python3.11.____cpython.yaml similarity index 98% rename from .ci_support/osx_arm64_numpy1.23python3.11.____cpython.yaml rename to .ci_support/osx_arm64_numpy2.0python3.11.____cpython.yaml index c304d66b..6fd898c4 100644 --- a/.ci_support/osx_arm64_numpy1.23python3.11.____cpython.yaml +++ b/.ci_support/osx_arm64_numpy2.0python3.11.____cpython.yaml @@ -23,7 +23,7 @@ freetype: macos_machine: - arm64-apple-darwin20.0.0 numpy: -- '1.23' +- '2.0' pin_run_as_build: python: min_pin: x.x diff --git a/.ci_support/osx_arm64_numpy1.26python3.12.____cpython.yaml b/.ci_support/osx_arm64_numpy2.0python3.12.____cpython.yaml similarity index 98% rename from .ci_support/osx_arm64_numpy1.26python3.12.____cpython.yaml rename to .ci_support/osx_arm64_numpy2.0python3.12.____cpython.yaml index 9f658488..30cb23ae 100644 --- a/.ci_support/osx_arm64_numpy1.26python3.12.____cpython.yaml +++ b/.ci_support/osx_arm64_numpy2.0python3.12.____cpython.yaml @@ -23,7 +23,7 @@ freetype: macos_machine: - arm64-apple-darwin20.0.0 numpy: -- '1.26' +- '2.0' pin_run_as_build: python: min_pin: x.x diff --git a/.ci_support/osx_arm64_numpy1.22python3.9.____cpython.yaml b/.ci_support/osx_arm64_numpy2.0python3.9.____cpython.yaml similarity index 98% rename from .ci_support/osx_arm64_numpy1.22python3.9.____cpython.yaml rename to .ci_support/osx_arm64_numpy2.0python3.9.____cpython.yaml index 7dbfad69..06668c85 100644 --- a/.ci_support/osx_arm64_numpy1.22python3.9.____cpython.yaml +++ b/.ci_support/osx_arm64_numpy2.0python3.9.____cpython.yaml @@ -23,7 +23,7 @@ freetype: macos_machine: - arm64-apple-darwin20.0.0 numpy: -- '1.22' +- '2.0' pin_run_as_build: python: min_pin: x.x diff --git a/.ci_support/win_64_numpy1.22python3.10.____cpython.yaml b/.ci_support/win_64_numpy2.0python3.10.____cpython.yaml similarity index 97% rename from .ci_support/win_64_numpy1.22python3.10.____cpython.yaml rename to .ci_support/win_64_numpy2.0python3.10.____cpython.yaml index 7f955d39..eefb474b 100644 --- a/.ci_support/win_64_numpy1.22python3.10.____cpython.yaml +++ b/.ci_support/win_64_numpy2.0python3.10.____cpython.yaml @@ -11,7 +11,7 @@ cxx_compiler: freetype: - '2' numpy: -- '1.22' +- '2.0' pin_run_as_build: python: min_pin: x.x diff --git a/.ci_support/win_64_numpy1.23python3.11.____cpython.yaml b/.ci_support/win_64_numpy2.0python3.11.____cpython.yaml similarity index 97% rename from .ci_support/win_64_numpy1.23python3.11.____cpython.yaml rename to .ci_support/win_64_numpy2.0python3.11.____cpython.yaml index 6fb1eb35..d3b8d80d 100644 --- a/.ci_support/win_64_numpy1.23python3.11.____cpython.yaml +++ b/.ci_support/win_64_numpy2.0python3.11.____cpython.yaml @@ -11,7 +11,7 @@ cxx_compiler: freetype: - '2' numpy: -- '1.23' +- '2.0' pin_run_as_build: python: min_pin: x.x diff --git a/.ci_support/win_64_numpy1.26python3.12.____cpython.yaml b/.ci_support/win_64_numpy2.0python3.12.____cpython.yaml similarity index 97% rename from .ci_support/win_64_numpy1.26python3.12.____cpython.yaml rename to .ci_support/win_64_numpy2.0python3.12.____cpython.yaml index f077560f..d9a9f794 100644 --- a/.ci_support/win_64_numpy1.26python3.12.____cpython.yaml +++ b/.ci_support/win_64_numpy2.0python3.12.____cpython.yaml @@ -11,7 +11,7 @@ cxx_compiler: freetype: - '2' numpy: -- '1.26' +- '2.0' pin_run_as_build: python: min_pin: x.x diff --git a/.ci_support/win_64_numpy1.22python3.9.____cpython.yaml b/.ci_support/win_64_numpy2.0python3.9.____cpython.yaml similarity index 97% rename from .ci_support/win_64_numpy1.22python3.9.____cpython.yaml rename to .ci_support/win_64_numpy2.0python3.9.____cpython.yaml index 5d878822..ba73cef8 100644 --- a/.ci_support/win_64_numpy1.22python3.9.____cpython.yaml +++ b/.ci_support/win_64_numpy2.0python3.9.____cpython.yaml @@ -11,7 +11,7 @@ cxx_compiler: freetype: - '2' numpy: -- '1.22' +- '2.0' pin_run_as_build: python: min_pin: x.x diff --git a/README.md b/README.md index b13a20af..b756a8de 100644 --- a/README.md +++ b/README.md @@ -38,13 +38,6 @@ Current build status - - - - + - + - + - + @@ -101,31 +94,31 @@ Current build status - + - + - + - + @@ -143,31 +136,31 @@ Current build status - + - + - + - + @@ -185,31 +178,31 @@ Current build status - + - + - + - + @@ -220,31 +213,31 @@ Current build status - + - + - + - + @@ -262,24 +255,31 @@ Current build status - + + + + - + - + From 6988a6a1593208432644cad94b941924d4c15987 Mon Sep 17 00:00:00 2001 From: jakirkham Date: Wed, 26 Jun 2024 16:46:19 -0700 Subject: [PATCH 29/95] Include additional Meson build steps --- recipe/build_base.bat | 7 +++++++ recipe/build_base.sh | 4 ++++ 2 files changed, 11 insertions(+) diff --git a/recipe/build_base.bat b/recipe/build_base.bat index eaee259c..a660cb6d 100644 --- a/recipe/build_base.bat +++ b/recipe/build_base.bat @@ -1,7 +1,14 @@ +@echo on + set LIB=%LIBRARY_LIB%;%LIB% set LIBPATH=%LIBRARY_LIB%;%LIBPATH% set INCLUDE=%LIBRARY_INC%;%INCLUDE% mkdir builddir +if errorlevel 1 exit 1 %PYTHON% -m mesonbuild.mesonmain setup %MESON_ARGS% builddir if errorlevel 1 exit 1 +%PYTHON% -m build --wheel --no-isolation --skip-dependency-check -Cbuilddir=builddir +if errorlevel 1 exit 1 +for %x in (dir *.whl) do %PYTHON% -m pip install %x +if errorlevel 1 exit 1 diff --git a/recipe/build_base.sh b/recipe/build_base.sh index b82893b5..64aaf157 100644 --- a/recipe/build_base.sh +++ b/recipe/build_base.sh @@ -1,6 +1,10 @@ #!/bin/bash +set -ex + export AR=$GCC_AR mkdir builddir $PYTHON -m mesonbuild.mesonmain setup $MESON_ARGS builddir +$PYTHON -m build --wheel --no-isolation --skip-dependency-check -Cbuilddir=builddir +$PYTHON -m pip install dist/matplotlib*.whl From 676cfef2ed4e8dc666f511b53bfbf8d760f1148c Mon Sep 17 00:00:00 2001 From: jakirkham Date: Wed, 26 Jun 2024 16:58:53 -0700 Subject: [PATCH 30/95] Use `python-build` --- recipe/meta.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 30e77120..4dba9916 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -36,6 +36,7 @@ outputs: - libtool # [unix] host: - python + - python-build - pip - meson-python >=0.13.1 - certifi >=2020.06.20 From 51495f1975157d3bfc089f8c754900c4b3a025fd Mon Sep 17 00:00:00 2001 From: jakirkham Date: Wed, 26 Jun 2024 17:08:39 -0700 Subject: [PATCH 31/95] Refresh PyPy migrator --- .ci_support/migrations/pypy38.yaml | 67 +++++++++++++++--------------- 1 file changed, 33 insertions(+), 34 deletions(-) diff --git a/.ci_support/migrations/pypy38.yaml b/.ci_support/migrations/pypy38.yaml index 741fc1eb..29fb4514 100644 --- a/.ci_support/migrations/pypy38.yaml +++ b/.ci_support/migrations/pypy38.yaml @@ -1,43 +1,42 @@ migrator_ts: 1647123563 __migrator: - migration_number: 1 - operation: key_add - primary_key: python - ordering: - python: - - 3.6.* *_cpython - - 3.7.* *_cpython - - 3.8.* *_cpython - - 3.9.* *_cpython - - 3.10.* *_cpython - - 3.6.* *_73_pypy - - 3.7.* *_73_pypy - - 3.8.* *_73_pypy - - 3.9.* *_73_pypy - paused: False - longterm: True - use_local: False - check_solvable: True - exclude_pinned_pkgs: False - pr_limit: 10 - bump_number: 1 - commit_message: "Rebuild for PyPy3.8 and PyPy3.9" - exclude: - # this shouldn't attempt to modify the python feedstocks - - python - - pypy3.6 - - pypy-meta - ignored_deps_per_node: - matplotlib: - - pyqt + migration_number: 1 + operation: key_add + primary_key: python + ordering: + python: + - 3.6.* *_cpython + - 3.7.* *_cpython + - 3.8.* *_cpython + - 3.9.* *_cpython + - 3.10.* *_cpython + - 3.11.* *_cpython + - 3.12.* *_cpython + - 3.6.* *_73_pypy + - 3.7.* *_73_pypy + - 3.8.* *_73_pypy + - 3.9.* *_73_pypy + paused: False + longterm: True + use_local: False + check_solvable: True + exclude_pinned_pkgs: False + pr_limit: 5 + bump_number: 1 + commit_message: "Rebuild for PyPy3.9" + exclude: + # this shouldn't attempt to modify the python feedstocks + - python + - pypy3.6 + - pypy-meta + ignored_deps_per_node: + matplotlib: + - pyqt python: - - 3.8.* *_73_pypy # [not (osx and arm64)] - 3.9.* *_73_pypy # [not (osx and arm64)] numpy: # part of a zip_keys: python, python_impl, numpy - - 1.19 # [not (osx and arm64)] - - 1.19 # [not (osx and arm64)] + - 1.22 # [not (osx and arm64)] python_impl: - pypy # [not (osx and arm64)] - - pypy # [not (osx and arm64)] From 7ae5e3545c421e65a1d6da2829ff715c4d38116a Mon Sep 17 00:00:00 2001 From: jakirkham Date: Wed, 26 Jun 2024 17:09:13 -0700 Subject: [PATCH 32/95] Refresh Python 3.12 migrator --- .ci_support/migrations/python312.yaml | 56 +++++++++++++-------------- 1 file changed, 28 insertions(+), 28 deletions(-) diff --git a/.ci_support/migrations/python312.yaml b/.ci_support/migrations/python312.yaml index b39b1bb1..d71f6f16 100644 --- a/.ci_support/migrations/python312.yaml +++ b/.ci_support/migrations/python312.yaml @@ -1,33 +1,33 @@ migrator_ts: 1695046563 __migrator: - migration_number: 1 - operation: key_add - primary_key: python - ordering: - python: - - 3.6.* *_cpython - - 3.7.* *_cpython - - 3.8.* *_cpython - - 3.9.* *_cpython - - 3.10.* *_cpython - - 3.11.* *_cpython - - 3.12.* *_cpython # new entry - - 3.6.* *_73_pypy - - 3.7.* *_73_pypy - - 3.8.* *_73_pypy - - 3.9.* *_73_pypy - paused: false - longterm: True - pr_limit: 30 - max_solver_attempts: 6 # this will make the bot retry "not solvable" stuff 6 times - exclude: - # this shouldn't attempt to modify the python feedstocks - - python - - pypy3.6 - - pypy-meta - - cross-python - - python_abi - exclude_pinned_pkgs: false + migration_number: 1 + operation: key_add + primary_key: python + ordering: + python: + - 3.6.* *_cpython + - 3.7.* *_cpython + - 3.8.* *_cpython + - 3.9.* *_cpython + - 3.10.* *_cpython + - 3.11.* *_cpython + - 3.12.* *_cpython # new entry + - 3.6.* *_73_pypy + - 3.7.* *_73_pypy + - 3.8.* *_73_pypy + - 3.9.* *_73_pypy + paused: false + longterm: True + pr_limit: 5 + max_solver_attempts: 6 # this will make the bot retry "not solvable" stuff 6 times + exclude: + # this shouldn't attempt to modify the python feedstocks + - python + - pypy3.6 + - pypy-meta + - cross-python + - python_abi + exclude_pinned_pkgs: false python: - 3.12.* *_cpython From 1d35c7c336626683bfc4ef5d86fa4033f30a42ac Mon Sep 17 00:00:00 2001 From: jakirkham Date: Wed, 26 Jun 2024 17:12:53 -0700 Subject: [PATCH 33/95] Fix Windows `pip install` command --- recipe/build_base.bat | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipe/build_base.bat b/recipe/build_base.bat index a660cb6d..95908c63 100644 --- a/recipe/build_base.bat +++ b/recipe/build_base.bat @@ -10,5 +10,5 @@ if errorlevel 1 exit 1 if errorlevel 1 exit 1 %PYTHON% -m build --wheel --no-isolation --skip-dependency-check -Cbuilddir=builddir if errorlevel 1 exit 1 -for %x in (dir *.whl) do %PYTHON% -m pip install %x +for %x in (dir *.whl) do (%PYTHON% -m pip install %x) if errorlevel 1 exit 1 From 416713406d5e973c4887500140526bfb90b938f6 Mon Sep 17 00:00:00 2001 From: jakirkham Date: Wed, 26 Jun 2024 17:14:33 -0700 Subject: [PATCH 34/95] Add `ninja` to `requirements/build` --- recipe/meta.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 4dba9916..dfbf6f75 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -34,6 +34,7 @@ outputs: - cmake # [win] - pkg-config # [unix] - libtool # [unix] + - ninja host: - python - python-build From 05b48bde689d3cea0370b20817fd2e7adb7541ea Mon Sep 17 00:00:00 2001 From: jakirkham Date: Wed, 26 Jun 2024 17:30:16 -0700 Subject: [PATCH 35/95] Workaround `conda-build` `outputs` `pip` conf bug --- recipe/meta.yaml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index dfbf6f75..c3b8e077 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -22,6 +22,15 @@ outputs: skip: true # [py<39] ignore_run_exports_from: - zlib + script_env: + # Workaround an upstream conda-build issue w/pip & `outputs` by setting env vars manually. + # Drop once conda-build 24.7.0 is released. + # xref: https://github.com/conda/conda-build/issues/3993 + - PIP_NO_BUILD_ISOLATION=False + - PIP_NO_DEPENDENCIES=True + - PIP_IGNORE_INSTALLED=True + - PIP_CACHE_DIR=pip_cache + - PIP_NO_INDEX=True requirements: build: - python # [build_platform != target_platform] From 6028fbbe0d4885f738a08c0b0a07fced21bdec04 Mon Sep 17 00:00:00 2001 From: jakirkham Date: Wed, 26 Jun 2024 17:33:10 -0700 Subject: [PATCH 36/95] Drop Windows env var workarounds --- recipe/build_base.bat | 4 ---- 1 file changed, 4 deletions(-) diff --git a/recipe/build_base.bat b/recipe/build_base.bat index 95908c63..9fc51136 100644 --- a/recipe/build_base.bat +++ b/recipe/build_base.bat @@ -1,9 +1,5 @@ @echo on -set LIB=%LIBRARY_LIB%;%LIB% -set LIBPATH=%LIBRARY_LIB%;%LIBPATH% -set INCLUDE=%LIBRARY_INC%;%INCLUDE% - mkdir builddir if errorlevel 1 exit 1 %PYTHON% -m mesonbuild.mesonmain setup %MESON_ARGS% builddir From d0bfec4f03275d56b9b2379313fd28801acb53cd Mon Sep 17 00:00:00 2001 From: jakirkham Date: Wed, 26 Jun 2024 17:36:45 -0700 Subject: [PATCH 37/95] Bump NumPy minimum to 1.23 https://github.com/matplotlib/matplotlib/blob/be56634d682bed257cb941369d8d3600635ddadf/pyproject.toml#L38 --- recipe/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index c3b8e077..3b612981 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -67,7 +67,7 @@ outputs: - cycler >=0.10 - fonttools >=4.22.0 - kiwisolver >=1.3.1 - - numpy >=1.21 + - numpy >=1.23 - packaging >=20.0 - pillow >=8 - pyparsing >=2.3.1 From bd94ebd7417bbad8f9bfb5beb1473c0f0ead347f Mon Sep 17 00:00:00 2001 From: jakirkham Date: Wed, 26 Jun 2024 18:03:58 -0700 Subject: [PATCH 38/95] Configure release build --- recipe/build_base.bat | 2 +- recipe/build_base.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/recipe/build_base.bat b/recipe/build_base.bat index 9fc51136..89bd14d7 100644 --- a/recipe/build_base.bat +++ b/recipe/build_base.bat @@ -2,7 +2,7 @@ mkdir builddir if errorlevel 1 exit 1 -%PYTHON% -m mesonbuild.mesonmain setup %MESON_ARGS% builddir +%PYTHON% -m mesonbuild.mesonmain setup builddir %MESON_ARGS% --buildtype=release if errorlevel 1 exit 1 %PYTHON% -m build --wheel --no-isolation --skip-dependency-check -Cbuilddir=builddir if errorlevel 1 exit 1 diff --git a/recipe/build_base.sh b/recipe/build_base.sh index 64aaf157..897388ad 100644 --- a/recipe/build_base.sh +++ b/recipe/build_base.sh @@ -5,6 +5,6 @@ set -ex export AR=$GCC_AR mkdir builddir -$PYTHON -m mesonbuild.mesonmain setup $MESON_ARGS builddir +$PYTHON -m mesonbuild.mesonmain setup builddir $MESON_ARGS --buildtype=release $PYTHON -m build --wheel --no-isolation --skip-dependency-check -Cbuilddir=builddir $PYTHON -m pip install dist/matplotlib*.whl From 9ba8c86371ad335c55d2a25da60577bc20a6028c Mon Sep 17 00:00:00 2001 From: "conda-forge-webservices[bot]" <91080706+conda-forge-webservices[bot]@users.noreply.github.com> Date: Thu, 27 Jun 2024 01:06:40 +0000 Subject: [PATCH 39/95] MNT: Re-rendered with conda-build 24.5.1, conda-smithy 3.36.2, and conda-forge-pinning 2024.06.27.00.50.45 --- .ci_support/linux_64_numpy1.22python3.8.____cpython.yaml | 2 ++ .ci_support/linux_64_numpy1.22python3.9.____73_pypy.yaml | 2 ++ .ci_support/linux_64_numpy2.0python3.10.____cpython.yaml | 2 ++ .ci_support/linux_64_numpy2.0python3.11.____cpython.yaml | 2 ++ .ci_support/linux_64_numpy2.0python3.12.____cpython.yaml | 2 ++ .ci_support/linux_64_numpy2.0python3.9.____cpython.yaml | 2 ++ .ci_support/linux_aarch64_numpy1.22python3.8.____cpython.yaml | 2 ++ .ci_support/linux_aarch64_numpy1.22python3.9.____73_pypy.yaml | 2 ++ .ci_support/linux_aarch64_numpy2.0python3.10.____cpython.yaml | 2 ++ .ci_support/linux_aarch64_numpy2.0python3.11.____cpython.yaml | 2 ++ .ci_support/linux_aarch64_numpy2.0python3.12.____cpython.yaml | 2 ++ .ci_support/linux_aarch64_numpy2.0python3.9.____cpython.yaml | 2 ++ .ci_support/linux_ppc64le_numpy1.22python3.8.____cpython.yaml | 2 ++ .ci_support/linux_ppc64le_numpy1.22python3.9.____73_pypy.yaml | 2 ++ .ci_support/linux_ppc64le_numpy2.0python3.10.____cpython.yaml | 2 ++ .ci_support/linux_ppc64le_numpy2.0python3.11.____cpython.yaml | 2 ++ .ci_support/linux_ppc64le_numpy2.0python3.12.____cpython.yaml | 2 ++ .ci_support/linux_ppc64le_numpy2.0python3.9.____cpython.yaml | 2 ++ .ci_support/osx_64_numpy1.22python3.8.____cpython.yaml | 2 ++ .ci_support/osx_64_numpy1.22python3.9.____73_pypy.yaml | 2 ++ .ci_support/osx_64_numpy2.0python3.10.____cpython.yaml | 2 ++ .ci_support/osx_64_numpy2.0python3.11.____cpython.yaml | 2 ++ .ci_support/osx_64_numpy2.0python3.12.____cpython.yaml | 2 ++ .ci_support/osx_64_numpy2.0python3.9.____cpython.yaml | 2 ++ .ci_support/osx_arm64_numpy1.22python3.8.____cpython.yaml | 2 ++ .ci_support/osx_arm64_numpy2.0python3.10.____cpython.yaml | 2 ++ .ci_support/osx_arm64_numpy2.0python3.11.____cpython.yaml | 2 ++ .ci_support/osx_arm64_numpy2.0python3.12.____cpython.yaml | 2 ++ .ci_support/osx_arm64_numpy2.0python3.9.____cpython.yaml | 2 ++ .ci_support/win_64_numpy1.22python3.8.____cpython.yaml | 2 ++ .ci_support/win_64_numpy1.22python3.9.____73_pypy.yaml | 2 ++ .ci_support/win_64_numpy2.0python3.10.____cpython.yaml | 2 ++ .ci_support/win_64_numpy2.0python3.11.____cpython.yaml | 2 ++ .ci_support/win_64_numpy2.0python3.12.____cpython.yaml | 2 ++ .ci_support/win_64_numpy2.0python3.9.____cpython.yaml | 2 ++ 35 files changed, 70 insertions(+) diff --git a/.ci_support/linux_64_numpy1.22python3.8.____cpython.yaml b/.ci_support/linux_64_numpy1.22python3.8.____cpython.yaml index f88b74ed..b8daebf1 100644 --- a/.ci_support/linux_64_numpy1.22python3.8.____cpython.yaml +++ b/.ci_support/linux_64_numpy1.22python3.8.____cpython.yaml @@ -30,6 +30,8 @@ python: - 3.8.* *_cpython python_impl: - cpython +qhull: +- '2020.2' target_platform: - linux-64 tk: diff --git a/.ci_support/linux_64_numpy1.22python3.9.____73_pypy.yaml b/.ci_support/linux_64_numpy1.22python3.9.____73_pypy.yaml index 0b2b1287..f388627e 100644 --- a/.ci_support/linux_64_numpy1.22python3.9.____73_pypy.yaml +++ b/.ci_support/linux_64_numpy1.22python3.9.____73_pypy.yaml @@ -30,6 +30,8 @@ python: - 3.9.* *_73_pypy python_impl: - pypy +qhull: +- '2020.2' target_platform: - linux-64 tk: diff --git a/.ci_support/linux_64_numpy2.0python3.10.____cpython.yaml b/.ci_support/linux_64_numpy2.0python3.10.____cpython.yaml index 7150aefa..05641802 100644 --- a/.ci_support/linux_64_numpy2.0python3.10.____cpython.yaml +++ b/.ci_support/linux_64_numpy2.0python3.10.____cpython.yaml @@ -30,6 +30,8 @@ python: - 3.10.* *_cpython python_impl: - cpython +qhull: +- '2020.2' target_platform: - linux-64 tk: diff --git a/.ci_support/linux_64_numpy2.0python3.11.____cpython.yaml b/.ci_support/linux_64_numpy2.0python3.11.____cpython.yaml index 0cea911d..7af28a28 100644 --- a/.ci_support/linux_64_numpy2.0python3.11.____cpython.yaml +++ b/.ci_support/linux_64_numpy2.0python3.11.____cpython.yaml @@ -30,6 +30,8 @@ python: - 3.11.* *_cpython python_impl: - cpython +qhull: +- '2020.2' target_platform: - linux-64 tk: diff --git a/.ci_support/linux_64_numpy2.0python3.12.____cpython.yaml b/.ci_support/linux_64_numpy2.0python3.12.____cpython.yaml index f9947d99..1d4a371c 100644 --- a/.ci_support/linux_64_numpy2.0python3.12.____cpython.yaml +++ b/.ci_support/linux_64_numpy2.0python3.12.____cpython.yaml @@ -30,6 +30,8 @@ python: - 3.12.* *_cpython python_impl: - cpython +qhull: +- '2020.2' target_platform: - linux-64 tk: diff --git a/.ci_support/linux_64_numpy2.0python3.9.____cpython.yaml b/.ci_support/linux_64_numpy2.0python3.9.____cpython.yaml index addf2311..8bd91636 100644 --- a/.ci_support/linux_64_numpy2.0python3.9.____cpython.yaml +++ b/.ci_support/linux_64_numpy2.0python3.9.____cpython.yaml @@ -30,6 +30,8 @@ python: - 3.9.* *_cpython python_impl: - cpython +qhull: +- '2020.2' target_platform: - linux-64 tk: diff --git a/.ci_support/linux_aarch64_numpy1.22python3.8.____cpython.yaml b/.ci_support/linux_aarch64_numpy1.22python3.8.____cpython.yaml index 9f8bff2e..cef37ec8 100644 --- a/.ci_support/linux_aarch64_numpy1.22python3.8.____cpython.yaml +++ b/.ci_support/linux_aarch64_numpy1.22python3.8.____cpython.yaml @@ -34,6 +34,8 @@ python: - 3.8.* *_cpython python_impl: - cpython +qhull: +- '2020.2' target_platform: - linux-aarch64 tk: diff --git a/.ci_support/linux_aarch64_numpy1.22python3.9.____73_pypy.yaml b/.ci_support/linux_aarch64_numpy1.22python3.9.____73_pypy.yaml index d06303f6..77b6980a 100644 --- a/.ci_support/linux_aarch64_numpy1.22python3.9.____73_pypy.yaml +++ b/.ci_support/linux_aarch64_numpy1.22python3.9.____73_pypy.yaml @@ -34,6 +34,8 @@ python: - 3.9.* *_73_pypy python_impl: - pypy +qhull: +- '2020.2' target_platform: - linux-aarch64 tk: diff --git a/.ci_support/linux_aarch64_numpy2.0python3.10.____cpython.yaml b/.ci_support/linux_aarch64_numpy2.0python3.10.____cpython.yaml index 82992a08..32d8f8be 100644 --- a/.ci_support/linux_aarch64_numpy2.0python3.10.____cpython.yaml +++ b/.ci_support/linux_aarch64_numpy2.0python3.10.____cpython.yaml @@ -34,6 +34,8 @@ python: - 3.10.* *_cpython python_impl: - cpython +qhull: +- '2020.2' target_platform: - linux-aarch64 tk: diff --git a/.ci_support/linux_aarch64_numpy2.0python3.11.____cpython.yaml b/.ci_support/linux_aarch64_numpy2.0python3.11.____cpython.yaml index 43214185..90f4f57d 100644 --- a/.ci_support/linux_aarch64_numpy2.0python3.11.____cpython.yaml +++ b/.ci_support/linux_aarch64_numpy2.0python3.11.____cpython.yaml @@ -34,6 +34,8 @@ python: - 3.11.* *_cpython python_impl: - cpython +qhull: +- '2020.2' target_platform: - linux-aarch64 tk: diff --git a/.ci_support/linux_aarch64_numpy2.0python3.12.____cpython.yaml b/.ci_support/linux_aarch64_numpy2.0python3.12.____cpython.yaml index 4767e6ed..283a8faf 100644 --- a/.ci_support/linux_aarch64_numpy2.0python3.12.____cpython.yaml +++ b/.ci_support/linux_aarch64_numpy2.0python3.12.____cpython.yaml @@ -34,6 +34,8 @@ python: - 3.12.* *_cpython python_impl: - cpython +qhull: +- '2020.2' target_platform: - linux-aarch64 tk: diff --git a/.ci_support/linux_aarch64_numpy2.0python3.9.____cpython.yaml b/.ci_support/linux_aarch64_numpy2.0python3.9.____cpython.yaml index a2cb07db..543d2d75 100644 --- a/.ci_support/linux_aarch64_numpy2.0python3.9.____cpython.yaml +++ b/.ci_support/linux_aarch64_numpy2.0python3.9.____cpython.yaml @@ -34,6 +34,8 @@ python: - 3.9.* *_cpython python_impl: - cpython +qhull: +- '2020.2' target_platform: - linux-aarch64 tk: diff --git a/.ci_support/linux_ppc64le_numpy1.22python3.8.____cpython.yaml b/.ci_support/linux_ppc64le_numpy1.22python3.8.____cpython.yaml index e503d1d2..9abb1ed2 100644 --- a/.ci_support/linux_ppc64le_numpy1.22python3.8.____cpython.yaml +++ b/.ci_support/linux_ppc64le_numpy1.22python3.8.____cpython.yaml @@ -30,6 +30,8 @@ python: - 3.8.* *_cpython python_impl: - cpython +qhull: +- '2020.2' target_platform: - linux-ppc64le zip_keys: diff --git a/.ci_support/linux_ppc64le_numpy1.22python3.9.____73_pypy.yaml b/.ci_support/linux_ppc64le_numpy1.22python3.9.____73_pypy.yaml index f077c36e..9a6bb269 100644 --- a/.ci_support/linux_ppc64le_numpy1.22python3.9.____73_pypy.yaml +++ b/.ci_support/linux_ppc64le_numpy1.22python3.9.____73_pypy.yaml @@ -30,6 +30,8 @@ python: - 3.9.* *_73_pypy python_impl: - pypy +qhull: +- '2020.2' target_platform: - linux-ppc64le zip_keys: diff --git a/.ci_support/linux_ppc64le_numpy2.0python3.10.____cpython.yaml b/.ci_support/linux_ppc64le_numpy2.0python3.10.____cpython.yaml index 97564b73..502ba847 100644 --- a/.ci_support/linux_ppc64le_numpy2.0python3.10.____cpython.yaml +++ b/.ci_support/linux_ppc64le_numpy2.0python3.10.____cpython.yaml @@ -30,6 +30,8 @@ python: - 3.10.* *_cpython python_impl: - cpython +qhull: +- '2020.2' target_platform: - linux-ppc64le zip_keys: diff --git a/.ci_support/linux_ppc64le_numpy2.0python3.11.____cpython.yaml b/.ci_support/linux_ppc64le_numpy2.0python3.11.____cpython.yaml index 2765f56c..8082b25b 100644 --- a/.ci_support/linux_ppc64le_numpy2.0python3.11.____cpython.yaml +++ b/.ci_support/linux_ppc64le_numpy2.0python3.11.____cpython.yaml @@ -30,6 +30,8 @@ python: - 3.11.* *_cpython python_impl: - cpython +qhull: +- '2020.2' target_platform: - linux-ppc64le zip_keys: diff --git a/.ci_support/linux_ppc64le_numpy2.0python3.12.____cpython.yaml b/.ci_support/linux_ppc64le_numpy2.0python3.12.____cpython.yaml index c8c7edda..eca6816f 100644 --- a/.ci_support/linux_ppc64le_numpy2.0python3.12.____cpython.yaml +++ b/.ci_support/linux_ppc64le_numpy2.0python3.12.____cpython.yaml @@ -30,6 +30,8 @@ python: - 3.12.* *_cpython python_impl: - cpython +qhull: +- '2020.2' target_platform: - linux-ppc64le zip_keys: diff --git a/.ci_support/linux_ppc64le_numpy2.0python3.9.____cpython.yaml b/.ci_support/linux_ppc64le_numpy2.0python3.9.____cpython.yaml index ff3c70d6..e05cf813 100644 --- a/.ci_support/linux_ppc64le_numpy2.0python3.9.____cpython.yaml +++ b/.ci_support/linux_ppc64le_numpy2.0python3.9.____cpython.yaml @@ -30,6 +30,8 @@ python: - 3.9.* *_cpython python_impl: - cpython +qhull: +- '2020.2' target_platform: - linux-ppc64le zip_keys: diff --git a/.ci_support/osx_64_numpy1.22python3.8.____cpython.yaml b/.ci_support/osx_64_numpy1.22python3.8.____cpython.yaml index 113c421f..1951701e 100644 --- a/.ci_support/osx_64_numpy1.22python3.8.____cpython.yaml +++ b/.ci_support/osx_64_numpy1.22python3.8.____cpython.yaml @@ -32,6 +32,8 @@ python: - 3.8.* *_cpython python_impl: - cpython +qhull: +- '2020.2' target_platform: - osx-64 zip_keys: diff --git a/.ci_support/osx_64_numpy1.22python3.9.____73_pypy.yaml b/.ci_support/osx_64_numpy1.22python3.9.____73_pypy.yaml index 5ca09b0d..b58f5cad 100644 --- a/.ci_support/osx_64_numpy1.22python3.9.____73_pypy.yaml +++ b/.ci_support/osx_64_numpy1.22python3.9.____73_pypy.yaml @@ -32,6 +32,8 @@ python: - 3.9.* *_73_pypy python_impl: - pypy +qhull: +- '2020.2' target_platform: - osx-64 zip_keys: diff --git a/.ci_support/osx_64_numpy2.0python3.10.____cpython.yaml b/.ci_support/osx_64_numpy2.0python3.10.____cpython.yaml index ae425568..9849babc 100644 --- a/.ci_support/osx_64_numpy2.0python3.10.____cpython.yaml +++ b/.ci_support/osx_64_numpy2.0python3.10.____cpython.yaml @@ -32,6 +32,8 @@ python: - 3.10.* *_cpython python_impl: - cpython +qhull: +- '2020.2' target_platform: - osx-64 zip_keys: diff --git a/.ci_support/osx_64_numpy2.0python3.11.____cpython.yaml b/.ci_support/osx_64_numpy2.0python3.11.____cpython.yaml index f10f6530..8bece27e 100644 --- a/.ci_support/osx_64_numpy2.0python3.11.____cpython.yaml +++ b/.ci_support/osx_64_numpy2.0python3.11.____cpython.yaml @@ -32,6 +32,8 @@ python: - 3.11.* *_cpython python_impl: - cpython +qhull: +- '2020.2' target_platform: - osx-64 zip_keys: diff --git a/.ci_support/osx_64_numpy2.0python3.12.____cpython.yaml b/.ci_support/osx_64_numpy2.0python3.12.____cpython.yaml index d78ccf0f..27153b17 100644 --- a/.ci_support/osx_64_numpy2.0python3.12.____cpython.yaml +++ b/.ci_support/osx_64_numpy2.0python3.12.____cpython.yaml @@ -32,6 +32,8 @@ python: - 3.12.* *_cpython python_impl: - cpython +qhull: +- '2020.2' target_platform: - osx-64 zip_keys: diff --git a/.ci_support/osx_64_numpy2.0python3.9.____cpython.yaml b/.ci_support/osx_64_numpy2.0python3.9.____cpython.yaml index 8e6f2037..b09af5bc 100644 --- a/.ci_support/osx_64_numpy2.0python3.9.____cpython.yaml +++ b/.ci_support/osx_64_numpy2.0python3.9.____cpython.yaml @@ -32,6 +32,8 @@ python: - 3.9.* *_cpython python_impl: - cpython +qhull: +- '2020.2' target_platform: - osx-64 zip_keys: diff --git a/.ci_support/osx_arm64_numpy1.22python3.8.____cpython.yaml b/.ci_support/osx_arm64_numpy1.22python3.8.____cpython.yaml index 4daea10d..3a0cd289 100644 --- a/.ci_support/osx_arm64_numpy1.22python3.8.____cpython.yaml +++ b/.ci_support/osx_arm64_numpy1.22python3.8.____cpython.yaml @@ -32,6 +32,8 @@ python: - 3.8.* *_cpython python_impl: - cpython +qhull: +- '2020.2' target_platform: - osx-arm64 zip_keys: diff --git a/.ci_support/osx_arm64_numpy2.0python3.10.____cpython.yaml b/.ci_support/osx_arm64_numpy2.0python3.10.____cpython.yaml index 19e96a7d..ba568df0 100644 --- a/.ci_support/osx_arm64_numpy2.0python3.10.____cpython.yaml +++ b/.ci_support/osx_arm64_numpy2.0python3.10.____cpython.yaml @@ -32,6 +32,8 @@ python: - 3.10.* *_cpython python_impl: - cpython +qhull: +- '2020.2' target_platform: - osx-arm64 zip_keys: diff --git a/.ci_support/osx_arm64_numpy2.0python3.11.____cpython.yaml b/.ci_support/osx_arm64_numpy2.0python3.11.____cpython.yaml index 6fd898c4..a0abbd47 100644 --- a/.ci_support/osx_arm64_numpy2.0python3.11.____cpython.yaml +++ b/.ci_support/osx_arm64_numpy2.0python3.11.____cpython.yaml @@ -32,6 +32,8 @@ python: - 3.11.* *_cpython python_impl: - cpython +qhull: +- '2020.2' target_platform: - osx-arm64 zip_keys: diff --git a/.ci_support/osx_arm64_numpy2.0python3.12.____cpython.yaml b/.ci_support/osx_arm64_numpy2.0python3.12.____cpython.yaml index 30cb23ae..b4f058db 100644 --- a/.ci_support/osx_arm64_numpy2.0python3.12.____cpython.yaml +++ b/.ci_support/osx_arm64_numpy2.0python3.12.____cpython.yaml @@ -32,6 +32,8 @@ python: - 3.12.* *_cpython python_impl: - cpython +qhull: +- '2020.2' target_platform: - osx-arm64 zip_keys: diff --git a/.ci_support/osx_arm64_numpy2.0python3.9.____cpython.yaml b/.ci_support/osx_arm64_numpy2.0python3.9.____cpython.yaml index 06668c85..b16e8d27 100644 --- a/.ci_support/osx_arm64_numpy2.0python3.9.____cpython.yaml +++ b/.ci_support/osx_arm64_numpy2.0python3.9.____cpython.yaml @@ -32,6 +32,8 @@ python: - 3.9.* *_cpython python_impl: - cpython +qhull: +- '2020.2' target_platform: - osx-arm64 zip_keys: diff --git a/.ci_support/win_64_numpy1.22python3.8.____cpython.yaml b/.ci_support/win_64_numpy1.22python3.8.____cpython.yaml index d33d61c3..161eb641 100644 --- a/.ci_support/win_64_numpy1.22python3.8.____cpython.yaml +++ b/.ci_support/win_64_numpy1.22python3.8.____cpython.yaml @@ -20,6 +20,8 @@ python: - 3.8.* *_cpython python_impl: - cpython +qhull: +- '2020.2' target_platform: - win-64 zip_keys: diff --git a/.ci_support/win_64_numpy1.22python3.9.____73_pypy.yaml b/.ci_support/win_64_numpy1.22python3.9.____73_pypy.yaml index 32f7edd5..ae3ff9b6 100644 --- a/.ci_support/win_64_numpy1.22python3.9.____73_pypy.yaml +++ b/.ci_support/win_64_numpy1.22python3.9.____73_pypy.yaml @@ -20,6 +20,8 @@ python: - 3.9.* *_73_pypy python_impl: - pypy +qhull: +- '2020.2' target_platform: - win-64 zip_keys: diff --git a/.ci_support/win_64_numpy2.0python3.10.____cpython.yaml b/.ci_support/win_64_numpy2.0python3.10.____cpython.yaml index eefb474b..707bef84 100644 --- a/.ci_support/win_64_numpy2.0python3.10.____cpython.yaml +++ b/.ci_support/win_64_numpy2.0python3.10.____cpython.yaml @@ -20,6 +20,8 @@ python: - 3.10.* *_cpython python_impl: - cpython +qhull: +- '2020.2' target_platform: - win-64 zip_keys: diff --git a/.ci_support/win_64_numpy2.0python3.11.____cpython.yaml b/.ci_support/win_64_numpy2.0python3.11.____cpython.yaml index d3b8d80d..b59b3abc 100644 --- a/.ci_support/win_64_numpy2.0python3.11.____cpython.yaml +++ b/.ci_support/win_64_numpy2.0python3.11.____cpython.yaml @@ -20,6 +20,8 @@ python: - 3.11.* *_cpython python_impl: - cpython +qhull: +- '2020.2' target_platform: - win-64 zip_keys: diff --git a/.ci_support/win_64_numpy2.0python3.12.____cpython.yaml b/.ci_support/win_64_numpy2.0python3.12.____cpython.yaml index d9a9f794..88e7a2c9 100644 --- a/.ci_support/win_64_numpy2.0python3.12.____cpython.yaml +++ b/.ci_support/win_64_numpy2.0python3.12.____cpython.yaml @@ -20,6 +20,8 @@ python: - 3.12.* *_cpython python_impl: - cpython +qhull: +- '2020.2' target_platform: - win-64 zip_keys: diff --git a/.ci_support/win_64_numpy2.0python3.9.____cpython.yaml b/.ci_support/win_64_numpy2.0python3.9.____cpython.yaml index ba73cef8..2a73589e 100644 --- a/.ci_support/win_64_numpy2.0python3.9.____cpython.yaml +++ b/.ci_support/win_64_numpy2.0python3.9.____cpython.yaml @@ -20,6 +20,8 @@ python: - 3.9.* *_cpython python_impl: - cpython +qhull: +- '2020.2' target_platform: - win-64 zip_keys: From f28d21d5fa26a84bdd1cf88591d674baa9249fa5 Mon Sep 17 00:00:00 2001 From: jakirkham Date: Wed, 26 Jun 2024 18:22:31 -0700 Subject: [PATCH 40/95] Append to `MESON_ARGS` & specify Python --- recipe/build_base.bat | 4 +++- recipe/build_base.sh | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/recipe/build_base.bat b/recipe/build_base.bat index 89bd14d7..c64ef8a0 100644 --- a/recipe/build_base.bat +++ b/recipe/build_base.bat @@ -1,8 +1,10 @@ @echo on +set "MESON_ARGS=%MESON_ARGS% --buildtype=release -Dpython_target=%PYTHON%" + mkdir builddir if errorlevel 1 exit 1 -%PYTHON% -m mesonbuild.mesonmain setup builddir %MESON_ARGS% --buildtype=release +%PYTHON% -m mesonbuild.mesonmain setup builddir %MESON_ARGS% if errorlevel 1 exit 1 %PYTHON% -m build --wheel --no-isolation --skip-dependency-check -Cbuilddir=builddir if errorlevel 1 exit 1 diff --git a/recipe/build_base.sh b/recipe/build_base.sh index 897388ad..6451c942 100644 --- a/recipe/build_base.sh +++ b/recipe/build_base.sh @@ -4,7 +4,9 @@ set -ex export AR=$GCC_AR +export MESON_ARGS="${MESON_ARGS} --buildtype=release -Dpython_target=${PYTHON}" + mkdir builddir -$PYTHON -m mesonbuild.mesonmain setup builddir $MESON_ARGS --buildtype=release +$PYTHON -m mesonbuild.mesonmain setup builddir $MESON_ARGS $PYTHON -m build --wheel --no-isolation --skip-dependency-check -Cbuilddir=builddir $PYTHON -m pip install dist/matplotlib*.whl From 5bc1a4e613898b09b29335d0d48da07417e4e10a Mon Sep 17 00:00:00 2001 From: jakirkham Date: Wed, 26 Jun 2024 18:27:20 -0700 Subject: [PATCH 41/95] Use system Qhull --- recipe/build_base.bat | 7 +++++++ recipe/build_base.sh | 8 +++++++- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/recipe/build_base.bat b/recipe/build_base.bat index c64ef8a0..82f301ea 100644 --- a/recipe/build_base.bat +++ b/recipe/build_base.bat @@ -7,6 +7,13 @@ if errorlevel 1 exit 1 %PYTHON% -m mesonbuild.mesonmain setup builddir %MESON_ARGS% if errorlevel 1 exit 1 %PYTHON% -m build --wheel --no-isolation --skip-dependency-check -Cbuilddir=builddir +%PYTHON% -m build ^ + --wheel ^ + --no-isolation ^ + --skip-dependency-check ^ + -Cbuilddir=builddir ^ + -Csetup-args="-Dsystem-qhull=true" ^ + if errorlevel 1 exit 1 for %x in (dir *.whl) do (%PYTHON% -m pip install %x) if errorlevel 1 exit 1 diff --git a/recipe/build_base.sh b/recipe/build_base.sh index 6451c942..f3c6d99a 100644 --- a/recipe/build_base.sh +++ b/recipe/build_base.sh @@ -8,5 +8,11 @@ export MESON_ARGS="${MESON_ARGS} --buildtype=release -Dpython_target=${PYTHON}" mkdir builddir $PYTHON -m mesonbuild.mesonmain setup builddir $MESON_ARGS -$PYTHON -m build --wheel --no-isolation --skip-dependency-check -Cbuilddir=builddir +$PYTHON -m build \ + --wheel \ + --no-isolation \ + --skip-dependency-check \ + -Cbuilddir=builddir \ + -Csetup-args="-Dsystem-qhull=true" \ + $PYTHON -m pip install dist/matplotlib*.whl From cb32869ffd56cadf1f6701de07b58296b8aaccc9 Mon Sep 17 00:00:00 2001 From: jakirkham Date: Wed, 26 Jun 2024 18:28:38 -0700 Subject: [PATCH 42/95] Fix indentation --- recipe/build_base.bat | 10 +++++----- recipe/build_base.sh | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/recipe/build_base.bat b/recipe/build_base.bat index 82f301ea..c16b4b46 100644 --- a/recipe/build_base.bat +++ b/recipe/build_base.bat @@ -8,11 +8,11 @@ if errorlevel 1 exit 1 if errorlevel 1 exit 1 %PYTHON% -m build --wheel --no-isolation --skip-dependency-check -Cbuilddir=builddir %PYTHON% -m build ^ - --wheel ^ - --no-isolation ^ - --skip-dependency-check ^ - -Cbuilddir=builddir ^ - -Csetup-args="-Dsystem-qhull=true" ^ + --wheel ^ + --no-isolation ^ + --skip-dependency-check ^ + -Cbuilddir=builddir ^ + -Csetup-args="-Dsystem-qhull=true" ^ if errorlevel 1 exit 1 for %x in (dir *.whl) do (%PYTHON% -m pip install %x) diff --git a/recipe/build_base.sh b/recipe/build_base.sh index f3c6d99a..743eb3f6 100644 --- a/recipe/build_base.sh +++ b/recipe/build_base.sh @@ -9,10 +9,10 @@ export MESON_ARGS="${MESON_ARGS} --buildtype=release -Dpython_target=${PYTHON}" mkdir builddir $PYTHON -m mesonbuild.mesonmain setup builddir $MESON_ARGS $PYTHON -m build \ - --wheel \ - --no-isolation \ - --skip-dependency-check \ - -Cbuilddir=builddir \ - -Csetup-args="-Dsystem-qhull=true" \ + --wheel \ + --no-isolation \ + --skip-dependency-check \ + -Cbuilddir=builddir \ + -Csetup-args="-Dsystem-qhull=true" \ $PYTHON -m pip install dist/matplotlib*.whl From bde1413bea6c3d8c03e08c1a5be4b9ad8491fbee Mon Sep 17 00:00:00 2001 From: jakirkham Date: Wed, 26 Jun 2024 18:30:20 -0700 Subject: [PATCH 43/95] Also use system FreeType --- recipe/build_base.bat | 1 + recipe/build_base.sh | 1 + 2 files changed, 2 insertions(+) diff --git a/recipe/build_base.bat b/recipe/build_base.bat index c16b4b46..51fd6947 100644 --- a/recipe/build_base.bat +++ b/recipe/build_base.bat @@ -12,6 +12,7 @@ if errorlevel 1 exit 1 --no-isolation ^ --skip-dependency-check ^ -Cbuilddir=builddir ^ + -Csetup-args="-Dsystem-freetype=true" ^ -Csetup-args="-Dsystem-qhull=true" ^ if errorlevel 1 exit 1 diff --git a/recipe/build_base.sh b/recipe/build_base.sh index 743eb3f6..cb3fa6e9 100644 --- a/recipe/build_base.sh +++ b/recipe/build_base.sh @@ -13,6 +13,7 @@ $PYTHON -m build \ --no-isolation \ --skip-dependency-check \ -Cbuilddir=builddir \ + -Csetup-args="-Dsystem-freetype=true" \ -Csetup-args="-Dsystem-qhull=true" \ $PYTHON -m pip install dist/matplotlib*.whl From ed6c35c8842038bed4c76a98f0bd496ccb31bea9 Mon Sep 17 00:00:00 2001 From: jakirkham Date: Wed, 26 Jun 2024 18:40:31 -0700 Subject: [PATCH 44/95] Drop `python_target` Appears this doesn't work in all builds. Just some Meson builds use it. --- recipe/build_base.bat | 2 +- recipe/build_base.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/recipe/build_base.bat b/recipe/build_base.bat index 51fd6947..b09f508e 100644 --- a/recipe/build_base.bat +++ b/recipe/build_base.bat @@ -1,6 +1,6 @@ @echo on -set "MESON_ARGS=%MESON_ARGS% --buildtype=release -Dpython_target=%PYTHON%" +set "MESON_ARGS=%MESON_ARGS% --buildtype=release" mkdir builddir if errorlevel 1 exit 1 diff --git a/recipe/build_base.sh b/recipe/build_base.sh index cb3fa6e9..6684072b 100644 --- a/recipe/build_base.sh +++ b/recipe/build_base.sh @@ -4,7 +4,7 @@ set -ex export AR=$GCC_AR -export MESON_ARGS="${MESON_ARGS} --buildtype=release -Dpython_target=${PYTHON}" +export MESON_ARGS="${MESON_ARGS} --buildtype=release" mkdir builddir $PYTHON -m mesonbuild.mesonmain setup builddir $MESON_ARGS From d27d848906239db6700ff64e4d20d8fb2c1cb769 Mon Sep 17 00:00:00 2001 From: jakirkham Date: Wed, 26 Jun 2024 18:56:45 -0700 Subject: [PATCH 45/95] Push more args into `MESON_ARGS` --- recipe/build_base.bat | 10 +--------- recipe/build_base.sh | 11 ++--------- 2 files changed, 3 insertions(+), 18 deletions(-) diff --git a/recipe/build_base.bat b/recipe/build_base.bat index b09f508e..51bf00ca 100644 --- a/recipe/build_base.bat +++ b/recipe/build_base.bat @@ -6,15 +6,7 @@ mkdir builddir if errorlevel 1 exit 1 %PYTHON% -m mesonbuild.mesonmain setup builddir %MESON_ARGS% if errorlevel 1 exit 1 -%PYTHON% -m build --wheel --no-isolation --skip-dependency-check -Cbuilddir=builddir -%PYTHON% -m build ^ - --wheel ^ - --no-isolation ^ - --skip-dependency-check ^ - -Cbuilddir=builddir ^ - -Csetup-args="-Dsystem-freetype=true" ^ - -Csetup-args="-Dsystem-qhull=true" ^ - +%PYTHON% -m build --wheel --no-isolation --skip-dependency-check if errorlevel 1 exit 1 for %x in (dir *.whl) do (%PYTHON% -m pip install %x) if errorlevel 1 exit 1 diff --git a/recipe/build_base.sh b/recipe/build_base.sh index 6684072b..6364eab1 100644 --- a/recipe/build_base.sh +++ b/recipe/build_base.sh @@ -4,16 +4,9 @@ set -ex export AR=$GCC_AR -export MESON_ARGS="${MESON_ARGS} --buildtype=release" +export MESON_ARGS="${MESON_ARGS} --buildtype=release -Dsystem-freetype=true -Dsystem-qhull=true" mkdir builddir $PYTHON -m mesonbuild.mesonmain setup builddir $MESON_ARGS -$PYTHON -m build \ - --wheel \ - --no-isolation \ - --skip-dependency-check \ - -Cbuilddir=builddir \ - -Csetup-args="-Dsystem-freetype=true" \ - -Csetup-args="-Dsystem-qhull=true" \ - +$PYTHON -m build --wheel --no-isolation --skip-dependency-check $PYTHON -m pip install dist/matplotlib*.whl From 9df6caf02b46f763af8da6db2c7ed2880921ca2b Mon Sep 17 00:00:00 2001 From: jakirkham Date: Wed, 26 Jun 2024 19:15:02 -0700 Subject: [PATCH 46/95] Put back `builddir` conf in `python-build` line --- recipe/build_base.bat | 2 +- recipe/build_base.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/recipe/build_base.bat b/recipe/build_base.bat index 51bf00ca..bf80666f 100644 --- a/recipe/build_base.bat +++ b/recipe/build_base.bat @@ -6,7 +6,7 @@ mkdir builddir if errorlevel 1 exit 1 %PYTHON% -m mesonbuild.mesonmain setup builddir %MESON_ARGS% if errorlevel 1 exit 1 -%PYTHON% -m build --wheel --no-isolation --skip-dependency-check +%PYTHON% -m build --wheel --no-isolation --skip-dependency-check -Cbuilddir=builddir if errorlevel 1 exit 1 for %x in (dir *.whl) do (%PYTHON% -m pip install %x) if errorlevel 1 exit 1 diff --git a/recipe/build_base.sh b/recipe/build_base.sh index 6364eab1..8ef93611 100644 --- a/recipe/build_base.sh +++ b/recipe/build_base.sh @@ -8,5 +8,5 @@ export MESON_ARGS="${MESON_ARGS} --buildtype=release -Dsystem-freetype=true -Dsy mkdir builddir $PYTHON -m mesonbuild.mesonmain setup builddir $MESON_ARGS -$PYTHON -m build --wheel --no-isolation --skip-dependency-check +$PYTHON -m build --wheel --no-isolation --skip-dependency-check -Cbuilddir=builddir $PYTHON -m pip install dist/matplotlib*.whl From 349e134fdc982c7b0b4dcd590c7ae4c670ec7d5f Mon Sep 17 00:00:00 2001 From: jakirkham Date: Wed, 26 Jun 2024 19:17:32 -0700 Subject: [PATCH 47/95] Add system library flags on Windows --- recipe/build_base.bat | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipe/build_base.bat b/recipe/build_base.bat index bf80666f..7476ec84 100644 --- a/recipe/build_base.bat +++ b/recipe/build_base.bat @@ -1,6 +1,6 @@ @echo on -set "MESON_ARGS=%MESON_ARGS% --buildtype=release" +set "MESON_ARGS=%MESON_ARGS% --buildtype=release -Dsystem-freetype=true -Dsystem-qhull=true" mkdir builddir if errorlevel 1 exit 1 From 54a4f6a81ee1c6b2b618181e2cd452507b63af1e Mon Sep 17 00:00:00 2001 From: jakirkham Date: Wed, 26 Jun 2024 19:18:53 -0700 Subject: [PATCH 48/95] Specify prefix --- recipe/build_base.bat | 2 +- recipe/build_base.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/recipe/build_base.bat b/recipe/build_base.bat index 7476ec84..39a9a027 100644 --- a/recipe/build_base.bat +++ b/recipe/build_base.bat @@ -1,6 +1,6 @@ @echo on -set "MESON_ARGS=%MESON_ARGS% --buildtype=release -Dsystem-freetype=true -Dsystem-qhull=true" +set "MESON_ARGS=%MESON_ARGS% --buildtype=release --prefix=%LIBRARY_PREFIX% -Dsystem-freetype=true -Dsystem-qhull=true" mkdir builddir if errorlevel 1 exit 1 diff --git a/recipe/build_base.sh b/recipe/build_base.sh index 8ef93611..08fedf78 100644 --- a/recipe/build_base.sh +++ b/recipe/build_base.sh @@ -4,7 +4,7 @@ set -ex export AR=$GCC_AR -export MESON_ARGS="${MESON_ARGS} --buildtype=release -Dsystem-freetype=true -Dsystem-qhull=true" +export MESON_ARGS="${MESON_ARGS} --buildtype=release --prefix=${PREFIX} -Dsystem-freetype=true -Dsystem-qhull=true" mkdir builddir $PYTHON -m mesonbuild.mesonmain setup builddir $MESON_ARGS From d8db30f329e5a01913ee1f036f371fd24efe1734 Mon Sep 17 00:00:00 2001 From: jakirkham Date: Wed, 26 Jun 2024 19:38:59 -0700 Subject: [PATCH 49/95] Use `pkg-config` on Windows --- recipe/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 3b612981..aef1fa04 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -41,7 +41,7 @@ outputs: - {{ compiler('c') }} - {{ compiler('cxx') }} - cmake # [win] - - pkg-config # [unix] + - pkg-config - libtool # [unix] - ninja host: From 251d8ab01e952f33982ff2909b4380fb78e1cb96 Mon Sep 17 00:00:00 2001 From: jakirkham Date: Wed, 26 Jun 2024 19:58:51 -0700 Subject: [PATCH 50/95] Try specifying `libdir` to Meson Maybe this helps find libraries on Windows. --- recipe/build_base.bat | 2 +- recipe/build_base.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/recipe/build_base.bat b/recipe/build_base.bat index 39a9a027..70e37922 100644 --- a/recipe/build_base.bat +++ b/recipe/build_base.bat @@ -1,6 +1,6 @@ @echo on -set "MESON_ARGS=%MESON_ARGS% --buildtype=release --prefix=%LIBRARY_PREFIX% -Dsystem-freetype=true -Dsystem-qhull=true" +set "MESON_ARGS=%MESON_ARGS% --buildtype=release --prefix=%LIBRARY_PREFIX% -Dlibdir=bin -Dsystem-freetype=true -Dsystem-qhull=true" mkdir builddir if errorlevel 1 exit 1 diff --git a/recipe/build_base.sh b/recipe/build_base.sh index 08fedf78..30ce377b 100644 --- a/recipe/build_base.sh +++ b/recipe/build_base.sh @@ -4,7 +4,7 @@ set -ex export AR=$GCC_AR -export MESON_ARGS="${MESON_ARGS} --buildtype=release --prefix=${PREFIX} -Dsystem-freetype=true -Dsystem-qhull=true" +export MESON_ARGS="${MESON_ARGS} --buildtype=release --prefix=${PREFIX} -Dlibdir=lib -Dsystem-freetype=true -Dsystem-qhull=true" mkdir builddir $PYTHON -m mesonbuild.mesonmain setup builddir $MESON_ARGS From aed82a0c6145d63f17317dd1eb963db7b3411e01 Mon Sep 17 00:00:00 2001 From: jakirkham Date: Wed, 26 Jun 2024 20:00:50 -0700 Subject: [PATCH 51/95] Enable overlinking check --- conda-forge.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/conda-forge.yml b/conda-forge.yml index 58154bb6..d03ab030 100644 --- a/conda-forge.yml +++ b/conda-forge.yml @@ -6,6 +6,7 @@ build_platform: linux_ppc64le: linux_64 osx_arm64: osx_64 conda_build: + error_overlinking: true pkg_format: '2' conda_forge_output_validation: true github: From 6827546ff452cde95b0cb9718294234526b2e2e8 Mon Sep 17 00:00:00 2001 From: jakirkham Date: Wed, 26 Jun 2024 22:33:43 -0700 Subject: [PATCH 52/95] Use `pip`'s `--find-links` to install wheel --- recipe/build_base.bat | 2 +- recipe/build_base.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/recipe/build_base.bat b/recipe/build_base.bat index 70e37922..879a7a5c 100644 --- a/recipe/build_base.bat +++ b/recipe/build_base.bat @@ -8,5 +8,5 @@ if errorlevel 1 exit 1 if errorlevel 1 exit 1 %PYTHON% -m build --wheel --no-isolation --skip-dependency-check -Cbuilddir=builddir if errorlevel 1 exit 1 -for %x in (dir *.whl) do (%PYTHON% -m pip install %x) +%PYTHON% -m pip install --find-links dist matplotlib if errorlevel 1 exit 1 diff --git a/recipe/build_base.sh b/recipe/build_base.sh index 30ce377b..61ae5bb5 100644 --- a/recipe/build_base.sh +++ b/recipe/build_base.sh @@ -9,4 +9,4 @@ export MESON_ARGS="${MESON_ARGS} --buildtype=release --prefix=${PREFIX} -Dlibdir mkdir builddir $PYTHON -m mesonbuild.mesonmain setup builddir $MESON_ARGS $PYTHON -m build --wheel --no-isolation --skip-dependency-check -Cbuilddir=builddir -$PYTHON -m pip install dist/matplotlib*.whl +$PYTHON -m pip install --find-links dist matplotlib From d0bd96e1da521f99827d0990c33edb896eba93f3 Mon Sep 17 00:00:00 2001 From: jakirkham Date: Wed, 26 Jun 2024 22:39:36 -0700 Subject: [PATCH 53/95] Configure `pkg-config` search paths --- recipe/build_base.bat | 2 ++ 1 file changed, 2 insertions(+) diff --git a/recipe/build_base.bat b/recipe/build_base.bat index 879a7a5c..44f2e2c2 100644 --- a/recipe/build_base.bat +++ b/recipe/build_base.bat @@ -1,5 +1,7 @@ @echo on +set "PKG_CONFIG_PATH=%LIBRARY_LIB%\pkgconfig" + set "MESON_ARGS=%MESON_ARGS% --buildtype=release --prefix=%LIBRARY_PREFIX% -Dlibdir=bin -Dsystem-freetype=true -Dsystem-qhull=true" mkdir builddir From 14e13a7faa3828bd4253b275ef23cdf7c7b55aec Mon Sep 17 00:00:00 2001 From: jakirkham Date: Wed, 26 Jun 2024 22:47:35 -0700 Subject: [PATCH 54/95] Add `--pkg-config-path` to `MESON_ARGS` --- recipe/build_base.bat | 4 +--- recipe/build_base.sh | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/recipe/build_base.bat b/recipe/build_base.bat index 44f2e2c2..c4b08cf0 100644 --- a/recipe/build_base.bat +++ b/recipe/build_base.bat @@ -1,8 +1,6 @@ @echo on -set "PKG_CONFIG_PATH=%LIBRARY_LIB%\pkgconfig" - -set "MESON_ARGS=%MESON_ARGS% --buildtype=release --prefix=%LIBRARY_PREFIX% -Dlibdir=bin -Dsystem-freetype=true -Dsystem-qhull=true" +set "MESON_ARGS=%MESON_ARGS% --buildtype=release --prefix=%LIBRARY_PREFIX% --pkg-config-path=%LIBRARY_LIB%\pkgconfig -Dlibdir=bin -Dsystem-freetype=true -Dsystem-qhull=true" mkdir builddir if errorlevel 1 exit 1 diff --git a/recipe/build_base.sh b/recipe/build_base.sh index 61ae5bb5..525a40c8 100644 --- a/recipe/build_base.sh +++ b/recipe/build_base.sh @@ -4,7 +4,7 @@ set -ex export AR=$GCC_AR -export MESON_ARGS="${MESON_ARGS} --buildtype=release --prefix=${PREFIX} -Dlibdir=lib -Dsystem-freetype=true -Dsystem-qhull=true" +export MESON_ARGS="${MESON_ARGS} --buildtype=release --prefix=${PREFIX} -Dlibdir=lib --pkg-config-path=${PREFIX}/lib/pkgconfig -Dsystem-freetype=true -Dsystem-qhull=true" mkdir builddir $PYTHON -m mesonbuild.mesonmain setup builddir $MESON_ARGS From 24bb7ffa494ec2d27886160fed72eab704d35977 Mon Sep 17 00:00:00 2001 From: jakirkham Date: Thu, 27 Jun 2024 00:11:21 -0700 Subject: [PATCH 55/95] Consolidate instal into recipe `script` field --- recipe/build_base.bat | 12 ------------ recipe/build_base.sh | 12 ------------ recipe/meta.yaml | 20 ++++++++++++++++++-- 3 files changed, 18 insertions(+), 26 deletions(-) delete mode 100644 recipe/build_base.bat delete mode 100644 recipe/build_base.sh diff --git a/recipe/build_base.bat b/recipe/build_base.bat deleted file mode 100644 index c4b08cf0..00000000 --- a/recipe/build_base.bat +++ /dev/null @@ -1,12 +0,0 @@ -@echo on - -set "MESON_ARGS=%MESON_ARGS% --buildtype=release --prefix=%LIBRARY_PREFIX% --pkg-config-path=%LIBRARY_LIB%\pkgconfig -Dlibdir=bin -Dsystem-freetype=true -Dsystem-qhull=true" - -mkdir builddir -if errorlevel 1 exit 1 -%PYTHON% -m mesonbuild.mesonmain setup builddir %MESON_ARGS% -if errorlevel 1 exit 1 -%PYTHON% -m build --wheel --no-isolation --skip-dependency-check -Cbuilddir=builddir -if errorlevel 1 exit 1 -%PYTHON% -m pip install --find-links dist matplotlib -if errorlevel 1 exit 1 diff --git a/recipe/build_base.sh b/recipe/build_base.sh deleted file mode 100644 index 525a40c8..00000000 --- a/recipe/build_base.sh +++ /dev/null @@ -1,12 +0,0 @@ -#!/bin/bash - -set -ex - -export AR=$GCC_AR - -export MESON_ARGS="${MESON_ARGS} --buildtype=release --prefix=${PREFIX} -Dlibdir=lib --pkg-config-path=${PREFIX}/lib/pkgconfig -Dsystem-freetype=true -Dsystem-qhull=true" - -mkdir builddir -$PYTHON -m mesonbuild.mesonmain setup builddir $MESON_ARGS -$PYTHON -m build --wheel --no-isolation --skip-dependency-check -Cbuilddir=builddir -$PYTHON -m pip install --find-links dist matplotlib diff --git a/recipe/meta.yaml b/recipe/meta.yaml index aef1fa04..be3ef10f 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -16,8 +16,6 @@ build: outputs: - name: matplotlib-base - script: build_base.bat # [win] - script: build_base.sh # [not win] build: skip: true # [py<39] ignore_run_exports_from: @@ -31,6 +29,24 @@ outputs: - PIP_IGNORE_INSTALLED=True - PIP_CACHE_DIR=pip_cache - PIP_NO_INDEX=True + script: + - export AR="${GCC_AR}" # [unix] + - mkdir builddir + {% if PYTHON is defined %} + - >- + {{ PYTHON }} -m mesonbuild.mesonmain setup builddir + --buildtype=release -Dsystem-freetype=true -Dsystem-qhull=true + --prefix=$PREFIX # [unix] + --prefix=%LIBRARY_PREFIX% # [win] + --libdir=lib # [unix] + --libdir=bin # [win] + --pkg-config-path=$PREFIX/lib/pkgconfig # [unix] + --pkg-config-path=%LIBRARY_LIB%\pkgconfig # [win] + - >- + {{ PYTHON }} -m build --wheel + --no-isolation --skip-dependency-check -Cbuilddir=builddir + - {{ PYTHON }} -m pip install --find-links dist matplotlib + {% endif %} requirements: build: - python # [build_platform != target_platform] From c835afaeaeb3c9166e37540d9bdb02d64a7ca1f3 Mon Sep 17 00:00:00 2001 From: jakirkham Date: Thu, 27 Jun 2024 00:33:39 -0700 Subject: [PATCH 56/95] Revert "Consolidate instal into recipe `script` field" This reverts commit 24bb7ffa494ec2d27886160fed72eab704d35977. --- recipe/build_base.bat | 12 ++++++++++++ recipe/build_base.sh | 12 ++++++++++++ recipe/meta.yaml | 20 ++------------------ 3 files changed, 26 insertions(+), 18 deletions(-) create mode 100644 recipe/build_base.bat create mode 100644 recipe/build_base.sh diff --git a/recipe/build_base.bat b/recipe/build_base.bat new file mode 100644 index 00000000..c4b08cf0 --- /dev/null +++ b/recipe/build_base.bat @@ -0,0 +1,12 @@ +@echo on + +set "MESON_ARGS=%MESON_ARGS% --buildtype=release --prefix=%LIBRARY_PREFIX% --pkg-config-path=%LIBRARY_LIB%\pkgconfig -Dlibdir=bin -Dsystem-freetype=true -Dsystem-qhull=true" + +mkdir builddir +if errorlevel 1 exit 1 +%PYTHON% -m mesonbuild.mesonmain setup builddir %MESON_ARGS% +if errorlevel 1 exit 1 +%PYTHON% -m build --wheel --no-isolation --skip-dependency-check -Cbuilddir=builddir +if errorlevel 1 exit 1 +%PYTHON% -m pip install --find-links dist matplotlib +if errorlevel 1 exit 1 diff --git a/recipe/build_base.sh b/recipe/build_base.sh new file mode 100644 index 00000000..525a40c8 --- /dev/null +++ b/recipe/build_base.sh @@ -0,0 +1,12 @@ +#!/bin/bash + +set -ex + +export AR=$GCC_AR + +export MESON_ARGS="${MESON_ARGS} --buildtype=release --prefix=${PREFIX} -Dlibdir=lib --pkg-config-path=${PREFIX}/lib/pkgconfig -Dsystem-freetype=true -Dsystem-qhull=true" + +mkdir builddir +$PYTHON -m mesonbuild.mesonmain setup builddir $MESON_ARGS +$PYTHON -m build --wheel --no-isolation --skip-dependency-check -Cbuilddir=builddir +$PYTHON -m pip install --find-links dist matplotlib diff --git a/recipe/meta.yaml b/recipe/meta.yaml index be3ef10f..aef1fa04 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -16,6 +16,8 @@ build: outputs: - name: matplotlib-base + script: build_base.bat # [win] + script: build_base.sh # [not win] build: skip: true # [py<39] ignore_run_exports_from: @@ -29,24 +31,6 @@ outputs: - PIP_IGNORE_INSTALLED=True - PIP_CACHE_DIR=pip_cache - PIP_NO_INDEX=True - script: - - export AR="${GCC_AR}" # [unix] - - mkdir builddir - {% if PYTHON is defined %} - - >- - {{ PYTHON }} -m mesonbuild.mesonmain setup builddir - --buildtype=release -Dsystem-freetype=true -Dsystem-qhull=true - --prefix=$PREFIX # [unix] - --prefix=%LIBRARY_PREFIX% # [win] - --libdir=lib # [unix] - --libdir=bin # [win] - --pkg-config-path=$PREFIX/lib/pkgconfig # [unix] - --pkg-config-path=%LIBRARY_LIB%\pkgconfig # [win] - - >- - {{ PYTHON }} -m build --wheel - --no-isolation --skip-dependency-check -Cbuilddir=builddir - - {{ PYTHON }} -m pip install --find-links dist matplotlib - {% endif %} requirements: build: - python # [build_platform != target_platform] From dabeec4546b850cf268ce3d7b4035f5ed2f23051 Mon Sep 17 00:00:00 2001 From: jakirkham Date: Thu, 27 Jun 2024 00:56:40 -0700 Subject: [PATCH 57/95] Try `libdir` as `lib` on Windows --- recipe/build_base.bat | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipe/build_base.bat b/recipe/build_base.bat index c4b08cf0..812b6e55 100644 --- a/recipe/build_base.bat +++ b/recipe/build_base.bat @@ -1,6 +1,6 @@ @echo on -set "MESON_ARGS=%MESON_ARGS% --buildtype=release --prefix=%LIBRARY_PREFIX% --pkg-config-path=%LIBRARY_LIB%\pkgconfig -Dlibdir=bin -Dsystem-freetype=true -Dsystem-qhull=true" +set "MESON_ARGS=%MESON_ARGS% --buildtype=release --prefix=%LIBRARY_PREFIX% --pkg-config-path=%LIBRARY_LIB%\pkgconfig -Dlibdir=lib -Dsystem-freetype=true -Dsystem-qhull=true" mkdir builddir if errorlevel 1 exit 1 From 97aac0fe319dc03c23327ce01815bb8cd20c4c8c Mon Sep 17 00:00:00 2001 From: jakirkham Date: Thu, 27 Jun 2024 01:57:33 -0700 Subject: [PATCH 58/95] Readd Windows path adjustments --- recipe/build_base.bat | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/recipe/build_base.bat b/recipe/build_base.bat index 812b6e55..468b1fa3 100644 --- a/recipe/build_base.bat +++ b/recipe/build_base.bat @@ -1,5 +1,9 @@ @echo on +set "LIB=%LIBRARY_LIB%;%LIB%" +set "LIBPATH=%LIBRARY_LIB%;%LIBPATH%" +set "INCLUDE=%LIBRARY_INC%;%INCLUDE%" + set "MESON_ARGS=%MESON_ARGS% --buildtype=release --prefix=%LIBRARY_PREFIX% --pkg-config-path=%LIBRARY_LIB%\pkgconfig -Dlibdir=lib -Dsystem-freetype=true -Dsystem-qhull=true" mkdir builddir From 55cdc1676babf086ead5194470e7003faf7e9bff Mon Sep 17 00:00:00 2001 From: jakirkham Date: Thu, 27 Jun 2024 02:09:26 -0700 Subject: [PATCH 59/95] Revert "Readd Windows path adjustments" This reverts commit 97aac0fe319dc03c23327ce01815bb8cd20c4c8c. --- recipe/build_base.bat | 4 ---- 1 file changed, 4 deletions(-) diff --git a/recipe/build_base.bat b/recipe/build_base.bat index 468b1fa3..812b6e55 100644 --- a/recipe/build_base.bat +++ b/recipe/build_base.bat @@ -1,9 +1,5 @@ @echo on -set "LIB=%LIBRARY_LIB%;%LIB%" -set "LIBPATH=%LIBRARY_LIB%;%LIBPATH%" -set "INCLUDE=%LIBRARY_INC%;%INCLUDE%" - set "MESON_ARGS=%MESON_ARGS% --buildtype=release --prefix=%LIBRARY_PREFIX% --pkg-config-path=%LIBRARY_LIB%\pkgconfig -Dlibdir=lib -Dsystem-freetype=true -Dsystem-qhull=true" mkdir builddir From b5a125c938198ff104f88da4b6e0461ce02c882a Mon Sep 17 00:00:00 2001 From: jakirkham Date: Thu, 27 Jun 2024 03:58:37 -0700 Subject: [PATCH 60/95] Use verbose build on Windows --- recipe/build_base.bat | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipe/build_base.bat b/recipe/build_base.bat index 812b6e55..7a9cbc7f 100644 --- a/recipe/build_base.bat +++ b/recipe/build_base.bat @@ -6,7 +6,7 @@ mkdir builddir if errorlevel 1 exit 1 %PYTHON% -m mesonbuild.mesonmain setup builddir %MESON_ARGS% if errorlevel 1 exit 1 -%PYTHON% -m build --wheel --no-isolation --skip-dependency-check -Cbuilddir=builddir +%PYTHON% -m build --wheel --no-isolation --skip-dependency-check -Cbuilddir=builddir -Ccompile-args=-v if errorlevel 1 exit 1 %PYTHON% -m pip install --find-links dist matplotlib if errorlevel 1 exit 1 From ccb75bb189ea45f6253d68f6ed56992d55698a84 Mon Sep 17 00:00:00 2001 From: jakirkham Date: Thu, 27 Jun 2024 04:02:17 -0700 Subject: [PATCH 61/95] Also on error print Meson logs --- recipe/build_base.bat | 5 +++-- recipe/build_base.sh | 4 +++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/recipe/build_base.bat b/recipe/build_base.bat index 7a9cbc7f..156b4a18 100644 --- a/recipe/build_base.bat +++ b/recipe/build_base.bat @@ -6,7 +6,8 @@ mkdir builddir if errorlevel 1 exit 1 %PYTHON% -m mesonbuild.mesonmain setup builddir %MESON_ARGS% if errorlevel 1 exit 1 -%PYTHON% -m build --wheel --no-isolation --skip-dependency-check -Cbuilddir=builddir -Ccompile-args=-v -if errorlevel 1 exit 1 +%PYTHON% -m build --wheel ^ + --no-isolation --skip-dependency-check -Cbuilddir=builddir -Ccompile-args=-v +if %ERRORLEVEL% neq 0 (type builddir\meson-logs\meson-log.txt && exit 1) %PYTHON% -m pip install --find-links dist matplotlib if errorlevel 1 exit 1 diff --git a/recipe/build_base.sh b/recipe/build_base.sh index 525a40c8..31545881 100644 --- a/recipe/build_base.sh +++ b/recipe/build_base.sh @@ -8,5 +8,7 @@ export MESON_ARGS="${MESON_ARGS} --buildtype=release --prefix=${PREFIX} -Dlibdir mkdir builddir $PYTHON -m mesonbuild.mesonmain setup builddir $MESON_ARGS -$PYTHON -m build --wheel --no-isolation --skip-dependency-check -Cbuilddir=builddir +$PYTHON -m build --wheel \ + --no-isolation --skip-dependency-check -Cbuilddir=builddir \ + || (cat builddir/meson-logs/meson-log.txt && exit 1) $PYTHON -m pip install --find-links dist matplotlib From 9d8b89be891ec299764dc46651620ff408660d1b Mon Sep 17 00:00:00 2001 From: jakirkham Date: Thu, 27 Jun 2024 15:42:22 -0700 Subject: [PATCH 62/95] Output Meson logs after `setup` --- recipe/build_base.bat | 4 ++-- recipe/build_base.sh | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/recipe/build_base.bat b/recipe/build_base.bat index 156b4a18..caaf53fa 100644 --- a/recipe/build_base.bat +++ b/recipe/build_base.bat @@ -5,9 +5,9 @@ set "MESON_ARGS=%MESON_ARGS% --buildtype=release --prefix=%LIBRARY_PREFIX% --pkg mkdir builddir if errorlevel 1 exit 1 %PYTHON% -m mesonbuild.mesonmain setup builddir %MESON_ARGS% -if errorlevel 1 exit 1 +if %ERRORLEVEL% neq 0 (type builddir\meson-logs\meson-log.txt && exit 1) %PYTHON% -m build --wheel ^ --no-isolation --skip-dependency-check -Cbuilddir=builddir -Ccompile-args=-v -if %ERRORLEVEL% neq 0 (type builddir\meson-logs\meson-log.txt && exit 1) +if errorlevel 1 exit 1 %PYTHON% -m pip install --find-links dist matplotlib if errorlevel 1 exit 1 diff --git a/recipe/build_base.sh b/recipe/build_base.sh index 31545881..44755477 100644 --- a/recipe/build_base.sh +++ b/recipe/build_base.sh @@ -7,8 +7,8 @@ export AR=$GCC_AR export MESON_ARGS="${MESON_ARGS} --buildtype=release --prefix=${PREFIX} -Dlibdir=lib --pkg-config-path=${PREFIX}/lib/pkgconfig -Dsystem-freetype=true -Dsystem-qhull=true" mkdir builddir -$PYTHON -m mesonbuild.mesonmain setup builddir $MESON_ARGS -$PYTHON -m build --wheel \ - --no-isolation --skip-dependency-check -Cbuilddir=builddir \ +$PYTHON -m mesonbuild.mesonmain setup builddir $MESON_ARGS \ || (cat builddir/meson-logs/meson-log.txt && exit 1) +$PYTHON -m build --wheel \ + --no-isolation --skip-dependency-check -Cbuilddir=builddir $PYTHON -m pip install --find-links dist matplotlib From 93097b878d75ec0e77d6eefac7f851cb05572417 Mon Sep 17 00:00:00 2001 From: jakirkham Date: Thu, 27 Jun 2024 15:43:25 -0700 Subject: [PATCH 63/95] Show Windows env vars --- recipe/build_base.bat | 2 ++ 1 file changed, 2 insertions(+) diff --git a/recipe/build_base.bat b/recipe/build_base.bat index caaf53fa..e0a31577 100644 --- a/recipe/build_base.bat +++ b/recipe/build_base.bat @@ -1,5 +1,7 @@ @echo on +set + set "MESON_ARGS=%MESON_ARGS% --buildtype=release --prefix=%LIBRARY_PREFIX% --pkg-config-path=%LIBRARY_LIB%\pkgconfig -Dlibdir=lib -Dsystem-freetype=true -Dsystem-qhull=true" mkdir builddir From 72f157a1d2a7498ee9e2f150c535c210dcd09616 Mon Sep 17 00:00:00 2001 From: jakirkham Date: Thu, 27 Jun 2024 16:04:40 -0700 Subject: [PATCH 64/95] Hackily remove problematic Python from Azure --- recipe/build_base.bat | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/recipe/build_base.bat b/recipe/build_base.bat index e0a31577..f4109e84 100644 --- a/recipe/build_base.bat +++ b/recipe/build_base.bat @@ -4,6 +4,11 @@ set set "MESON_ARGS=%MESON_ARGS% --buildtype=release --prefix=%LIBRARY_PREFIX% --pkg-config-path=%LIBRARY_LIB%\pkgconfig -Dlibdir=lib -Dsystem-freetype=true -Dsystem-qhull=true" +if "%CI%" == "azure" ( + :: Hack to try removing problematic Python from Azure CI image + rmdir /s /q C:\hostedtoolcache\windows\Python +) + mkdir builddir if errorlevel 1 exit 1 %PYTHON% -m mesonbuild.mesonmain setup builddir %MESON_ARGS% From 7dae4705f38ec3aa3770010f22108fec52b71406 Mon Sep 17 00:00:00 2001 From: jakirkham Date: Thu, 27 Jun 2024 16:05:43 -0700 Subject: [PATCH 65/95] Always show Meson logs Co-authored-by: Elliott Sales de Andrade --- recipe/build_base.bat | 2 +- recipe/build_base.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/recipe/build_base.bat b/recipe/build_base.bat index f4109e84..26ba06b4 100644 --- a/recipe/build_base.bat +++ b/recipe/build_base.bat @@ -12,7 +12,7 @@ if "%CI%" == "azure" ( mkdir builddir if errorlevel 1 exit 1 %PYTHON% -m mesonbuild.mesonmain setup builddir %MESON_ARGS% -if %ERRORLEVEL% neq 0 (type builddir\meson-logs\meson-log.txt && exit 1) +type builddir\meson-logs\meson-log.txt %PYTHON% -m build --wheel ^ --no-isolation --skip-dependency-check -Cbuilddir=builddir -Ccompile-args=-v if errorlevel 1 exit 1 diff --git a/recipe/build_base.sh b/recipe/build_base.sh index 44755477..d5136dd8 100644 --- a/recipe/build_base.sh +++ b/recipe/build_base.sh @@ -8,7 +8,7 @@ export MESON_ARGS="${MESON_ARGS} --buildtype=release --prefix=${PREFIX} -Dlibdir mkdir builddir $PYTHON -m mesonbuild.mesonmain setup builddir $MESON_ARGS \ - || (cat builddir/meson-logs/meson-log.txt && exit 1) +cat builddir/meson-logs/meson-log.txt $PYTHON -m build --wheel \ --no-isolation --skip-dependency-check -Cbuilddir=builddir $PYTHON -m pip install --find-links dist matplotlib From a3f99154808e76a196be175881841fcade61ecdf Mon Sep 17 00:00:00 2001 From: jakirkham Date: Thu, 27 Jun 2024 16:38:00 -0700 Subject: [PATCH 66/95] Fix Unix builds --- recipe/build_base.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipe/build_base.sh b/recipe/build_base.sh index d5136dd8..78bd7b11 100644 --- a/recipe/build_base.sh +++ b/recipe/build_base.sh @@ -7,7 +7,7 @@ export AR=$GCC_AR export MESON_ARGS="${MESON_ARGS} --buildtype=release --prefix=${PREFIX} -Dlibdir=lib --pkg-config-path=${PREFIX}/lib/pkgconfig -Dsystem-freetype=true -Dsystem-qhull=true" mkdir builddir -$PYTHON -m mesonbuild.mesonmain setup builddir $MESON_ARGS \ +$PYTHON -m mesonbuild.mesonmain setup builddir $MESON_ARGS cat builddir/meson-logs/meson-log.txt $PYTHON -m build --wheel \ --no-isolation --skip-dependency-check -Cbuilddir=builddir From 6bc4c6cb332e910502edabdedc00b89a4bb1ba7b Mon Sep 17 00:00:00 2001 From: jakirkham Date: Thu, 27 Jun 2024 16:38:46 -0700 Subject: [PATCH 67/95] Try PowerShell for removing Azure's Python --- recipe/build_base.bat | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipe/build_base.bat b/recipe/build_base.bat index 26ba06b4..430457f8 100644 --- a/recipe/build_base.bat +++ b/recipe/build_base.bat @@ -6,7 +6,7 @@ set "MESON_ARGS=%MESON_ARGS% --buildtype=release --prefix=%LIBRARY_PREFIX% --pkg if "%CI%" == "azure" ( :: Hack to try removing problematic Python from Azure CI image - rmdir /s /q C:\hostedtoolcache\windows\Python + powershell -Command "Remove-Item -LiteralPath 'C:\hostedtoolcache\windows\Python' -Force -Recurse" ) mkdir builddir From 55025c47f76c36fd545d93e471c4f4b85e9685d9 Mon Sep 17 00:00:00 2001 From: jakirkham Date: Thu, 27 Jun 2024 17:03:27 -0700 Subject: [PATCH 68/95] Use `robocopy` trick to remove Azure Python --- recipe/build_base.bat | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/recipe/build_base.bat b/recipe/build_base.bat index 430457f8..905785a2 100644 --- a/recipe/build_base.bat +++ b/recipe/build_base.bat @@ -6,7 +6,9 @@ set "MESON_ARGS=%MESON_ARGS% --buildtype=release --prefix=%LIBRARY_PREFIX% --pkg if "%CI%" == "azure" ( :: Hack to try removing problematic Python from Azure CI image - powershell -Command "Remove-Item -LiteralPath 'C:\hostedtoolcache\windows\Python' -Force -Recurse" + mkdir C:\empty + robocopy /mir C:\empty C:\hostedtoolcache\windows\Python + rmdir /q C:\empty ) mkdir builddir From d1d8c838e4a3608252687df1f3f0dbb0f9b57676 Mon Sep 17 00:00:00 2001 From: jakirkham Date: Thu, 27 Jun 2024 17:24:33 -0700 Subject: [PATCH 69/95] Much quieter `robocopy` --- recipe/build_base.bat | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipe/build_base.bat b/recipe/build_base.bat index 905785a2..0a72ca01 100644 --- a/recipe/build_base.bat +++ b/recipe/build_base.bat @@ -7,7 +7,7 @@ set "MESON_ARGS=%MESON_ARGS% --buildtype=release --prefix=%LIBRARY_PREFIX% --pkg if "%CI%" == "azure" ( :: Hack to try removing problematic Python from Azure CI image mkdir C:\empty - robocopy /mir C:\empty C:\hostedtoolcache\windows\Python + robocopy /mir /ns /nc /nfl /ndl /np C:\empty C:\hostedtoolcache\windows\Python rmdir /q C:\empty ) From 78a1ec47cfb0af6d6f30413ead697cdf4a3b2c05 Mon Sep 17 00:00:00 2001 From: jakirkham Date: Thu, 27 Jun 2024 17:27:41 -0700 Subject: [PATCH 70/95] One more `rmdir` --- recipe/build_base.bat | 1 + 1 file changed, 1 insertion(+) diff --git a/recipe/build_base.bat b/recipe/build_base.bat index 0a72ca01..d558be28 100644 --- a/recipe/build_base.bat +++ b/recipe/build_base.bat @@ -9,6 +9,7 @@ if "%CI%" == "azure" ( mkdir C:\empty robocopy /mir /ns /nc /nfl /ndl /np C:\empty C:\hostedtoolcache\windows\Python rmdir /q C:\empty + rmdir /q C:\hostedtoolcache\windows\Python ) mkdir builddir From 860a727b519269fda153f8bc709f04df3a7559e4 Mon Sep 17 00:00:00 2001 From: jakirkham Date: Thu, 27 Jun 2024 17:44:17 -0700 Subject: [PATCH 71/95] Even quieter `robocopy` --- recipe/build_base.bat | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipe/build_base.bat b/recipe/build_base.bat index d558be28..6e7ede6e 100644 --- a/recipe/build_base.bat +++ b/recipe/build_base.bat @@ -7,7 +7,7 @@ set "MESON_ARGS=%MESON_ARGS% --buildtype=release --prefix=%LIBRARY_PREFIX% --pkg if "%CI%" == "azure" ( :: Hack to try removing problematic Python from Azure CI image mkdir C:\empty - robocopy /mir /ns /nc /nfl /ndl /np C:\empty C:\hostedtoolcache\windows\Python + robocopy /mir /ns /nc /nfl /ndl /np /njh /njs C:\empty C:\hostedtoolcache\windows\Python rmdir /q C:\empty rmdir /q C:\hostedtoolcache\windows\Python ) From 71dacbe0941cb86905a2f6ab2f82e66078909b76 Mon Sep 17 00:00:00 2001 From: jakirkham Date: Thu, 27 Jun 2024 18:03:14 -0700 Subject: [PATCH 72/95] Silence `robocopy` --- recipe/build_base.bat | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipe/build_base.bat b/recipe/build_base.bat index 6e7ede6e..5be358fb 100644 --- a/recipe/build_base.bat +++ b/recipe/build_base.bat @@ -7,7 +7,7 @@ set "MESON_ARGS=%MESON_ARGS% --buildtype=release --prefix=%LIBRARY_PREFIX% --pkg if "%CI%" == "azure" ( :: Hack to try removing problematic Python from Azure CI image mkdir C:\empty - robocopy /mir /ns /nc /nfl /ndl /np /njh /njs C:\empty C:\hostedtoolcache\windows\Python + robocopy /mir /ns /nc /nfl /ndl /np /njh /njs C:\empty C:\hostedtoolcache\windows\Python > nul 2>&1 rmdir /q C:\empty rmdir /q C:\hostedtoolcache\windows\Python ) From 3c1fcd27b883c6a8b38af729128ba56348240bfe Mon Sep 17 00:00:00 2001 From: jakirkham Date: Thu, 27 Jun 2024 18:35:34 -0700 Subject: [PATCH 73/95] Drop env var display --- recipe/build_base.bat | 2 -- 1 file changed, 2 deletions(-) diff --git a/recipe/build_base.bat b/recipe/build_base.bat index 5be358fb..87cc27c5 100644 --- a/recipe/build_base.bat +++ b/recipe/build_base.bat @@ -1,7 +1,5 @@ @echo on -set - set "MESON_ARGS=%MESON_ARGS% --buildtype=release --prefix=%LIBRARY_PREFIX% --pkg-config-path=%LIBRARY_LIB%\pkgconfig -Dlibdir=lib -Dsystem-freetype=true -Dsystem-qhull=true" if "%CI%" == "azure" ( From 6355da0f64cacc8f2c928245a94720f11d5bc648 Mon Sep 17 00:00:00 2001 From: jakirkham Date: Thu, 27 Jun 2024 18:36:35 -0700 Subject: [PATCH 74/95] Tidy `robocopy` call --- recipe/build_base.bat | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/recipe/build_base.bat b/recipe/build_base.bat index 87cc27c5..65b9f495 100644 --- a/recipe/build_base.bat +++ b/recipe/build_base.bat @@ -5,9 +5,8 @@ set "MESON_ARGS=%MESON_ARGS% --buildtype=release --prefix=%LIBRARY_PREFIX% --pkg if "%CI%" == "azure" ( :: Hack to try removing problematic Python from Azure CI image mkdir C:\empty - robocopy /mir /ns /nc /nfl /ndl /np /njh /njs C:\empty C:\hostedtoolcache\windows\Python > nul 2>&1 + robocopy /mir /ns /nc /nfl /ndl /np /njh /njs C:\empty C:\hostedtoolcache\windows\Python > nul 2>&1 && rmdir /q C:\hostedtoolcache\windows\Python rmdir /q C:\empty - rmdir /q C:\hostedtoolcache\windows\Python ) mkdir builddir From 665872234810162c17cf87bafa7ee0adf37649b4 Mon Sep 17 00:00:00 2001 From: jakirkham Date: Thu, 27 Jun 2024 18:45:24 -0700 Subject: [PATCH 75/95] Use `for`-loop with `robocopy` --- recipe/build_base.bat | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/recipe/build_base.bat b/recipe/build_base.bat index 65b9f495..9d8d5939 100644 --- a/recipe/build_base.bat +++ b/recipe/build_base.bat @@ -4,8 +4,18 @@ set "MESON_ARGS=%MESON_ARGS% --buildtype=release --prefix=%LIBRARY_PREFIX% --pkg if "%CI%" == "azure" ( :: Hack to try removing problematic Python from Azure CI image + set CLEANUP_DIRS=(C:\hostedtoolcache\windows\Python) mkdir C:\empty - robocopy /mir /ns /nc /nfl /ndl /np /njh /njs C:\empty C:\hostedtoolcache\windows\Python > nul 2>&1 && rmdir /q C:\hostedtoolcache\windows\Python + for %%f in %CLEANUP_DIRS% do ( + echo Removing %%f + robocopy /mir /ns /nc /nfl /ndl /np /njh /njs %%f > nul 2>&1 + rmdir /q %%f + if errorlevel 1 ( + echo Failed to remove + rmdir /q C:\empty + exit /b 1 + ) + ) rmdir /q C:\empty ) From 3d449bbfa9db8c0ae28a63c66f61924d3a0d12ce Mon Sep 17 00:00:00 2001 From: jakirkham Date: Thu, 27 Jun 2024 19:04:15 -0700 Subject: [PATCH 76/95] Quote array assignment --- recipe/build_base.bat | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipe/build_base.bat b/recipe/build_base.bat index 9d8d5939..afaad31c 100644 --- a/recipe/build_base.bat +++ b/recipe/build_base.bat @@ -4,7 +4,7 @@ set "MESON_ARGS=%MESON_ARGS% --buildtype=release --prefix=%LIBRARY_PREFIX% --pkg if "%CI%" == "azure" ( :: Hack to try removing problematic Python from Azure CI image - set CLEANUP_DIRS=(C:\hostedtoolcache\windows\Python) + set "CLEANUP_DIRS=(C:\hostedtoolcache\windows\Python)" mkdir C:\empty for %%f in %CLEANUP_DIRS% do ( echo Removing %%f From eb4664f977aa0e3a4b170738fcac6de08d4cba01 Mon Sep 17 00:00:00 2001 From: jakirkham Date: Thu, 27 Jun 2024 19:12:25 -0700 Subject: [PATCH 77/95] Fix batch array --- recipe/build_base.bat | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipe/build_base.bat b/recipe/build_base.bat index afaad31c..da6a42f3 100644 --- a/recipe/build_base.bat +++ b/recipe/build_base.bat @@ -4,7 +4,7 @@ set "MESON_ARGS=%MESON_ARGS% --buildtype=release --prefix=%LIBRARY_PREFIX% --pkg if "%CI%" == "azure" ( :: Hack to try removing problematic Python from Azure CI image - set "CLEANUP_DIRS=(C:\hostedtoolcache\windows\Python)" + set "CLEANUP_DIRS=C:\hostedtoolcache\windows\Python;" mkdir C:\empty for %%f in %CLEANUP_DIRS% do ( echo Removing %%f From 9171d9eed0cbf022645513e337dca67be3354e62 Mon Sep 17 00:00:00 2001 From: jakirkham Date: Thu, 27 Jun 2024 19:13:02 -0700 Subject: [PATCH 78/95] Fix batch `for`-loop --- recipe/build_base.bat | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipe/build_base.bat b/recipe/build_base.bat index da6a42f3..7970fc97 100644 --- a/recipe/build_base.bat +++ b/recipe/build_base.bat @@ -6,7 +6,7 @@ if "%CI%" == "azure" ( :: Hack to try removing problematic Python from Azure CI image set "CLEANUP_DIRS=C:\hostedtoolcache\windows\Python;" mkdir C:\empty - for %%f in %CLEANUP_DIRS% do ( + for %%f in (%CLEANUP_DIRS%) do ( echo Removing %%f robocopy /mir /ns /nc /nfl /ndl /np /njh /njs %%f > nul 2>&1 rmdir /q %%f From 6ca67fa7af08d547ec939ecbbe443ddeacb0eb71 Mon Sep 17 00:00:00 2001 From: jakirkham Date: Thu, 27 Jun 2024 19:31:40 -0700 Subject: [PATCH 79/95] Fix batch array again --- recipe/build_base.bat | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipe/build_base.bat b/recipe/build_base.bat index 7970fc97..3816d08d 100644 --- a/recipe/build_base.bat +++ b/recipe/build_base.bat @@ -4,7 +4,7 @@ set "MESON_ARGS=%MESON_ARGS% --buildtype=release --prefix=%LIBRARY_PREFIX% --pkg if "%CI%" == "azure" ( :: Hack to try removing problematic Python from Azure CI image - set "CLEANUP_DIRS=C:\hostedtoolcache\windows\Python;" + set CLEANUP_DIRS[0]=C:\hostedtoolcache\windows\Python mkdir C:\empty for %%f in (%CLEANUP_DIRS%) do ( echo Removing %%f From 88892310cef2b75dc2b3f8af44d33d4056ae2850 Mon Sep 17 00:00:00 2001 From: jakirkham Date: Thu, 27 Jun 2024 19:44:18 -0700 Subject: [PATCH 80/95] Use`;` list --- recipe/build_base.bat | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipe/build_base.bat b/recipe/build_base.bat index 3816d08d..7970fc97 100644 --- a/recipe/build_base.bat +++ b/recipe/build_base.bat @@ -4,7 +4,7 @@ set "MESON_ARGS=%MESON_ARGS% --buildtype=release --prefix=%LIBRARY_PREFIX% --pkg if "%CI%" == "azure" ( :: Hack to try removing problematic Python from Azure CI image - set CLEANUP_DIRS[0]=C:\hostedtoolcache\windows\Python + set "CLEANUP_DIRS=C:\hostedtoolcache\windows\Python;" mkdir C:\empty for %%f in (%CLEANUP_DIRS%) do ( echo Removing %%f From e5224aeb60f9014dda42b42ce532b5bd1680e6c5 Mon Sep 17 00:00:00 2001 From: jakirkham Date: Thu, 27 Jun 2024 19:44:44 -0700 Subject: [PATCH 81/95] Replace`;` with ` ` --- recipe/build_base.bat | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipe/build_base.bat b/recipe/build_base.bat index 7970fc97..a1190d0d 100644 --- a/recipe/build_base.bat +++ b/recipe/build_base.bat @@ -6,7 +6,7 @@ if "%CI%" == "azure" ( :: Hack to try removing problematic Python from Azure CI image set "CLEANUP_DIRS=C:\hostedtoolcache\windows\Python;" mkdir C:\empty - for %%f in (%CLEANUP_DIRS%) do ( + for %%f in (%CLEANUP_DIRS:;= %) do ( echo Removing %%f robocopy /mir /ns /nc /nfl /ndl /np /njh /njs %%f > nul 2>&1 rmdir /q %%f From e316d55ace07bc1e2c1159ab031448315593654c Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Fri, 28 Jun 2024 11:35:48 +0000 Subject: [PATCH 82/95] migration: OSXArm --- conda-forge.yml | 4 ++-- recipe/meta.yaml | 4 ++++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/conda-forge.yml b/conda-forge.yml index 1a735061..58154bb6 100644 --- a/conda-forge.yml +++ b/conda-forge.yml @@ -5,6 +5,8 @@ build_platform: linux_aarch64: linux_64 linux_ppc64le: linux_64 osx_arm64: osx_64 +conda_build: + pkg_format: '2' conda_forge_output_validation: true github: branch_name: main @@ -15,6 +17,4 @@ provider: linux_ppc64le: default osx: azure win: azure -conda_build: - pkg_format: '2' test: native_and_emulated diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 967e6a84..c5bd4448 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -24,6 +24,10 @@ outputs: - zlib requirements: build: + - python # [build_platform != target_platform] + - cross-python_{{ target_platform }} # [build_platform != target_platform] + - numpy # [build_platform != target_platform] + - pybind11 # [build_platform != target_platform] - python # [build_platform != target_platform] - cross-python_{{ target_platform }} # [build_platform != target_platform] - numpy # [build_platform != target_platform] From 9bf778f38dd2bf0bd30a345105ca148556c61e91 Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Fri, 28 Jun 2024 11:38:19 +0000 Subject: [PATCH 83/95] MNT: Re-rendered with conda-build 24.5.1, conda-smithy 3.36.2, and conda-forge-pinning 2024.06.28.09.32.10 --- .azure-pipelines/azure-pipelines-linux.yml | 68 ++++---- .azure-pipelines/azure-pipelines-osx.yml | 43 ++--- .azure-pipelines/azure-pipelines-win.yml | 81 +++------- ...nux_64_numpy1.21python3.8.____73_pypy.yaml | 40 ----- ...x_64_numpy1.22python3.10.____cpython.yaml} | 4 +- ...ux_64_numpy1.22python3.8.____cpython.yaml} | 4 +- ...ux_64_numpy1.22python3.9.____73_pypy.yaml} | 4 +- ...ux_64_numpy1.22python3.9.____cpython.yaml} | 4 +- ...ux_64_numpy1.23python3.11.____cpython.yaml | 2 +- ...ux_64_numpy1.26python3.12.____cpython.yaml | 40 +++++ ...arch64_numpy1.21python3.8.____73_pypy.yaml | 44 ------ ...ch64_numpy1.22python3.10.____cpython.yaml} | 4 +- ...rch64_numpy1.22python3.8.____cpython.yaml} | 4 +- ...rch64_numpy1.22python3.9.____73_pypy.yaml} | 4 +- ...rch64_numpy1.22python3.9.____cpython.yaml} | 4 +- ...rch64_numpy1.23python3.11.____cpython.yaml | 2 +- ...rch64_numpy1.26python3.12.____cpython.yaml | 44 ++++++ ...pc64le_numpy1.21python3.8.____73_pypy.yaml | 38 ----- ...64le_numpy1.22python3.10.____cpython.yaml} | 4 +- ...c64le_numpy1.22python3.8.____cpython.yaml} | 4 +- ...c64le_numpy1.22python3.9.____73_pypy.yaml} | 4 +- ...c64le_numpy1.22python3.9.____cpython.yaml} | 4 +- ...c64le_numpy1.23python3.11.____cpython.yaml | 2 +- ...c64le_numpy1.26python3.12.____cpython.yaml | 38 +++++ .ci_support/migrations/python311.yaml | 37 ----- ...osx_64_numpy1.21python3.8.____73_pypy.yaml | 40 ----- ...x_64_numpy1.22python3.10.____cpython.yaml} | 12 +- ...sx_64_numpy1.22python3.8.____cpython.yaml} | 12 +- ...sx_64_numpy1.22python3.9.____73_pypy.yaml} | 12 +- ...sx_64_numpy1.22python3.9.____cpython.yaml} | 12 +- ...sx_64_numpy1.23python3.11.____cpython.yaml | 10 +- ...sx_64_numpy1.26python3.12.____cpython.yaml | 40 +++++ ...rm64_numpy1.22python3.10.____cpython.yaml} | 10 +- ...arm64_numpy1.22python3.8.____cpython.yaml} | 10 +- ...arm64_numpy1.22python3.9.____cpython.yaml} | 10 +- ...arm64_numpy1.23python3.11.____cpython.yaml | 8 +- ...arm64_numpy1.26python3.12.____cpython.yaml | 40 +++++ ...n_64_numpy1.22python3.10.____cpython.yaml} | 4 +- ...in_64_numpy1.22python3.8.____cpython.yaml} | 4 +- ...in_64_numpy1.22python3.9.____73_pypy.yaml} | 4 +- ...in_64_numpy1.22python3.9.____cpython.yaml} | 4 +- ...in_64_numpy1.23python3.11.____cpython.yaml | 2 +- ...n_64_numpy1.26python3.12.____cpython.yaml} | 8 +- .gitattributes | 4 +- .gitignore | 25 ++- .scripts/build_steps.sh | 23 ++- .scripts/logging_utils.sh | 4 +- .scripts/run_docker_build.sh | 9 ++ .scripts/run_osx_build.sh | 26 +++- .scripts/run_win_build.bat | 130 ++++++++++++++++ README.md | 147 +++++++++--------- azure-pipelines.yml | 4 +- build-locally.py | 5 +- 53 files changed, 661 insertions(+), 485 deletions(-) delete mode 100644 .ci_support/linux_64_numpy1.21python3.8.____73_pypy.yaml rename .ci_support/{linux_64_numpy1.21python3.10.____cpython.yaml => linux_64_numpy1.22python3.10.____cpython.yaml} (96%) rename .ci_support/{linux_64_numpy1.21python3.8.____cpython.yaml => linux_64_numpy1.22python3.8.____cpython.yaml} (96%) rename .ci_support/{linux_64_numpy1.21python3.9.____73_pypy.yaml => linux_64_numpy1.22python3.9.____73_pypy.yaml} (96%) rename .ci_support/{linux_64_numpy1.21python3.9.____cpython.yaml => linux_64_numpy1.22python3.9.____cpython.yaml} (96%) create mode 100644 .ci_support/linux_64_numpy1.26python3.12.____cpython.yaml delete mode 100644 .ci_support/linux_aarch64_numpy1.21python3.8.____73_pypy.yaml rename .ci_support/{linux_aarch64_numpy1.21python3.10.____cpython.yaml => linux_aarch64_numpy1.22python3.10.____cpython.yaml} (97%) rename .ci_support/{linux_aarch64_numpy1.21python3.8.____cpython.yaml => linux_aarch64_numpy1.22python3.8.____cpython.yaml} (97%) rename .ci_support/{linux_aarch64_numpy1.21python3.9.____73_pypy.yaml => linux_aarch64_numpy1.22python3.9.____73_pypy.yaml} (97%) rename .ci_support/{linux_aarch64_numpy1.21python3.9.____cpython.yaml => linux_aarch64_numpy1.22python3.9.____cpython.yaml} (97%) create mode 100644 .ci_support/linux_aarch64_numpy1.26python3.12.____cpython.yaml delete mode 100644 .ci_support/linux_ppc64le_numpy1.21python3.8.____73_pypy.yaml rename .ci_support/{linux_ppc64le_numpy1.21python3.10.____cpython.yaml => linux_ppc64le_numpy1.22python3.10.____cpython.yaml} (96%) rename .ci_support/{linux_ppc64le_numpy1.21python3.8.____cpython.yaml => linux_ppc64le_numpy1.22python3.8.____cpython.yaml} (96%) rename .ci_support/{linux_ppc64le_numpy1.21python3.9.____73_pypy.yaml => linux_ppc64le_numpy1.22python3.9.____73_pypy.yaml} (96%) rename .ci_support/{linux_ppc64le_numpy1.21python3.9.____cpython.yaml => linux_ppc64le_numpy1.22python3.9.____cpython.yaml} (96%) create mode 100644 .ci_support/linux_ppc64le_numpy1.26python3.12.____cpython.yaml delete mode 100644 .ci_support/migrations/python311.yaml delete mode 100644 .ci_support/osx_64_numpy1.21python3.8.____73_pypy.yaml rename .ci_support/{osx_64_numpy1.21python3.10.____cpython.yaml => osx_64_numpy1.22python3.10.____cpython.yaml} (90%) rename .ci_support/{osx_64_numpy1.21python3.8.____cpython.yaml => osx_64_numpy1.22python3.8.____cpython.yaml} (90%) rename .ci_support/{osx_64_numpy1.21python3.9.____73_pypy.yaml => osx_64_numpy1.22python3.9.____73_pypy.yaml} (90%) rename .ci_support/{osx_64_numpy1.21python3.9.____cpython.yaml => osx_64_numpy1.22python3.9.____cpython.yaml} (90%) create mode 100644 .ci_support/osx_64_numpy1.26python3.12.____cpython.yaml rename .ci_support/{osx_arm64_numpy1.21python3.10.____cpython.yaml => osx_arm64_numpy1.22python3.10.____cpython.yaml} (89%) rename .ci_support/{osx_arm64_numpy1.21python3.8.____cpython.yaml => osx_arm64_numpy1.22python3.8.____cpython.yaml} (89%) rename .ci_support/{osx_arm64_numpy1.21python3.9.____cpython.yaml => osx_arm64_numpy1.22python3.9.____cpython.yaml} (89%) create mode 100644 .ci_support/osx_arm64_numpy1.26python3.12.____cpython.yaml rename .ci_support/{win_64_numpy1.21python3.10.____cpython.yaml => win_64_numpy1.22python3.10.____cpython.yaml} (95%) rename .ci_support/{win_64_numpy1.21python3.8.____cpython.yaml => win_64_numpy1.22python3.8.____cpython.yaml} (95%) rename .ci_support/{win_64_numpy1.21python3.9.____73_pypy.yaml => win_64_numpy1.22python3.9.____73_pypy.yaml} (95%) rename .ci_support/{win_64_numpy1.21python3.9.____cpython.yaml => win_64_numpy1.22python3.9.____cpython.yaml} (95%) rename .ci_support/{win_64_numpy1.21python3.8.____73_pypy.yaml => win_64_numpy1.26python3.12.____cpython.yaml} (87%) create mode 100755 .scripts/run_win_build.bat diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml index d42ff128..229a62a6 100755 --- a/.azure-pipelines/azure-pipelines-linux.yml +++ b/.azure-pipelines/azure-pipelines-linux.yml @@ -8,79 +8,80 @@ jobs: vmImage: ubuntu-latest strategy: matrix: - linux_64_numpy1.21python3.10.____cpython: - CONFIG: linux_64_numpy1.21python3.10.____cpython + linux_64_numpy1.22python3.10.____cpython: + CONFIG: linux_64_numpy1.22python3.10.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_64_numpy1.21python3.8.____73_pypy: - CONFIG: linux_64_numpy1.21python3.8.____73_pypy + linux_64_numpy1.22python3.8.____cpython: + CONFIG: linux_64_numpy1.22python3.8.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_64_numpy1.21python3.8.____cpython: - CONFIG: linux_64_numpy1.21python3.8.____cpython + linux_64_numpy1.22python3.9.____73_pypy: + CONFIG: linux_64_numpy1.22python3.9.____73_pypy UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_64_numpy1.21python3.9.____73_pypy: - CONFIG: linux_64_numpy1.21python3.9.____73_pypy - UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_64_numpy1.21python3.9.____cpython: - CONFIG: linux_64_numpy1.21python3.9.____cpython + linux_64_numpy1.22python3.9.____cpython: + CONFIG: linux_64_numpy1.22python3.9.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 linux_64_numpy1.23python3.11.____cpython: CONFIG: linux_64_numpy1.23python3.11.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_aarch64_numpy1.21python3.10.____cpython: - CONFIG: linux_aarch64_numpy1.21python3.10.____cpython + linux_64_numpy1.26python3.12.____cpython: + CONFIG: linux_64_numpy1.26python3.12.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_aarch64_numpy1.21python3.8.____73_pypy: - CONFIG: linux_aarch64_numpy1.21python3.8.____73_pypy + linux_aarch64_numpy1.22python3.10.____cpython: + CONFIG: linux_aarch64_numpy1.22python3.10.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_aarch64_numpy1.21python3.8.____cpython: - CONFIG: linux_aarch64_numpy1.21python3.8.____cpython + linux_aarch64_numpy1.22python3.8.____cpython: + CONFIG: linux_aarch64_numpy1.22python3.8.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_aarch64_numpy1.21python3.9.____73_pypy: - CONFIG: linux_aarch64_numpy1.21python3.9.____73_pypy + linux_aarch64_numpy1.22python3.9.____73_pypy: + CONFIG: linux_aarch64_numpy1.22python3.9.____73_pypy UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_aarch64_numpy1.21python3.9.____cpython: - CONFIG: linux_aarch64_numpy1.21python3.9.____cpython + linux_aarch64_numpy1.22python3.9.____cpython: + CONFIG: linux_aarch64_numpy1.22python3.9.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 linux_aarch64_numpy1.23python3.11.____cpython: CONFIG: linux_aarch64_numpy1.23python3.11.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_ppc64le_numpy1.21python3.10.____cpython: - CONFIG: linux_ppc64le_numpy1.21python3.10.____cpython + linux_aarch64_numpy1.26python3.12.____cpython: + CONFIG: linux_aarch64_numpy1.26python3.12.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_ppc64le_numpy1.21python3.8.____73_pypy: - CONFIG: linux_ppc64le_numpy1.21python3.8.____73_pypy + linux_ppc64le_numpy1.22python3.10.____cpython: + CONFIG: linux_ppc64le_numpy1.22python3.10.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_ppc64le_numpy1.21python3.8.____cpython: - CONFIG: linux_ppc64le_numpy1.21python3.8.____cpython + linux_ppc64le_numpy1.22python3.8.____cpython: + CONFIG: linux_ppc64le_numpy1.22python3.8.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_ppc64le_numpy1.21python3.9.____73_pypy: - CONFIG: linux_ppc64le_numpy1.21python3.9.____73_pypy + linux_ppc64le_numpy1.22python3.9.____73_pypy: + CONFIG: linux_ppc64le_numpy1.22python3.9.____73_pypy UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_ppc64le_numpy1.21python3.9.____cpython: - CONFIG: linux_ppc64le_numpy1.21python3.9.____cpython + linux_ppc64le_numpy1.22python3.9.____cpython: + CONFIG: linux_ppc64le_numpy1.22python3.9.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 linux_ppc64le_numpy1.23python3.11.____cpython: CONFIG: linux_ppc64le_numpy1.23python3.11.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 + linux_ppc64le_numpy1.26python3.12.____cpython: + CONFIG: linux_ppc64le_numpy1.26python3.12.____cpython + UPLOAD_PACKAGES: 'True' + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 timeoutInMinutes: 360 + variables: {} steps: # configure qemu binfmt-misc running. This allows us to run docker containers @@ -93,6 +94,9 @@ jobs: - script: | export CI=azure + export flow_run_id=azure_$(Build.BuildNumber).$(System.JobAttempt) + export remote_url=$(Build.Repository.Uri) + export sha=$(Build.SourceVersion) export GIT_BRANCH=$BUILD_SOURCEBRANCHNAME export FEEDSTOCK_NAME=$(basename ${BUILD_REPOSITORY_NAME}) if [[ "${BUILD_REASON:-}" == "PullRequest" ]]; then diff --git a/.azure-pipelines/azure-pipelines-osx.yml b/.azure-pipelines/azure-pipelines-osx.yml index e3774bfd..27ddd14f 100755 --- a/.azure-pipelines/azure-pipelines-osx.yml +++ b/.azure-pipelines/azure-pipelines-osx.yml @@ -5,45 +5,52 @@ jobs: - job: osx pool: - vmImage: macOS-11 + vmImage: macOS-12 strategy: matrix: - osx_64_numpy1.21python3.10.____cpython: - CONFIG: osx_64_numpy1.21python3.10.____cpython + osx_64_numpy1.22python3.10.____cpython: + CONFIG: osx_64_numpy1.22python3.10.____cpython UPLOAD_PACKAGES: 'True' - osx_64_numpy1.21python3.8.____73_pypy: - CONFIG: osx_64_numpy1.21python3.8.____73_pypy + osx_64_numpy1.22python3.8.____cpython: + CONFIG: osx_64_numpy1.22python3.8.____cpython UPLOAD_PACKAGES: 'True' - osx_64_numpy1.21python3.8.____cpython: - CONFIG: osx_64_numpy1.21python3.8.____cpython + osx_64_numpy1.22python3.9.____73_pypy: + CONFIG: osx_64_numpy1.22python3.9.____73_pypy UPLOAD_PACKAGES: 'True' - osx_64_numpy1.21python3.9.____73_pypy: - CONFIG: osx_64_numpy1.21python3.9.____73_pypy - UPLOAD_PACKAGES: 'True' - osx_64_numpy1.21python3.9.____cpython: - CONFIG: osx_64_numpy1.21python3.9.____cpython + osx_64_numpy1.22python3.9.____cpython: + CONFIG: osx_64_numpy1.22python3.9.____cpython UPLOAD_PACKAGES: 'True' osx_64_numpy1.23python3.11.____cpython: CONFIG: osx_64_numpy1.23python3.11.____cpython UPLOAD_PACKAGES: 'True' - osx_arm64_numpy1.21python3.10.____cpython: - CONFIG: osx_arm64_numpy1.21python3.10.____cpython + osx_64_numpy1.26python3.12.____cpython: + CONFIG: osx_64_numpy1.26python3.12.____cpython + UPLOAD_PACKAGES: 'True' + osx_arm64_numpy1.22python3.10.____cpython: + CONFIG: osx_arm64_numpy1.22python3.10.____cpython UPLOAD_PACKAGES: 'True' - osx_arm64_numpy1.21python3.8.____cpython: - CONFIG: osx_arm64_numpy1.21python3.8.____cpython + osx_arm64_numpy1.22python3.8.____cpython: + CONFIG: osx_arm64_numpy1.22python3.8.____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 UPLOAD_PACKAGES: 'True' + osx_arm64_numpy1.26python3.12.____cpython: + CONFIG: osx_arm64_numpy1.26python3.12.____cpython + UPLOAD_PACKAGES: 'True' timeoutInMinutes: 360 + variables: {} steps: # TODO: Fast finish on azure pipelines? - script: | export CI=azure + export flow_run_id=azure_$(Build.BuildNumber).$(System.JobAttempt) + export remote_url=$(Build.Repository.Uri) + export sha=$(Build.SourceVersion) export OSX_FORCE_SDK_DOWNLOAD="1" export GIT_BRANCH=$BUILD_SOURCEBRANCHNAME export FEEDSTOCK_NAME=$(basename ${BUILD_REPOSITORY_NAME}) diff --git a/.azure-pipelines/azure-pipelines-win.yml b/.azure-pipelines/azure-pipelines-win.yml index 7f5ab156..9f5a7811 100755 --- a/.azure-pipelines/azure-pipelines-win.yml +++ b/.azure-pipelines/azure-pipelines-win.yml @@ -8,30 +8,31 @@ jobs: vmImage: windows-2022 strategy: matrix: - win_64_numpy1.21python3.10.____cpython: - CONFIG: win_64_numpy1.21python3.10.____cpython + win_64_numpy1.22python3.10.____cpython: + CONFIG: win_64_numpy1.22python3.10.____cpython UPLOAD_PACKAGES: 'True' - win_64_numpy1.21python3.8.____73_pypy: - CONFIG: win_64_numpy1.21python3.8.____73_pypy + win_64_numpy1.22python3.8.____cpython: + CONFIG: win_64_numpy1.22python3.8.____cpython UPLOAD_PACKAGES: 'True' - win_64_numpy1.21python3.8.____cpython: - CONFIG: win_64_numpy1.21python3.8.____cpython + win_64_numpy1.22python3.9.____73_pypy: + CONFIG: win_64_numpy1.22python3.9.____73_pypy UPLOAD_PACKAGES: 'True' - win_64_numpy1.21python3.9.____73_pypy: - CONFIG: win_64_numpy1.21python3.9.____73_pypy - UPLOAD_PACKAGES: 'True' - win_64_numpy1.21python3.9.____cpython: - CONFIG: win_64_numpy1.21python3.9.____cpython + win_64_numpy1.22python3.9.____cpython: + CONFIG: win_64_numpy1.22python3.9.____cpython UPLOAD_PACKAGES: 'True' win_64_numpy1.23python3.11.____cpython: CONFIG: win_64_numpy1.23python3.11.____cpython UPLOAD_PACKAGES: 'True' + win_64_numpy1.26python3.12.____cpython: + CONFIG: win_64_numpy1.26python3.12.____cpython + UPLOAD_PACKAGES: 'True' timeoutInMinutes: 360 variables: CONDA_BLD_PATH: D:\\bld\\ UPLOAD_TEMP: D:\\tmp steps: + - task: PythonScript@0 displayName: 'Download Miniforge' inputs: @@ -50,55 +51,17 @@ jobs: displayName: Add conda to PATH - script: | - call activate base - mamba.exe install "python=3.10" conda-build conda pip boa conda-forge-ci-setup=3 -c conda-forge --strict-channel-priority --yes - displayName: Install conda-build - - - script: set PYTHONUNBUFFERED=1 - displayName: Set PYTHONUNBUFFERED - - # Configure the VM - - script: | - call activate base - setup_conda_rc .\ ".\recipe" .\.ci_support\%CONFIG%.yaml - displayName: conda-forge CI setup - - # Configure the VM. - - script: | - set "CI=azure" - call activate base - run_conda_forge_build_setup - displayName: conda-forge build setup - - - script: | - call activate base - if EXIST LICENSE.txt ( - copy LICENSE.txt "recipe\\recipe-scripts-license.txt" - ) - if NOT [%HOST_PLATFORM%] == [%BUILD_PLATFORM%] ( - set "EXTRA_CB_OPTIONS=%EXTRA_CB_OPTIONS% --no-test" - ) - conda.exe mambabuild "recipe" -m .ci_support\%CONFIG%.yaml --suppress-variables %EXTRA_CB_OPTIONS% - displayName: Build recipe + call ".scripts\run_win_build.bat" + displayName: Run Windows build env: PYTHONUNBUFFERED: 1 - - script: | - set "FEEDSTOCK_NAME=%BUILD_REPOSITORY_NAME:*/=%" - call activate base - validate_recipe_outputs "%FEEDSTOCK_NAME%" - displayName: Validate Recipe Outputs - - - script: | - set "GIT_BRANCH=%BUILD_SOURCEBRANCHNAME%" - set "FEEDSTOCK_NAME=%BUILD_REPOSITORY_NAME:*/=%" - set "TEMP=$(UPLOAD_TEMP)" - if not exist "%TEMP%\" md "%TEMP%" - set "TMP=%TEMP%" - call activate base - upload_package --validate --feedstock-name="%FEEDSTOCK_NAME%" .\ ".\recipe" .ci_support\%CONFIG%.yaml - displayName: Upload package - env: + CONFIG: $(CONFIG) + CI: azure + flow_run_id: azure_$(Build.BuildNumber).$(System.JobAttempt) + remote_url: $(Build.Repository.Uri) + sha: $(Build.SourceVersion) + UPLOAD_PACKAGES: $(UPLOAD_PACKAGES) + UPLOAD_TEMP: $(UPLOAD_TEMP) BINSTAR_TOKEN: $(BINSTAR_TOKEN) FEEDSTOCK_TOKEN: $(FEEDSTOCK_TOKEN) - STAGING_BINSTAR_TOKEN: $(STAGING_BINSTAR_TOKEN) - condition: and(succeeded(), not(eq(variables['UPLOAD_PACKAGES'], 'False')), not(eq(variables['Build.Reason'], 'PullRequest'))) \ No newline at end of file + STAGING_BINSTAR_TOKEN: $(STAGING_BINSTAR_TOKEN) \ No newline at end of file diff --git a/.ci_support/linux_64_numpy1.21python3.8.____73_pypy.yaml b/.ci_support/linux_64_numpy1.21python3.8.____73_pypy.yaml deleted file mode 100644 index b541d9a6..00000000 --- a/.ci_support/linux_64_numpy1.21python3.8.____73_pypy.yaml +++ /dev/null @@ -1,40 +0,0 @@ -c_compiler: -- gcc -c_compiler_version: -- '12' -cdt_name: -- cos6 -channel_sources: -- conda-forge -channel_targets: -- conda-forge matplotlib_rc -cxx_compiler: -- gxx -cxx_compiler_version: -- '12' -docker_image: -- quay.io/condaforge/linux-anvil-cos7-x86_64 -freetype: -- '2' -numpy: -- '1.21' -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -python: -- 3.8.* *_73_pypy -python_impl: -- pypy -target_platform: -- linux-64 -tk: -- '8.6' -zip_keys: -- - c_compiler_version - - cxx_compiler_version -- - python - - numpy - - python_impl -zlib: -- '1.2' diff --git a/.ci_support/linux_64_numpy1.21python3.10.____cpython.yaml b/.ci_support/linux_64_numpy1.22python3.10.____cpython.yaml similarity index 96% rename from .ci_support/linux_64_numpy1.21python3.10.____cpython.yaml rename to .ci_support/linux_64_numpy1.22python3.10.____cpython.yaml index 79e954eb..711a1834 100644 --- a/.ci_support/linux_64_numpy1.21python3.10.____cpython.yaml +++ b/.ci_support/linux_64_numpy1.22python3.10.____cpython.yaml @@ -17,7 +17,7 @@ docker_image: freetype: - '2' numpy: -- '1.21' +- '1.22' pin_run_as_build: python: min_pin: x.x @@ -37,4 +37,4 @@ zip_keys: - numpy - python_impl zlib: -- '1.2' +- '1' diff --git a/.ci_support/linux_64_numpy1.21python3.8.____cpython.yaml b/.ci_support/linux_64_numpy1.22python3.8.____cpython.yaml similarity index 96% rename from .ci_support/linux_64_numpy1.21python3.8.____cpython.yaml rename to .ci_support/linux_64_numpy1.22python3.8.____cpython.yaml index 597557ab..84dab33d 100644 --- a/.ci_support/linux_64_numpy1.21python3.8.____cpython.yaml +++ b/.ci_support/linux_64_numpy1.22python3.8.____cpython.yaml @@ -17,7 +17,7 @@ docker_image: freetype: - '2' numpy: -- '1.21' +- '1.22' pin_run_as_build: python: min_pin: x.x @@ -37,4 +37,4 @@ zip_keys: - numpy - python_impl zlib: -- '1.2' +- '1' diff --git a/.ci_support/linux_64_numpy1.21python3.9.____73_pypy.yaml b/.ci_support/linux_64_numpy1.22python3.9.____73_pypy.yaml similarity index 96% rename from .ci_support/linux_64_numpy1.21python3.9.____73_pypy.yaml rename to .ci_support/linux_64_numpy1.22python3.9.____73_pypy.yaml index d7bb831c..7544eb38 100644 --- a/.ci_support/linux_64_numpy1.21python3.9.____73_pypy.yaml +++ b/.ci_support/linux_64_numpy1.22python3.9.____73_pypy.yaml @@ -17,7 +17,7 @@ docker_image: freetype: - '2' numpy: -- '1.21' +- '1.22' pin_run_as_build: python: min_pin: x.x @@ -37,4 +37,4 @@ zip_keys: - numpy - python_impl zlib: -- '1.2' +- '1' diff --git a/.ci_support/linux_64_numpy1.21python3.9.____cpython.yaml b/.ci_support/linux_64_numpy1.22python3.9.____cpython.yaml similarity index 96% rename from .ci_support/linux_64_numpy1.21python3.9.____cpython.yaml rename to .ci_support/linux_64_numpy1.22python3.9.____cpython.yaml index e8fe600d..daa126db 100644 --- a/.ci_support/linux_64_numpy1.21python3.9.____cpython.yaml +++ b/.ci_support/linux_64_numpy1.22python3.9.____cpython.yaml @@ -17,7 +17,7 @@ docker_image: freetype: - '2' numpy: -- '1.21' +- '1.22' pin_run_as_build: python: min_pin: x.x @@ -37,4 +37,4 @@ zip_keys: - numpy - python_impl zlib: -- '1.2' +- '1' diff --git a/.ci_support/linux_64_numpy1.23python3.11.____cpython.yaml b/.ci_support/linux_64_numpy1.23python3.11.____cpython.yaml index 918e96ea..f04f3e00 100644 --- a/.ci_support/linux_64_numpy1.23python3.11.____cpython.yaml +++ b/.ci_support/linux_64_numpy1.23python3.11.____cpython.yaml @@ -37,4 +37,4 @@ zip_keys: - numpy - python_impl zlib: -- '1.2' +- '1' diff --git a/.ci_support/linux_64_numpy1.26python3.12.____cpython.yaml b/.ci_support/linux_64_numpy1.26python3.12.____cpython.yaml new file mode 100644 index 00000000..924eec41 --- /dev/null +++ b/.ci_support/linux_64_numpy1.26python3.12.____cpython.yaml @@ -0,0 +1,40 @@ +c_compiler: +- gcc +c_compiler_version: +- '12' +cdt_name: +- cos6 +channel_sources: +- conda-forge +channel_targets: +- conda-forge matplotlib_rc +cxx_compiler: +- gxx +cxx_compiler_version: +- '12' +docker_image: +- quay.io/condaforge/linux-anvil-cos7-x86_64 +freetype: +- '2' +numpy: +- '1.26' +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +python: +- 3.12.* *_cpython +python_impl: +- cpython +target_platform: +- linux-64 +tk: +- '8.6' +zip_keys: +- - c_compiler_version + - cxx_compiler_version +- - python + - numpy + - python_impl +zlib: +- '1' diff --git a/.ci_support/linux_aarch64_numpy1.21python3.8.____73_pypy.yaml b/.ci_support/linux_aarch64_numpy1.21python3.8.____73_pypy.yaml deleted file mode 100644 index 9f217c11..00000000 --- a/.ci_support/linux_aarch64_numpy1.21python3.8.____73_pypy.yaml +++ /dev/null @@ -1,44 +0,0 @@ -BUILD: -- aarch64-conda_cos7-linux-gnu -c_compiler: -- gcc -c_compiler_version: -- '12' -cdt_arch: -- aarch64 -cdt_name: -- cos7 -channel_sources: -- conda-forge -channel_targets: -- conda-forge matplotlib_rc -cxx_compiler: -- gxx -cxx_compiler_version: -- '12' -docker_image: -- quay.io/condaforge/linux-anvil-cos7-x86_64 -freetype: -- '2' -numpy: -- '1.21' -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -python: -- 3.8.* *_73_pypy -python_impl: -- pypy -target_platform: -- linux-aarch64 -tk: -- '8.6' -zip_keys: -- - c_compiler_version - - cxx_compiler_version -- - python - - numpy - - python_impl -zlib: -- '1.2' diff --git a/.ci_support/linux_aarch64_numpy1.21python3.10.____cpython.yaml b/.ci_support/linux_aarch64_numpy1.22python3.10.____cpython.yaml similarity index 97% rename from .ci_support/linux_aarch64_numpy1.21python3.10.____cpython.yaml rename to .ci_support/linux_aarch64_numpy1.22python3.10.____cpython.yaml index b5881ca1..0d7d0fcb 100644 --- a/.ci_support/linux_aarch64_numpy1.21python3.10.____cpython.yaml +++ b/.ci_support/linux_aarch64_numpy1.22python3.10.____cpython.yaml @@ -21,7 +21,7 @@ docker_image: freetype: - '2' numpy: -- '1.21' +- '1.22' pin_run_as_build: python: min_pin: x.x @@ -41,4 +41,4 @@ zip_keys: - numpy - python_impl zlib: -- '1.2' +- '1' diff --git a/.ci_support/linux_aarch64_numpy1.21python3.8.____cpython.yaml b/.ci_support/linux_aarch64_numpy1.22python3.8.____cpython.yaml similarity index 97% rename from .ci_support/linux_aarch64_numpy1.21python3.8.____cpython.yaml rename to .ci_support/linux_aarch64_numpy1.22python3.8.____cpython.yaml index 07edc4c2..739a3343 100644 --- a/.ci_support/linux_aarch64_numpy1.21python3.8.____cpython.yaml +++ b/.ci_support/linux_aarch64_numpy1.22python3.8.____cpython.yaml @@ -21,7 +21,7 @@ docker_image: freetype: - '2' numpy: -- '1.21' +- '1.22' pin_run_as_build: python: min_pin: x.x @@ -41,4 +41,4 @@ zip_keys: - numpy - python_impl zlib: -- '1.2' +- '1' diff --git a/.ci_support/linux_aarch64_numpy1.21python3.9.____73_pypy.yaml b/.ci_support/linux_aarch64_numpy1.22python3.9.____73_pypy.yaml similarity index 97% rename from .ci_support/linux_aarch64_numpy1.21python3.9.____73_pypy.yaml rename to .ci_support/linux_aarch64_numpy1.22python3.9.____73_pypy.yaml index 19862c32..68b93569 100644 --- a/.ci_support/linux_aarch64_numpy1.21python3.9.____73_pypy.yaml +++ b/.ci_support/linux_aarch64_numpy1.22python3.9.____73_pypy.yaml @@ -21,7 +21,7 @@ docker_image: freetype: - '2' numpy: -- '1.21' +- '1.22' pin_run_as_build: python: min_pin: x.x @@ -41,4 +41,4 @@ zip_keys: - numpy - python_impl zlib: -- '1.2' +- '1' diff --git a/.ci_support/linux_aarch64_numpy1.21python3.9.____cpython.yaml b/.ci_support/linux_aarch64_numpy1.22python3.9.____cpython.yaml similarity index 97% rename from .ci_support/linux_aarch64_numpy1.21python3.9.____cpython.yaml rename to .ci_support/linux_aarch64_numpy1.22python3.9.____cpython.yaml index 47c1c822..63c4b20c 100644 --- a/.ci_support/linux_aarch64_numpy1.21python3.9.____cpython.yaml +++ b/.ci_support/linux_aarch64_numpy1.22python3.9.____cpython.yaml @@ -21,7 +21,7 @@ docker_image: freetype: - '2' numpy: -- '1.21' +- '1.22' pin_run_as_build: python: min_pin: x.x @@ -41,4 +41,4 @@ zip_keys: - numpy - python_impl zlib: -- '1.2' +- '1' diff --git a/.ci_support/linux_aarch64_numpy1.23python3.11.____cpython.yaml b/.ci_support/linux_aarch64_numpy1.23python3.11.____cpython.yaml index 48aac766..c9efd406 100644 --- a/.ci_support/linux_aarch64_numpy1.23python3.11.____cpython.yaml +++ b/.ci_support/linux_aarch64_numpy1.23python3.11.____cpython.yaml @@ -41,4 +41,4 @@ zip_keys: - numpy - python_impl zlib: -- '1.2' +- '1' diff --git a/.ci_support/linux_aarch64_numpy1.26python3.12.____cpython.yaml b/.ci_support/linux_aarch64_numpy1.26python3.12.____cpython.yaml new file mode 100644 index 00000000..23a02890 --- /dev/null +++ b/.ci_support/linux_aarch64_numpy1.26python3.12.____cpython.yaml @@ -0,0 +1,44 @@ +BUILD: +- aarch64-conda_cos7-linux-gnu +c_compiler: +- gcc +c_compiler_version: +- '12' +cdt_arch: +- aarch64 +cdt_name: +- cos7 +channel_sources: +- conda-forge +channel_targets: +- conda-forge matplotlib_rc +cxx_compiler: +- gxx +cxx_compiler_version: +- '12' +docker_image: +- quay.io/condaforge/linux-anvil-cos7-x86_64 +freetype: +- '2' +numpy: +- '1.26' +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +python: +- 3.12.* *_cpython +python_impl: +- cpython +target_platform: +- linux-aarch64 +tk: +- '8.6' +zip_keys: +- - c_compiler_version + - cxx_compiler_version +- - python + - numpy + - python_impl +zlib: +- '1' diff --git a/.ci_support/linux_ppc64le_numpy1.21python3.8.____73_pypy.yaml b/.ci_support/linux_ppc64le_numpy1.21python3.8.____73_pypy.yaml deleted file mode 100644 index 06fc0016..00000000 --- a/.ci_support/linux_ppc64le_numpy1.21python3.8.____73_pypy.yaml +++ /dev/null @@ -1,38 +0,0 @@ -c_compiler: -- gcc -c_compiler_version: -- '12' -cdt_name: -- cos7 -channel_sources: -- conda-forge -channel_targets: -- conda-forge matplotlib_rc -cxx_compiler: -- gxx -cxx_compiler_version: -- '12' -docker_image: -- quay.io/condaforge/linux-anvil-cos7-x86_64 -freetype: -- '2' -numpy: -- '1.21' -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -python: -- 3.8.* *_73_pypy -python_impl: -- pypy -target_platform: -- linux-ppc64le -zip_keys: -- - c_compiler_version - - cxx_compiler_version -- - python - - numpy - - python_impl -zlib: -- '1.2' diff --git a/.ci_support/linux_ppc64le_numpy1.21python3.10.____cpython.yaml b/.ci_support/linux_ppc64le_numpy1.22python3.10.____cpython.yaml similarity index 96% rename from .ci_support/linux_ppc64le_numpy1.21python3.10.____cpython.yaml rename to .ci_support/linux_ppc64le_numpy1.22python3.10.____cpython.yaml index 61235591..ae29958b 100644 --- a/.ci_support/linux_ppc64le_numpy1.21python3.10.____cpython.yaml +++ b/.ci_support/linux_ppc64le_numpy1.22python3.10.____cpython.yaml @@ -17,7 +17,7 @@ docker_image: freetype: - '2' numpy: -- '1.21' +- '1.22' pin_run_as_build: python: min_pin: x.x @@ -35,4 +35,4 @@ zip_keys: - numpy - python_impl zlib: -- '1.2' +- '1' diff --git a/.ci_support/linux_ppc64le_numpy1.21python3.8.____cpython.yaml b/.ci_support/linux_ppc64le_numpy1.22python3.8.____cpython.yaml similarity index 96% rename from .ci_support/linux_ppc64le_numpy1.21python3.8.____cpython.yaml rename to .ci_support/linux_ppc64le_numpy1.22python3.8.____cpython.yaml index 89ac1234..7afc4d88 100644 --- a/.ci_support/linux_ppc64le_numpy1.21python3.8.____cpython.yaml +++ b/.ci_support/linux_ppc64le_numpy1.22python3.8.____cpython.yaml @@ -17,7 +17,7 @@ docker_image: freetype: - '2' numpy: -- '1.21' +- '1.22' pin_run_as_build: python: min_pin: x.x @@ -35,4 +35,4 @@ zip_keys: - numpy - python_impl zlib: -- '1.2' +- '1' diff --git a/.ci_support/linux_ppc64le_numpy1.21python3.9.____73_pypy.yaml b/.ci_support/linux_ppc64le_numpy1.22python3.9.____73_pypy.yaml similarity index 96% rename from .ci_support/linux_ppc64le_numpy1.21python3.9.____73_pypy.yaml rename to .ci_support/linux_ppc64le_numpy1.22python3.9.____73_pypy.yaml index 22f3aa7b..a666e430 100644 --- a/.ci_support/linux_ppc64le_numpy1.21python3.9.____73_pypy.yaml +++ b/.ci_support/linux_ppc64le_numpy1.22python3.9.____73_pypy.yaml @@ -17,7 +17,7 @@ docker_image: freetype: - '2' numpy: -- '1.21' +- '1.22' pin_run_as_build: python: min_pin: x.x @@ -35,4 +35,4 @@ zip_keys: - numpy - python_impl zlib: -- '1.2' +- '1' diff --git a/.ci_support/linux_ppc64le_numpy1.21python3.9.____cpython.yaml b/.ci_support/linux_ppc64le_numpy1.22python3.9.____cpython.yaml similarity index 96% rename from .ci_support/linux_ppc64le_numpy1.21python3.9.____cpython.yaml rename to .ci_support/linux_ppc64le_numpy1.22python3.9.____cpython.yaml index 295f54ec..4b8bcfcb 100644 --- a/.ci_support/linux_ppc64le_numpy1.21python3.9.____cpython.yaml +++ b/.ci_support/linux_ppc64le_numpy1.22python3.9.____cpython.yaml @@ -17,7 +17,7 @@ docker_image: freetype: - '2' numpy: -- '1.21' +- '1.22' pin_run_as_build: python: min_pin: x.x @@ -35,4 +35,4 @@ zip_keys: - numpy - python_impl zlib: -- '1.2' +- '1' diff --git a/.ci_support/linux_ppc64le_numpy1.23python3.11.____cpython.yaml b/.ci_support/linux_ppc64le_numpy1.23python3.11.____cpython.yaml index bb4e5c7c..31751566 100644 --- a/.ci_support/linux_ppc64le_numpy1.23python3.11.____cpython.yaml +++ b/.ci_support/linux_ppc64le_numpy1.23python3.11.____cpython.yaml @@ -35,4 +35,4 @@ zip_keys: - numpy - python_impl zlib: -- '1.2' +- '1' diff --git a/.ci_support/linux_ppc64le_numpy1.26python3.12.____cpython.yaml b/.ci_support/linux_ppc64le_numpy1.26python3.12.____cpython.yaml new file mode 100644 index 00000000..7a563726 --- /dev/null +++ b/.ci_support/linux_ppc64le_numpy1.26python3.12.____cpython.yaml @@ -0,0 +1,38 @@ +c_compiler: +- gcc +c_compiler_version: +- '12' +cdt_name: +- cos7 +channel_sources: +- conda-forge +channel_targets: +- conda-forge matplotlib_rc +cxx_compiler: +- gxx +cxx_compiler_version: +- '12' +docker_image: +- quay.io/condaforge/linux-anvil-cos7-x86_64 +freetype: +- '2' +numpy: +- '1.26' +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +python: +- 3.12.* *_cpython +python_impl: +- cpython +target_platform: +- linux-ppc64le +zip_keys: +- - c_compiler_version + - cxx_compiler_version +- - python + - numpy + - python_impl +zlib: +- '1' diff --git a/.ci_support/migrations/python311.yaml b/.ci_support/migrations/python311.yaml deleted file mode 100644 index d23a0fd2..00000000 --- a/.ci_support/migrations/python311.yaml +++ /dev/null @@ -1,37 +0,0 @@ -migrator_ts: 1666686085 -__migrator: - migration_number: 1 - operation: key_add - primary_key: python - ordering: - python: - - 3.6.* *_cpython - - 3.7.* *_cpython - - 3.8.* *_cpython - - 3.9.* *_cpython - - 3.10.* *_cpython - - 3.11.* *_cpython # new entry - - 3.6.* *_73_pypy - - 3.7.* *_73_pypy - - 3.8.* *_73_pypy - - 3.9.* *_73_pypy - paused: false - longterm: True - pr_limit: 10 - max_solver_attempts: 10 # this will make the bot retry "not solvable" stuff 10 times - exclude: - # this shouldn't attempt to modify the python feedstocks - - python - - pypy3.6 - - pypy-meta - - cross-python - - python_abi - exclude_pinned_pkgs: false - -python: - - 3.11.* *_cpython -# additional entries to add for zip_keys -numpy: - - 1.23 -python_impl: - - cpython diff --git a/.ci_support/osx_64_numpy1.21python3.8.____73_pypy.yaml b/.ci_support/osx_64_numpy1.21python3.8.____73_pypy.yaml deleted file mode 100644 index fb93d678..00000000 --- a/.ci_support/osx_64_numpy1.21python3.8.____73_pypy.yaml +++ /dev/null @@ -1,40 +0,0 @@ -MACOSX_DEPLOYMENT_TARGET: -- '10.12' -MACOSX_SDK_VERSION: -- '10.12' -c_compiler: -- clang -c_compiler_version: -- '15' -channel_sources: -- conda-forge -channel_targets: -- conda-forge matplotlib_rc -cxx_compiler: -- clangxx -cxx_compiler_version: -- '15' -freetype: -- '2' -macos_machine: -- x86_64-apple-darwin13.4.0 -numpy: -- '1.21' -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -python: -- 3.8.* *_73_pypy -python_impl: -- pypy -target_platform: -- osx-64 -zip_keys: -- - c_compiler_version - - cxx_compiler_version -- - python - - numpy - - python_impl -zlib: -- '1.2' diff --git a/.ci_support/osx_64_numpy1.21python3.10.____cpython.yaml b/.ci_support/osx_64_numpy1.22python3.10.____cpython.yaml similarity index 90% rename from .ci_support/osx_64_numpy1.21python3.10.____cpython.yaml rename to .ci_support/osx_64_numpy1.22python3.10.____cpython.yaml index 4ea79216..8118166e 100644 --- a/.ci_support/osx_64_numpy1.21python3.10.____cpython.yaml +++ b/.ci_support/osx_64_numpy1.22python3.10.____cpython.yaml @@ -1,11 +1,11 @@ MACOSX_DEPLOYMENT_TARGET: -- '10.12' +- '10.13' MACOSX_SDK_VERSION: -- '10.12' +- '10.13' c_compiler: - clang c_compiler_version: -- '15' +- '16' channel_sources: - conda-forge channel_targets: @@ -13,13 +13,13 @@ channel_targets: cxx_compiler: - clangxx cxx_compiler_version: -- '15' +- '16' freetype: - '2' macos_machine: - x86_64-apple-darwin13.4.0 numpy: -- '1.21' +- '1.22' pin_run_as_build: python: min_pin: x.x @@ -37,4 +37,4 @@ zip_keys: - numpy - python_impl zlib: -- '1.2' +- '1' diff --git a/.ci_support/osx_64_numpy1.21python3.8.____cpython.yaml b/.ci_support/osx_64_numpy1.22python3.8.____cpython.yaml similarity index 90% rename from .ci_support/osx_64_numpy1.21python3.8.____cpython.yaml rename to .ci_support/osx_64_numpy1.22python3.8.____cpython.yaml index c24278ca..02742abe 100644 --- a/.ci_support/osx_64_numpy1.21python3.8.____cpython.yaml +++ b/.ci_support/osx_64_numpy1.22python3.8.____cpython.yaml @@ -1,11 +1,11 @@ MACOSX_DEPLOYMENT_TARGET: -- '10.12' +- '10.13' MACOSX_SDK_VERSION: -- '10.12' +- '10.13' c_compiler: - clang c_compiler_version: -- '15' +- '16' channel_sources: - conda-forge channel_targets: @@ -13,13 +13,13 @@ channel_targets: cxx_compiler: - clangxx cxx_compiler_version: -- '15' +- '16' freetype: - '2' macos_machine: - x86_64-apple-darwin13.4.0 numpy: -- '1.21' +- '1.22' pin_run_as_build: python: min_pin: x.x @@ -37,4 +37,4 @@ zip_keys: - numpy - python_impl zlib: -- '1.2' +- '1' diff --git a/.ci_support/osx_64_numpy1.21python3.9.____73_pypy.yaml b/.ci_support/osx_64_numpy1.22python3.9.____73_pypy.yaml similarity index 90% rename from .ci_support/osx_64_numpy1.21python3.9.____73_pypy.yaml rename to .ci_support/osx_64_numpy1.22python3.9.____73_pypy.yaml index caa451f1..7f579c67 100644 --- a/.ci_support/osx_64_numpy1.21python3.9.____73_pypy.yaml +++ b/.ci_support/osx_64_numpy1.22python3.9.____73_pypy.yaml @@ -1,11 +1,11 @@ MACOSX_DEPLOYMENT_TARGET: -- '10.12' +- '10.13' MACOSX_SDK_VERSION: -- '10.12' +- '10.13' c_compiler: - clang c_compiler_version: -- '15' +- '16' channel_sources: - conda-forge channel_targets: @@ -13,13 +13,13 @@ channel_targets: cxx_compiler: - clangxx cxx_compiler_version: -- '15' +- '16' freetype: - '2' macos_machine: - x86_64-apple-darwin13.4.0 numpy: -- '1.21' +- '1.22' pin_run_as_build: python: min_pin: x.x @@ -37,4 +37,4 @@ zip_keys: - numpy - python_impl zlib: -- '1.2' +- '1' diff --git a/.ci_support/osx_64_numpy1.21python3.9.____cpython.yaml b/.ci_support/osx_64_numpy1.22python3.9.____cpython.yaml similarity index 90% rename from .ci_support/osx_64_numpy1.21python3.9.____cpython.yaml rename to .ci_support/osx_64_numpy1.22python3.9.____cpython.yaml index 343432f7..3e6a5c3b 100644 --- a/.ci_support/osx_64_numpy1.21python3.9.____cpython.yaml +++ b/.ci_support/osx_64_numpy1.22python3.9.____cpython.yaml @@ -1,11 +1,11 @@ MACOSX_DEPLOYMENT_TARGET: -- '10.12' +- '10.13' MACOSX_SDK_VERSION: -- '10.12' +- '10.13' c_compiler: - clang c_compiler_version: -- '15' +- '16' channel_sources: - conda-forge channel_targets: @@ -13,13 +13,13 @@ channel_targets: cxx_compiler: - clangxx cxx_compiler_version: -- '15' +- '16' freetype: - '2' macos_machine: - x86_64-apple-darwin13.4.0 numpy: -- '1.21' +- '1.22' pin_run_as_build: python: min_pin: x.x @@ -37,4 +37,4 @@ zip_keys: - numpy - python_impl zlib: -- '1.2' +- '1' diff --git a/.ci_support/osx_64_numpy1.23python3.11.____cpython.yaml b/.ci_support/osx_64_numpy1.23python3.11.____cpython.yaml index 1e07c6dc..00d79245 100644 --- a/.ci_support/osx_64_numpy1.23python3.11.____cpython.yaml +++ b/.ci_support/osx_64_numpy1.23python3.11.____cpython.yaml @@ -1,11 +1,11 @@ MACOSX_DEPLOYMENT_TARGET: -- '10.12' +- '10.13' MACOSX_SDK_VERSION: -- '10.12' +- '10.13' c_compiler: - clang c_compiler_version: -- '15' +- '16' channel_sources: - conda-forge channel_targets: @@ -13,7 +13,7 @@ channel_targets: cxx_compiler: - clangxx cxx_compiler_version: -- '15' +- '16' freetype: - '2' macos_machine: @@ -37,4 +37,4 @@ zip_keys: - numpy - python_impl zlib: -- '1.2' +- '1' diff --git a/.ci_support/osx_64_numpy1.26python3.12.____cpython.yaml b/.ci_support/osx_64_numpy1.26python3.12.____cpython.yaml new file mode 100644 index 00000000..91e80545 --- /dev/null +++ b/.ci_support/osx_64_numpy1.26python3.12.____cpython.yaml @@ -0,0 +1,40 @@ +MACOSX_DEPLOYMENT_TARGET: +- '10.13' +MACOSX_SDK_VERSION: +- '10.13' +c_compiler: +- clang +c_compiler_version: +- '16' +channel_sources: +- conda-forge +channel_targets: +- conda-forge matplotlib_rc +cxx_compiler: +- clangxx +cxx_compiler_version: +- '16' +freetype: +- '2' +macos_machine: +- x86_64-apple-darwin13.4.0 +numpy: +- '1.26' +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +python: +- 3.12.* *_cpython +python_impl: +- cpython +target_platform: +- osx-64 +zip_keys: +- - c_compiler_version + - cxx_compiler_version +- - python + - numpy + - python_impl +zlib: +- '1' diff --git a/.ci_support/osx_arm64_numpy1.21python3.10.____cpython.yaml b/.ci_support/osx_arm64_numpy1.22python3.10.____cpython.yaml similarity index 89% rename from .ci_support/osx_arm64_numpy1.21python3.10.____cpython.yaml rename to .ci_support/osx_arm64_numpy1.22python3.10.____cpython.yaml index 0ea2a16e..b74ac1b7 100644 --- a/.ci_support/osx_arm64_numpy1.21python3.10.____cpython.yaml +++ b/.ci_support/osx_arm64_numpy1.22python3.10.____cpython.yaml @@ -1,9 +1,11 @@ MACOSX_DEPLOYMENT_TARGET: - '11.0' +MACOSX_SDK_VERSION: +- '11.0' c_compiler: - clang c_compiler_version: -- '15' +- '16' channel_sources: - conda-forge channel_targets: @@ -11,13 +13,13 @@ channel_targets: cxx_compiler: - clangxx cxx_compiler_version: -- '15' +- '16' freetype: - '2' macos_machine: - arm64-apple-darwin20.0.0 numpy: -- '1.21' +- '1.22' pin_run_as_build: python: min_pin: x.x @@ -35,4 +37,4 @@ zip_keys: - numpy - python_impl zlib: -- '1.2' +- '1' diff --git a/.ci_support/osx_arm64_numpy1.21python3.8.____cpython.yaml b/.ci_support/osx_arm64_numpy1.22python3.8.____cpython.yaml similarity index 89% rename from .ci_support/osx_arm64_numpy1.21python3.8.____cpython.yaml rename to .ci_support/osx_arm64_numpy1.22python3.8.____cpython.yaml index 90d92057..a4786603 100644 --- a/.ci_support/osx_arm64_numpy1.21python3.8.____cpython.yaml +++ b/.ci_support/osx_arm64_numpy1.22python3.8.____cpython.yaml @@ -1,9 +1,11 @@ MACOSX_DEPLOYMENT_TARGET: - '11.0' +MACOSX_SDK_VERSION: +- '11.0' c_compiler: - clang c_compiler_version: -- '15' +- '16' channel_sources: - conda-forge channel_targets: @@ -11,13 +13,13 @@ channel_targets: cxx_compiler: - clangxx cxx_compiler_version: -- '15' +- '16' freetype: - '2' macos_machine: - arm64-apple-darwin20.0.0 numpy: -- '1.21' +- '1.22' pin_run_as_build: python: min_pin: x.x @@ -35,4 +37,4 @@ zip_keys: - numpy - python_impl zlib: -- '1.2' +- '1' diff --git a/.ci_support/osx_arm64_numpy1.21python3.9.____cpython.yaml b/.ci_support/osx_arm64_numpy1.22python3.9.____cpython.yaml similarity index 89% rename from .ci_support/osx_arm64_numpy1.21python3.9.____cpython.yaml rename to .ci_support/osx_arm64_numpy1.22python3.9.____cpython.yaml index f65aaa70..afc04ccf 100644 --- a/.ci_support/osx_arm64_numpy1.21python3.9.____cpython.yaml +++ b/.ci_support/osx_arm64_numpy1.22python3.9.____cpython.yaml @@ -1,9 +1,11 @@ MACOSX_DEPLOYMENT_TARGET: - '11.0' +MACOSX_SDK_VERSION: +- '11.0' c_compiler: - clang c_compiler_version: -- '15' +- '16' channel_sources: - conda-forge channel_targets: @@ -11,13 +13,13 @@ channel_targets: cxx_compiler: - clangxx cxx_compiler_version: -- '15' +- '16' freetype: - '2' macos_machine: - arm64-apple-darwin20.0.0 numpy: -- '1.21' +- '1.22' pin_run_as_build: python: min_pin: x.x @@ -35,4 +37,4 @@ zip_keys: - numpy - python_impl zlib: -- '1.2' +- '1' diff --git a/.ci_support/osx_arm64_numpy1.23python3.11.____cpython.yaml b/.ci_support/osx_arm64_numpy1.23python3.11.____cpython.yaml index c28d327f..36388ae7 100644 --- a/.ci_support/osx_arm64_numpy1.23python3.11.____cpython.yaml +++ b/.ci_support/osx_arm64_numpy1.23python3.11.____cpython.yaml @@ -1,9 +1,11 @@ MACOSX_DEPLOYMENT_TARGET: - '11.0' +MACOSX_SDK_VERSION: +- '11.0' c_compiler: - clang c_compiler_version: -- '15' +- '16' channel_sources: - conda-forge channel_targets: @@ -11,7 +13,7 @@ channel_targets: cxx_compiler: - clangxx cxx_compiler_version: -- '15' +- '16' freetype: - '2' macos_machine: @@ -35,4 +37,4 @@ zip_keys: - numpy - python_impl zlib: -- '1.2' +- '1' diff --git a/.ci_support/osx_arm64_numpy1.26python3.12.____cpython.yaml b/.ci_support/osx_arm64_numpy1.26python3.12.____cpython.yaml new file mode 100644 index 00000000..5f045123 --- /dev/null +++ b/.ci_support/osx_arm64_numpy1.26python3.12.____cpython.yaml @@ -0,0 +1,40 @@ +MACOSX_DEPLOYMENT_TARGET: +- '11.0' +MACOSX_SDK_VERSION: +- '11.0' +c_compiler: +- clang +c_compiler_version: +- '16' +channel_sources: +- conda-forge +channel_targets: +- conda-forge matplotlib_rc +cxx_compiler: +- clangxx +cxx_compiler_version: +- '16' +freetype: +- '2' +macos_machine: +- arm64-apple-darwin20.0.0 +numpy: +- '1.26' +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +python: +- 3.12.* *_cpython +python_impl: +- cpython +target_platform: +- osx-arm64 +zip_keys: +- - c_compiler_version + - cxx_compiler_version +- - python + - numpy + - python_impl +zlib: +- '1' diff --git a/.ci_support/win_64_numpy1.21python3.10.____cpython.yaml b/.ci_support/win_64_numpy1.22python3.10.____cpython.yaml similarity index 95% rename from .ci_support/win_64_numpy1.21python3.10.____cpython.yaml rename to .ci_support/win_64_numpy1.22python3.10.____cpython.yaml index d0c2292c..203091da 100644 --- a/.ci_support/win_64_numpy1.21python3.10.____cpython.yaml +++ b/.ci_support/win_64_numpy1.22python3.10.____cpython.yaml @@ -9,7 +9,7 @@ cxx_compiler: freetype: - '2' numpy: -- '1.21' +- '1.22' pin_run_as_build: python: min_pin: x.x @@ -25,4 +25,4 @@ zip_keys: - numpy - python_impl zlib: -- '1.2' +- '1' diff --git a/.ci_support/win_64_numpy1.21python3.8.____cpython.yaml b/.ci_support/win_64_numpy1.22python3.8.____cpython.yaml similarity index 95% rename from .ci_support/win_64_numpy1.21python3.8.____cpython.yaml rename to .ci_support/win_64_numpy1.22python3.8.____cpython.yaml index 45b7e8f4..956ca2d7 100644 --- a/.ci_support/win_64_numpy1.21python3.8.____cpython.yaml +++ b/.ci_support/win_64_numpy1.22python3.8.____cpython.yaml @@ -9,7 +9,7 @@ cxx_compiler: freetype: - '2' numpy: -- '1.21' +- '1.22' pin_run_as_build: python: min_pin: x.x @@ -25,4 +25,4 @@ zip_keys: - numpy - python_impl zlib: -- '1.2' +- '1' diff --git a/.ci_support/win_64_numpy1.21python3.9.____73_pypy.yaml b/.ci_support/win_64_numpy1.22python3.9.____73_pypy.yaml similarity index 95% rename from .ci_support/win_64_numpy1.21python3.9.____73_pypy.yaml rename to .ci_support/win_64_numpy1.22python3.9.____73_pypy.yaml index 14d84d27..40c86ac4 100644 --- a/.ci_support/win_64_numpy1.21python3.9.____73_pypy.yaml +++ b/.ci_support/win_64_numpy1.22python3.9.____73_pypy.yaml @@ -9,7 +9,7 @@ cxx_compiler: freetype: - '2' numpy: -- '1.21' +- '1.22' pin_run_as_build: python: min_pin: x.x @@ -25,4 +25,4 @@ zip_keys: - numpy - python_impl zlib: -- '1.2' +- '1' diff --git a/.ci_support/win_64_numpy1.21python3.9.____cpython.yaml b/.ci_support/win_64_numpy1.22python3.9.____cpython.yaml similarity index 95% rename from .ci_support/win_64_numpy1.21python3.9.____cpython.yaml rename to .ci_support/win_64_numpy1.22python3.9.____cpython.yaml index 72e65a6a..78b2c77e 100644 --- a/.ci_support/win_64_numpy1.21python3.9.____cpython.yaml +++ b/.ci_support/win_64_numpy1.22python3.9.____cpython.yaml @@ -9,7 +9,7 @@ cxx_compiler: freetype: - '2' numpy: -- '1.21' +- '1.22' pin_run_as_build: python: min_pin: x.x @@ -25,4 +25,4 @@ zip_keys: - numpy - python_impl zlib: -- '1.2' +- '1' diff --git a/.ci_support/win_64_numpy1.23python3.11.____cpython.yaml b/.ci_support/win_64_numpy1.23python3.11.____cpython.yaml index 22caa20a..76fe5467 100644 --- a/.ci_support/win_64_numpy1.23python3.11.____cpython.yaml +++ b/.ci_support/win_64_numpy1.23python3.11.____cpython.yaml @@ -25,4 +25,4 @@ zip_keys: - numpy - python_impl zlib: -- '1.2' +- '1' diff --git a/.ci_support/win_64_numpy1.21python3.8.____73_pypy.yaml b/.ci_support/win_64_numpy1.26python3.12.____cpython.yaml similarity index 87% rename from .ci_support/win_64_numpy1.21python3.8.____73_pypy.yaml rename to .ci_support/win_64_numpy1.26python3.12.____cpython.yaml index fedd13d1..d42aba05 100644 --- a/.ci_support/win_64_numpy1.21python3.8.____73_pypy.yaml +++ b/.ci_support/win_64_numpy1.26python3.12.____cpython.yaml @@ -9,15 +9,15 @@ cxx_compiler: freetype: - '2' numpy: -- '1.21' +- '1.26' pin_run_as_build: python: min_pin: x.x max_pin: x.x python: -- 3.8.* *_73_pypy +- 3.12.* *_cpython python_impl: -- pypy +- cpython target_platform: - win-64 zip_keys: @@ -25,4 +25,4 @@ zip_keys: - numpy - python_impl zlib: -- '1.2' +- '1' diff --git a/.gitattributes b/.gitattributes index 7f327638..18f114a1 100644 --- a/.gitattributes +++ b/.gitattributes @@ -20,8 +20,8 @@ bld.bat text eol=crlf .travis.yml linguist-generated=true .scripts/* linguist-generated=true .woodpecker.yml linguist-generated=true -LICENSE.txt linguist-generated=true -README.md linguist-generated=true +/LICENSE.txt linguist-generated=true +/README.md linguist-generated=true azure-pipelines.yml linguist-generated=true build-locally.py linguist-generated=true shippable.yml linguist-generated=true diff --git a/.gitignore b/.gitignore index c89ecb7d..179afe55 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,24 @@ -*.pyc +# User content belongs under recipe/. +# Feedstock configuration goes in `conda-forge.yml` +# Everything else is managed by the conda-smithy rerender process. +# Please do not modify + +# Ignore all files and folders in root +* +!/conda-forge.yml + +# Don't ignore any files/folders if the parent folder is 'un-ignored' +# This also avoids warnings when adding an already-checked file with an ignored parent. +!/**/ +# Don't ignore any files/folders recursively in the following folders +!/recipe/** +!/.ci_support/** -build_artifacts +# Since we ignore files/folders recursively, any folders inside +# build_artifacts gets ignored which trips some build systems. +# To avoid that we 'un-ignore' all files/folders recursively +# and only ignore the root build_artifacts folder. +!/build_artifacts/** +/build_artifacts + +*.pyc diff --git a/.scripts/build_steps.sh b/.scripts/build_steps.sh index 1682b66b..a147fa70 100755 --- a/.scripts/build_steps.sh +++ b/.scripts/build_steps.sh @@ -28,14 +28,15 @@ conda-build: pkgs_dirs: - ${FEEDSTOCK_ROOT}/build_artifacts/pkg_cache - /opt/conda/pkgs +solver: libmamba CONDARC +export CONDA_LIBMAMBA_SOLVER_NO_CHANNELS_FROM_INSTALLED=1 - -mamba install --update-specs --yes --quiet --channel conda-forge \ - conda-build pip boa conda-forge-ci-setup=3 -mamba update --update-specs --yes --quiet --channel conda-forge \ - conda-build pip boa conda-forge-ci-setup=3 +mamba install --update-specs --yes --quiet --channel conda-forge --strict-channel-priority \ + pip mamba conda-build conda-forge-ci-setup=4 "conda-build>=24.1" +mamba update --update-specs --yes --quiet --channel conda-forge --strict-channel-priority \ + pip mamba conda-build conda-forge-ci-setup=4 "conda-build>=24.1" # set up the condarc setup_conda_rc "${FEEDSTOCK_ROOT}" "${RECIPE_ROOT}" "${CONFIG_FILE}" @@ -75,9 +76,17 @@ if [[ "${BUILD_WITH_CONDA_DEBUG:-0}" == 1 ]]; then # Drop into an interactive shell /bin/bash else - conda mambabuild "${RECIPE_ROOT}" -m "${CI_SUPPORT}/${CONFIG}.yaml" \ + conda-build "${RECIPE_ROOT}" -m "${CI_SUPPORT}/${CONFIG}.yaml" \ --suppress-variables ${EXTRA_CB_OPTIONS:-} \ - --clobber-file "${CI_SUPPORT}/clobber_${CONFIG}.yaml" + --clobber-file "${CI_SUPPORT}/clobber_${CONFIG}.yaml" \ + --extra-meta flow_run_id="${flow_run_id:-}" remote_url="${remote_url:-}" sha="${sha:-}" + + ( startgroup "Inspecting artifacts" ) 2> /dev/null + + # inspect_artifacts was only added in conda-forge-ci-setup 4.6.0 + command -v inspect_artifacts >/dev/null 2>&1 && inspect_artifacts || echo "inspect_artifacts needs conda-forge-ci-setup >=4.6.0" + + ( endgroup "Inspecting artifacts" ) 2> /dev/null ( startgroup "Validating outputs" ) 2> /dev/null validate_recipe_outputs "${FEEDSTOCK_NAME}" diff --git a/.scripts/logging_utils.sh b/.scripts/logging_utils.sh index 57bc95c2..aff009f0 100644 --- a/.scripts/logging_utils.sh +++ b/.scripts/logging_utils.sh @@ -12,7 +12,7 @@ function startgroup { echo "##[group]$1";; travis ) echo "$1" - echo -en 'travis_fold:start:'"${1// /}"'\\r';; + echo -en 'travis_fold:start:'"${1// /}"'\r';; github_actions ) echo "::group::$1";; * ) @@ -28,7 +28,7 @@ function endgroup { azure ) echo "##[endgroup]";; travis ) - echo -en 'travis_fold:end:'"${1// /}"'\\r';; + echo -en 'travis_fold:end:'"${1// /}"'\r';; github_actions ) echo "::endgroup::";; esac diff --git a/.scripts/run_docker_build.sh b/.scripts/run_docker_build.sh index 92362398..00f377a8 100755 --- a/.scripts/run_docker_build.sh +++ b/.scripts/run_docker_build.sh @@ -21,6 +21,12 @@ if [ -z ${FEEDSTOCK_NAME} ]; then export FEEDSTOCK_NAME=$(basename ${FEEDSTOCK_ROOT}) fi +if [[ "${sha:-}" == "" ]]; then + pushd "${FEEDSTOCK_ROOT}" + sha=$(git rev-parse HEAD) + popd +fi + docker info # In order for the conda-build process in the container to write to the mounted @@ -91,6 +97,9 @@ docker run ${DOCKER_RUN_ARGS} \ -e CPU_COUNT \ -e BUILD_WITH_CONDA_DEBUG \ -e BUILD_OUTPUT_ID \ + -e flow_run_id \ + -e remote_url \ + -e sha \ -e BINSTAR_TOKEN \ -e FEEDSTOCK_TOKEN \ -e STAGING_BINSTAR_TOKEN \ diff --git a/.scripts/run_osx_build.sh b/.scripts/run_osx_build.sh index 3969edf3..ba0c8791 100755 --- a/.scripts/run_osx_build.sh +++ b/.scripts/run_osx_build.sh @@ -22,11 +22,13 @@ bash $MINIFORGE_FILE -b -p ${MINIFORGE_HOME} source ${MINIFORGE_HOME}/etc/profile.d/conda.sh conda activate base +export CONDA_SOLVER="libmamba" +export CONDA_LIBMAMBA_SOLVER_NO_CHANNELS_FROM_INSTALLED=1 -mamba install --update-specs --quiet --yes --channel conda-forge \ - conda-build pip boa conda-forge-ci-setup=3 -mamba update --update-specs --yes --quiet --channel conda-forge \ - conda-build pip boa conda-forge-ci-setup=3 +mamba install --update-specs --quiet --yes --channel conda-forge --strict-channel-priority \ + pip mamba conda-build conda-forge-ci-setup=4 "conda-build>=24.1" +mamba update --update-specs --yes --quiet --channel conda-forge --strict-channel-priority \ + pip mamba conda-build conda-forge-ci-setup=4 "conda-build>=24.1" @@ -45,6 +47,10 @@ else echo -e "\n\nNot mangling homebrew as we are not running in CI" fi +if [[ "${sha:-}" == "" ]]; then + sha=$(git rev-parse HEAD) +fi + echo -e "\n\nRunning the build setup script." source run_conda_forge_build_setup @@ -75,9 +81,17 @@ else EXTRA_CB_OPTIONS="${EXTRA_CB_OPTIONS:-} --no-test" fi - conda mambabuild ./recipe -m ./.ci_support/${CONFIG}.yaml \ + conda-build ./recipe -m ./.ci_support/${CONFIG}.yaml \ --suppress-variables ${EXTRA_CB_OPTIONS:-} \ - --clobber-file ./.ci_support/clobber_${CONFIG}.yaml + --clobber-file ./.ci_support/clobber_${CONFIG}.yaml \ + --extra-meta flow_run_id="$flow_run_id" remote_url="$remote_url" sha="$sha" + + ( startgroup "Inspecting artifacts" ) 2> /dev/null + + # inspect_artifacts was only added in conda-forge-ci-setup 4.6.0 + command -v inspect_artifacts >/dev/null 2>&1 && inspect_artifacts || echo "inspect_artifacts needs conda-forge-ci-setup >=4.6.0" + + ( endgroup "Inspecting artifacts" ) 2> /dev/null ( startgroup "Validating outputs" ) 2> /dev/null validate_recipe_outputs "${FEEDSTOCK_NAME}" diff --git a/.scripts/run_win_build.bat b/.scripts/run_win_build.bat new file mode 100755 index 00000000..65650bf2 --- /dev/null +++ b/.scripts/run_win_build.bat @@ -0,0 +1,130 @@ +:: PLEASE NOTE: This script has been automatically generated by conda-smithy. Any changes here +:: will be lost next time ``conda smithy rerender`` is run. If you would like to make permanent +:: changes to this script, consider a proposal to conda-smithy so that other feedstocks can also +:: benefit from the improvement. + +:: Note: we assume a Miniforge installation is available + +:: INPUTS (required environment variables) +:: CONFIG: name of the .ci_support/*.yaml file for this job +:: CI: azure, github_actions, or unset +:: UPLOAD_PACKAGES: true or false +:: UPLOAD_ON_BRANCH: true or false + +setlocal enableextensions enabledelayedexpansion + +call :start_group "Configuring conda" + +:: Activate the base conda environment +call activate base +:: Configure the solver +set "CONDA_SOLVER=libmamba" +if !errorlevel! neq 0 exit /b !errorlevel! +set "CONDA_LIBMAMBA_SOLVER_NO_CHANNELS_FROM_INSTALLED=1" + +:: Provision the necessary dependencies to build the recipe later +echo Installing dependencies +mamba.exe install "python=3.10" pip mamba conda-build conda-forge-ci-setup=4 "conda-build>=24.1" -c conda-forge --strict-channel-priority --yes +if !errorlevel! neq 0 exit /b !errorlevel! + +:: Set basic configuration +echo Setting up configuration +setup_conda_rc .\ ".\recipe" .\.ci_support\%CONFIG%.yaml +if !errorlevel! neq 0 exit /b !errorlevel! +echo Running build setup +CALL run_conda_forge_build_setup + + +if !errorlevel! neq 0 exit /b !errorlevel! + +if EXIST LICENSE.txt ( + echo Copying feedstock license + copy LICENSE.txt "recipe\\recipe-scripts-license.txt" +) +if NOT [%HOST_PLATFORM%] == [%BUILD_PLATFORM%] ( + if [%CROSSCOMPILING_EMULATOR%] == [] ( + set "EXTRA_CB_OPTIONS=%EXTRA_CB_OPTIONS% --no-test" + ) +) + +if NOT [%flow_run_id%] == [] ( + set "EXTRA_CB_OPTIONS=%EXTRA_CB_OPTIONS% --extra-meta flow_run_id=%flow_run_id% remote_url=%remote_url% sha=%sha%" +) + +call :end_group + +:: Build the recipe +echo Building recipe +conda-build.exe "recipe" -m .ci_support\%CONFIG%.yaml --suppress-variables %EXTRA_CB_OPTIONS% +if !errorlevel! neq 0 exit /b !errorlevel! + +call :start_group "Inspecting artifacts" +:: inspect_artifacts was only added in conda-forge-ci-setup 4.6.0 +WHERE inspect_artifacts >nul 2>nul && inspect_artifacts || echo "inspect_artifacts needs conda-forge-ci-setup >=4.6.0" +call :end_group + +:: Prepare some environment variables for the upload step +if /i "%CI%" == "github_actions" ( + set "FEEDSTOCK_NAME=%GITHUB_REPOSITORY:*/=%" + set "GIT_BRANCH=%GITHUB_REF:refs/heads/=%" + if /i "%GITHUB_EVENT_NAME%" == "pull_request" ( + set "IS_PR_BUILD=True" + ) else ( + set "IS_PR_BUILD=False" + ) + set "TEMP=%RUNNER_TEMP%" +) +if /i "%CI%" == "azure" ( + set "FEEDSTOCK_NAME=%BUILD_REPOSITORY_NAME:*/=%" + set "GIT_BRANCH=%BUILD_SOURCEBRANCHNAME%" + if /i "%BUILD_REASON%" == "PullRequest" ( + set "IS_PR_BUILD=True" + ) else ( + set "IS_PR_BUILD=False" + ) + set "TEMP=%UPLOAD_TEMP%" +) + +:: Validate +call :start_group "Validating outputs" +validate_recipe_outputs "%FEEDSTOCK_NAME%" +if !errorlevel! neq 0 exit /b !errorlevel! +call :end_group + +if /i "%UPLOAD_PACKAGES%" == "true" ( + if /i "%IS_PR_BUILD%" == "false" ( + call :start_group "Uploading packages" + if not exist "%TEMP%\" md "%TEMP%" + set "TMP=%TEMP%" + upload_package --validate --feedstock-name="%FEEDSTOCK_NAME%" .\ ".\recipe" .ci_support\%CONFIG%.yaml + if !errorlevel! neq 0 exit /b !errorlevel! + call :end_group + ) +) + +exit + +:: Logging subroutines + +:start_group +if /i "%CI%" == "github_actions" ( + echo ::group::%~1 + exit /b +) +if /i "%CI%" == "azure" ( + echo ##[group]%~1 + exit /b +) +echo %~1 +exit /b + +:end_group +if /i "%CI%" == "github_actions" ( + echo ::endgroup:: + exit /b +) +if /i "%CI%" == "azure" ( + echo ##[endgroup] + exit /b +) +exit /b \ No newline at end of file diff --git a/README.md b/README.md index 5517ad38..0c479bf7 100644 --- a/README.md +++ b/README.md @@ -38,38 +38,31 @@ Current build status
VariantStatus
linux_64_numpy1.22python3.10.____cpython - - variant - -
linux_64_numpy1.22python3.8.____cpython @@ -59,31 +52,31 @@ Current build status
linux_64_numpy1.22python3.9.____cpythonlinux_64_numpy2.0python3.10.____cpython - variant + variant
linux_64_numpy1.23python3.11.____cpythonlinux_64_numpy2.0python3.11.____cpython - variant + variant
linux_64_numpy1.26python3.12.____cpythonlinux_64_numpy2.0python3.12.____cpython - variant + variant
linux_aarch64_numpy1.22python3.10.____cpythonlinux_64_numpy2.0python3.9.____cpython - variant + variant
linux_aarch64_numpy1.22python3.9.____cpythonlinux_aarch64_numpy2.0python3.10.____cpython - variant + variant
linux_aarch64_numpy1.23python3.11.____cpythonlinux_aarch64_numpy2.0python3.11.____cpython - variant + variant
linux_aarch64_numpy1.26python3.12.____cpythonlinux_aarch64_numpy2.0python3.12.____cpython - variant + variant
linux_ppc64le_numpy1.22python3.10.____cpythonlinux_aarch64_numpy2.0python3.9.____cpython - variant + variant
linux_ppc64le_numpy1.22python3.9.____cpythonlinux_ppc64le_numpy2.0python3.10.____cpython - variant + variant
linux_ppc64le_numpy1.23python3.11.____cpythonlinux_ppc64le_numpy2.0python3.11.____cpython - variant + variant
linux_ppc64le_numpy1.26python3.12.____cpythonlinux_ppc64le_numpy2.0python3.12.____cpython - variant + variant
osx_64_numpy1.22python3.10.____cpythonlinux_ppc64le_numpy2.0python3.9.____cpython - variant + variant
osx_64_numpy1.22python3.9.____cpythonosx_64_numpy2.0python3.10.____cpython - variant + variant
osx_64_numpy1.23python3.11.____cpythonosx_64_numpy2.0python3.11.____cpython - variant + variant
osx_64_numpy1.26python3.12.____cpythonosx_64_numpy2.0python3.12.____cpython - variant + variant
osx_arm64_numpy1.22python3.10.____cpythonosx_64_numpy2.0python3.9.____cpython - variant + variant
osx_arm64_numpy1.22python3.9.____cpythonosx_arm64_numpy2.0python3.10.____cpython - variant + variant
osx_arm64_numpy1.23python3.11.____cpythonosx_arm64_numpy2.0python3.11.____cpython - variant + variant
osx_arm64_numpy1.26python3.12.____cpythonosx_arm64_numpy2.0python3.12.____cpython - variant + variant
win_64_numpy1.22python3.10.____cpythonosx_arm64_numpy2.0python3.9.____cpython - variant + variant
win_64_numpy1.22python3.9.____cpythonwin_64_numpy2.0python3.10.____cpython + + variant + +
win_64_numpy2.0python3.11.____cpython - variant + variant
win_64_numpy1.23python3.11.____cpythonwin_64_numpy2.0python3.12.____cpython - variant + variant
win_64_numpy1.26python3.12.____cpythonwin_64_numpy2.0python3.9.____cpython - variant + variant
- + - + - + - + - - - @@ -80,38 +73,38 @@ Current build status - + - + - + - + - + @@ -122,38 +115,38 @@ Current build status - + - + - + - + - + @@ -164,38 +157,38 @@ Current build status - + - + - + - + - + @@ -206,24 +199,31 @@ Current build status - + - + - + + + + @@ -234,38 +234,38 @@ Current build status - + - + - + - + - + @@ -275,6 +275,13 @@ Current build status variant + + +
VariantStatus
linux_64_numpy1.21python3.10.____cpythonlinux_64_numpy1.22python3.10.____cpython - variant + variant
linux_64_numpy1.21python3.8.____73_pypylinux_64_numpy1.22python3.8.____cpython - variant + variant
linux_64_numpy1.21python3.8.____cpythonlinux_64_numpy1.22python3.9.____73_pypy - variant + variant
linux_64_numpy1.21python3.9.____73_pypylinux_64_numpy1.22python3.9.____cpython - variant - -
linux_64_numpy1.21python3.9.____cpython - - variant + variant
linux_aarch64_numpy1.21python3.10.____cpythonlinux_64_numpy1.26python3.12.____cpython - variant + variant
linux_aarch64_numpy1.21python3.8.____73_pypylinux_aarch64_numpy1.22python3.10.____cpython - variant + variant
linux_aarch64_numpy1.21python3.8.____cpythonlinux_aarch64_numpy1.22python3.8.____cpython - variant + variant
linux_aarch64_numpy1.21python3.9.____73_pypylinux_aarch64_numpy1.22python3.9.____73_pypy - variant + variant
linux_aarch64_numpy1.21python3.9.____cpythonlinux_aarch64_numpy1.22python3.9.____cpython - variant + variant
linux_ppc64le_numpy1.21python3.10.____cpythonlinux_aarch64_numpy1.26python3.12.____cpython - variant + variant
linux_ppc64le_numpy1.21python3.8.____73_pypylinux_ppc64le_numpy1.22python3.10.____cpython - variant + variant
linux_ppc64le_numpy1.21python3.8.____cpythonlinux_ppc64le_numpy1.22python3.8.____cpython - variant + variant
linux_ppc64le_numpy1.21python3.9.____73_pypylinux_ppc64le_numpy1.22python3.9.____73_pypy - variant + variant
linux_ppc64le_numpy1.21python3.9.____cpythonlinux_ppc64le_numpy1.22python3.9.____cpython - variant + variant
osx_64_numpy1.21python3.10.____cpythonlinux_ppc64le_numpy1.26python3.12.____cpython - variant + variant
osx_64_numpy1.21python3.8.____73_pypyosx_64_numpy1.22python3.10.____cpython - variant + variant
osx_64_numpy1.21python3.8.____cpythonosx_64_numpy1.22python3.8.____cpython - variant + variant
osx_64_numpy1.21python3.9.____73_pypyosx_64_numpy1.22python3.9.____73_pypy - variant + variant
osx_64_numpy1.21python3.9.____cpythonosx_64_numpy1.22python3.9.____cpython - variant + variant
osx_arm64_numpy1.21python3.10.____cpythonosx_64_numpy1.26python3.12.____cpython - variant + variant
osx_arm64_numpy1.21python3.8.____cpythonosx_arm64_numpy1.22python3.10.____cpython - variant + variant
osx_arm64_numpy1.21python3.9.____cpythonosx_arm64_numpy1.22python3.8.____cpython - variant + variant + +
osx_arm64_numpy1.22python3.9.____cpython + + variant
win_64_numpy1.21python3.10.____cpythonosx_arm64_numpy1.26python3.12.____cpython - variant + variant
win_64_numpy1.21python3.8.____73_pypywin_64_numpy1.22python3.10.____cpython - variant + variant
win_64_numpy1.21python3.8.____cpythonwin_64_numpy1.22python3.8.____cpython - variant + variant
win_64_numpy1.21python3.9.____73_pypywin_64_numpy1.22python3.9.____73_pypy - variant + variant
win_64_numpy1.21python3.9.____cpythonwin_64_numpy1.22python3.9.____cpython - variant + variant
win_64_numpy1.26python3.12.____cpython + + variant + +
@@ -294,14 +301,14 @@ Current release info Installing matplotlib-suite =========================== -Installing `matplotlib-suite` from the `conda-forge` channel can be achieved by adding `conda-forge` to your channels with: +Installing `matplotlib-suite` from the `conda-forge/label/matplotlib_rc` channel can be achieved by adding `conda-forge/label/matplotlib_rc` to your channels with: ``` -conda config --add channels conda-forge +conda config --add channels conda-forge/label/matplotlib_rc conda config --set channel_priority strict ``` -Once the `conda-forge` channel has been enabled, `matplotlib, matplotlib-base` can be installed with `conda`: +Once the `conda-forge/label/matplotlib_rc` channel has been enabled, `matplotlib, matplotlib-base` can be installed with `conda`: ``` conda install matplotlib matplotlib-base @@ -316,26 +323,26 @@ mamba install matplotlib matplotlib-base It is possible to list all of the versions of `matplotlib` available on your platform with `conda`: ``` -conda search matplotlib --channel conda-forge +conda search matplotlib --channel conda-forge/label/matplotlib_rc ``` or with `mamba`: ``` -mamba search matplotlib --channel conda-forge +mamba search matplotlib --channel conda-forge/label/matplotlib_rc ``` Alternatively, `mamba repoquery` may provide more information: ``` # Search all versions available on your platform: -mamba repoquery search matplotlib --channel conda-forge +mamba repoquery search matplotlib --channel conda-forge/label/matplotlib_rc # List packages depending on `matplotlib`: -mamba repoquery whoneeds matplotlib --channel conda-forge +mamba repoquery whoneeds matplotlib --channel conda-forge/label/matplotlib_rc # List dependencies of `matplotlib`: -mamba repoquery depends matplotlib --channel conda-forge +mamba repoquery depends matplotlib --channel conda-forge/label/matplotlib_rc ``` @@ -357,7 +364,7 @@ available continuous integration services. Thanks to the awesome service provide [CircleCI](https://circleci.com/), [AppVeyor](https://www.appveyor.com/), [Drone](https://cloud.drone.io/welcome), and [TravisCI](https://travis-ci.com/) it is possible to build and upload installable packages to the -[conda-forge](https://anaconda.org/conda-forge) [Anaconda-Cloud](https://anaconda.org/) +[conda-forge](https://anaconda.org/conda-forge) [anaconda.org](https://anaconda.org/) channel for Linux, Windows and OSX respectively. To manage the continuous integration and simplify feedstock maintenance diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 6b346f50..e5306da9 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -4,5 +4,5 @@ jobs: - template: ./.azure-pipelines/azure-pipelines-linux.yml - - template: ./.azure-pipelines/azure-pipelines-win.yml - - template: ./.azure-pipelines/azure-pipelines-osx.yml \ No newline at end of file + - template: ./.azure-pipelines/azure-pipelines-osx.yml + - template: ./.azure-pipelines/azure-pipelines-win.yml \ No newline at end of file diff --git a/build-locally.py b/build-locally.py index 3f4b7a79..e0d408d0 100755 --- a/build-locally.py +++ b/build-locally.py @@ -64,8 +64,9 @@ def verify_config(ns): elif ns.config.startswith("osx"): if "OSX_SDK_DIR" not in os.environ: raise RuntimeError( - "Need OSX_SDK_DIR env variable set. Run 'export OSX_SDK_DIR=SDKs' " - "to download the SDK automatically to 'SDKs/MacOSX.sdk'. " + "Need OSX_SDK_DIR env variable set. Run 'export OSX_SDK_DIR=$PWD/SDKs' " + "to download the SDK automatically to '$PWD/SDKs/MacOSX.sdk'. " + "Note: OSX_SDK_DIR must be set to an absolute path. " "Setting this variable implies agreement to the licensing terms of the SDK by Apple." ) From 7cc8550621365e34d74c566a2ec92af109e07250 Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Fri, 28 Jun 2024 11:40:06 +0000 Subject: [PATCH 84/95] migration: ArchRebuild --- conda-forge.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/conda-forge.yml b/conda-forge.yml index 1a735061..58154bb6 100644 --- a/conda-forge.yml +++ b/conda-forge.yml @@ -5,6 +5,8 @@ build_platform: linux_aarch64: linux_64 linux_ppc64le: linux_64 osx_arm64: osx_64 +conda_build: + pkg_format: '2' conda_forge_output_validation: true github: branch_name: main @@ -15,6 +17,4 @@ provider: linux_ppc64le: default osx: azure win: azure -conda_build: - pkg_format: '2' test: native_and_emulated From 0715a00297bb547d7b041083c61fbe2de2be50b8 Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Fri, 28 Jun 2024 11:42:33 +0000 Subject: [PATCH 85/95] MNT: Re-rendered with conda-build 24.5.1, conda-smithy 3.36.2, and conda-forge-pinning 2024.06.28.09.32.10 --- .azure-pipelines/azure-pipelines-linux.yml | 68 ++++---- .azure-pipelines/azure-pipelines-osx.yml | 43 ++--- .azure-pipelines/azure-pipelines-win.yml | 81 +++------- ...nux_64_numpy1.21python3.8.____73_pypy.yaml | 40 ----- ...x_64_numpy1.22python3.10.____cpython.yaml} | 4 +- ...ux_64_numpy1.22python3.8.____cpython.yaml} | 4 +- ...ux_64_numpy1.22python3.9.____73_pypy.yaml} | 4 +- ...ux_64_numpy1.22python3.9.____cpython.yaml} | 4 +- ...ux_64_numpy1.23python3.11.____cpython.yaml | 2 +- ...ux_64_numpy1.26python3.12.____cpython.yaml | 40 +++++ ...arch64_numpy1.21python3.8.____73_pypy.yaml | 44 ------ ...ch64_numpy1.22python3.10.____cpython.yaml} | 4 +- ...rch64_numpy1.22python3.8.____cpython.yaml} | 4 +- ...rch64_numpy1.22python3.9.____73_pypy.yaml} | 4 +- ...rch64_numpy1.22python3.9.____cpython.yaml} | 4 +- ...rch64_numpy1.23python3.11.____cpython.yaml | 2 +- ...rch64_numpy1.26python3.12.____cpython.yaml | 44 ++++++ ...pc64le_numpy1.21python3.8.____73_pypy.yaml | 38 ----- ...64le_numpy1.22python3.10.____cpython.yaml} | 4 +- ...c64le_numpy1.22python3.8.____cpython.yaml} | 4 +- ...c64le_numpy1.22python3.9.____73_pypy.yaml} | 4 +- ...c64le_numpy1.22python3.9.____cpython.yaml} | 4 +- ...c64le_numpy1.23python3.11.____cpython.yaml | 2 +- ...c64le_numpy1.26python3.12.____cpython.yaml | 38 +++++ .ci_support/migrations/python311.yaml | 37 ----- ...osx_64_numpy1.21python3.8.____73_pypy.yaml | 40 ----- ...x_64_numpy1.22python3.10.____cpython.yaml} | 12 +- ...sx_64_numpy1.22python3.8.____cpython.yaml} | 12 +- ...sx_64_numpy1.22python3.9.____73_pypy.yaml} | 12 +- ...sx_64_numpy1.22python3.9.____cpython.yaml} | 12 +- ...sx_64_numpy1.23python3.11.____cpython.yaml | 10 +- ...sx_64_numpy1.26python3.12.____cpython.yaml | 40 +++++ ...rm64_numpy1.22python3.10.____cpython.yaml} | 10 +- ...arm64_numpy1.22python3.8.____cpython.yaml} | 10 +- ...arm64_numpy1.22python3.9.____cpython.yaml} | 10 +- ...arm64_numpy1.23python3.11.____cpython.yaml | 8 +- ...arm64_numpy1.26python3.12.____cpython.yaml | 40 +++++ ...n_64_numpy1.22python3.10.____cpython.yaml} | 4 +- ...in_64_numpy1.22python3.8.____cpython.yaml} | 4 +- ...in_64_numpy1.22python3.9.____73_pypy.yaml} | 4 +- ...in_64_numpy1.22python3.9.____cpython.yaml} | 4 +- ...in_64_numpy1.23python3.11.____cpython.yaml | 2 +- ...n_64_numpy1.26python3.12.____cpython.yaml} | 8 +- .gitattributes | 4 +- .gitignore | 25 ++- .scripts/build_steps.sh | 23 ++- .scripts/logging_utils.sh | 4 +- .scripts/run_docker_build.sh | 9 ++ .scripts/run_osx_build.sh | 26 +++- .scripts/run_win_build.bat | 130 ++++++++++++++++ README.md | 147 +++++++++--------- azure-pipelines.yml | 4 +- build-locally.py | 5 +- 53 files changed, 661 insertions(+), 485 deletions(-) delete mode 100644 .ci_support/linux_64_numpy1.21python3.8.____73_pypy.yaml rename .ci_support/{linux_64_numpy1.21python3.10.____cpython.yaml => linux_64_numpy1.22python3.10.____cpython.yaml} (96%) rename .ci_support/{linux_64_numpy1.21python3.8.____cpython.yaml => linux_64_numpy1.22python3.8.____cpython.yaml} (96%) rename .ci_support/{linux_64_numpy1.21python3.9.____73_pypy.yaml => linux_64_numpy1.22python3.9.____73_pypy.yaml} (96%) rename .ci_support/{linux_64_numpy1.21python3.9.____cpython.yaml => linux_64_numpy1.22python3.9.____cpython.yaml} (96%) create mode 100644 .ci_support/linux_64_numpy1.26python3.12.____cpython.yaml delete mode 100644 .ci_support/linux_aarch64_numpy1.21python3.8.____73_pypy.yaml rename .ci_support/{linux_aarch64_numpy1.21python3.10.____cpython.yaml => linux_aarch64_numpy1.22python3.10.____cpython.yaml} (97%) rename .ci_support/{linux_aarch64_numpy1.21python3.8.____cpython.yaml => linux_aarch64_numpy1.22python3.8.____cpython.yaml} (97%) rename .ci_support/{linux_aarch64_numpy1.21python3.9.____73_pypy.yaml => linux_aarch64_numpy1.22python3.9.____73_pypy.yaml} (97%) rename .ci_support/{linux_aarch64_numpy1.21python3.9.____cpython.yaml => linux_aarch64_numpy1.22python3.9.____cpython.yaml} (97%) create mode 100644 .ci_support/linux_aarch64_numpy1.26python3.12.____cpython.yaml delete mode 100644 .ci_support/linux_ppc64le_numpy1.21python3.8.____73_pypy.yaml rename .ci_support/{linux_ppc64le_numpy1.21python3.10.____cpython.yaml => linux_ppc64le_numpy1.22python3.10.____cpython.yaml} (96%) rename .ci_support/{linux_ppc64le_numpy1.21python3.8.____cpython.yaml => linux_ppc64le_numpy1.22python3.8.____cpython.yaml} (96%) rename .ci_support/{linux_ppc64le_numpy1.21python3.9.____73_pypy.yaml => linux_ppc64le_numpy1.22python3.9.____73_pypy.yaml} (96%) rename .ci_support/{linux_ppc64le_numpy1.21python3.9.____cpython.yaml => linux_ppc64le_numpy1.22python3.9.____cpython.yaml} (96%) create mode 100644 .ci_support/linux_ppc64le_numpy1.26python3.12.____cpython.yaml delete mode 100644 .ci_support/migrations/python311.yaml delete mode 100644 .ci_support/osx_64_numpy1.21python3.8.____73_pypy.yaml rename .ci_support/{osx_64_numpy1.21python3.10.____cpython.yaml => osx_64_numpy1.22python3.10.____cpython.yaml} (90%) rename .ci_support/{osx_64_numpy1.21python3.8.____cpython.yaml => osx_64_numpy1.22python3.8.____cpython.yaml} (90%) rename .ci_support/{osx_64_numpy1.21python3.9.____73_pypy.yaml => osx_64_numpy1.22python3.9.____73_pypy.yaml} (90%) rename .ci_support/{osx_64_numpy1.21python3.9.____cpython.yaml => osx_64_numpy1.22python3.9.____cpython.yaml} (90%) create mode 100644 .ci_support/osx_64_numpy1.26python3.12.____cpython.yaml rename .ci_support/{osx_arm64_numpy1.21python3.10.____cpython.yaml => osx_arm64_numpy1.22python3.10.____cpython.yaml} (89%) rename .ci_support/{osx_arm64_numpy1.21python3.8.____cpython.yaml => osx_arm64_numpy1.22python3.8.____cpython.yaml} (89%) rename .ci_support/{osx_arm64_numpy1.21python3.9.____cpython.yaml => osx_arm64_numpy1.22python3.9.____cpython.yaml} (89%) create mode 100644 .ci_support/osx_arm64_numpy1.26python3.12.____cpython.yaml rename .ci_support/{win_64_numpy1.21python3.10.____cpython.yaml => win_64_numpy1.22python3.10.____cpython.yaml} (95%) rename .ci_support/{win_64_numpy1.21python3.8.____cpython.yaml => win_64_numpy1.22python3.8.____cpython.yaml} (95%) rename .ci_support/{win_64_numpy1.21python3.9.____73_pypy.yaml => win_64_numpy1.22python3.9.____73_pypy.yaml} (95%) rename .ci_support/{win_64_numpy1.21python3.9.____cpython.yaml => win_64_numpy1.22python3.9.____cpython.yaml} (95%) rename .ci_support/{win_64_numpy1.21python3.8.____73_pypy.yaml => win_64_numpy1.26python3.12.____cpython.yaml} (87%) create mode 100755 .scripts/run_win_build.bat diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml index d42ff128..229a62a6 100755 --- a/.azure-pipelines/azure-pipelines-linux.yml +++ b/.azure-pipelines/azure-pipelines-linux.yml @@ -8,79 +8,80 @@ jobs: vmImage: ubuntu-latest strategy: matrix: - linux_64_numpy1.21python3.10.____cpython: - CONFIG: linux_64_numpy1.21python3.10.____cpython + linux_64_numpy1.22python3.10.____cpython: + CONFIG: linux_64_numpy1.22python3.10.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_64_numpy1.21python3.8.____73_pypy: - CONFIG: linux_64_numpy1.21python3.8.____73_pypy + linux_64_numpy1.22python3.8.____cpython: + CONFIG: linux_64_numpy1.22python3.8.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_64_numpy1.21python3.8.____cpython: - CONFIG: linux_64_numpy1.21python3.8.____cpython + linux_64_numpy1.22python3.9.____73_pypy: + CONFIG: linux_64_numpy1.22python3.9.____73_pypy UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_64_numpy1.21python3.9.____73_pypy: - CONFIG: linux_64_numpy1.21python3.9.____73_pypy - UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_64_numpy1.21python3.9.____cpython: - CONFIG: linux_64_numpy1.21python3.9.____cpython + linux_64_numpy1.22python3.9.____cpython: + CONFIG: linux_64_numpy1.22python3.9.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 linux_64_numpy1.23python3.11.____cpython: CONFIG: linux_64_numpy1.23python3.11.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_aarch64_numpy1.21python3.10.____cpython: - CONFIG: linux_aarch64_numpy1.21python3.10.____cpython + linux_64_numpy1.26python3.12.____cpython: + CONFIG: linux_64_numpy1.26python3.12.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_aarch64_numpy1.21python3.8.____73_pypy: - CONFIG: linux_aarch64_numpy1.21python3.8.____73_pypy + linux_aarch64_numpy1.22python3.10.____cpython: + CONFIG: linux_aarch64_numpy1.22python3.10.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_aarch64_numpy1.21python3.8.____cpython: - CONFIG: linux_aarch64_numpy1.21python3.8.____cpython + linux_aarch64_numpy1.22python3.8.____cpython: + CONFIG: linux_aarch64_numpy1.22python3.8.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_aarch64_numpy1.21python3.9.____73_pypy: - CONFIG: linux_aarch64_numpy1.21python3.9.____73_pypy + linux_aarch64_numpy1.22python3.9.____73_pypy: + CONFIG: linux_aarch64_numpy1.22python3.9.____73_pypy UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_aarch64_numpy1.21python3.9.____cpython: - CONFIG: linux_aarch64_numpy1.21python3.9.____cpython + linux_aarch64_numpy1.22python3.9.____cpython: + CONFIG: linux_aarch64_numpy1.22python3.9.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 linux_aarch64_numpy1.23python3.11.____cpython: CONFIG: linux_aarch64_numpy1.23python3.11.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_ppc64le_numpy1.21python3.10.____cpython: - CONFIG: linux_ppc64le_numpy1.21python3.10.____cpython + linux_aarch64_numpy1.26python3.12.____cpython: + CONFIG: linux_aarch64_numpy1.26python3.12.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_ppc64le_numpy1.21python3.8.____73_pypy: - CONFIG: linux_ppc64le_numpy1.21python3.8.____73_pypy + linux_ppc64le_numpy1.22python3.10.____cpython: + CONFIG: linux_ppc64le_numpy1.22python3.10.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_ppc64le_numpy1.21python3.8.____cpython: - CONFIG: linux_ppc64le_numpy1.21python3.8.____cpython + linux_ppc64le_numpy1.22python3.8.____cpython: + CONFIG: linux_ppc64le_numpy1.22python3.8.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_ppc64le_numpy1.21python3.9.____73_pypy: - CONFIG: linux_ppc64le_numpy1.21python3.9.____73_pypy + linux_ppc64le_numpy1.22python3.9.____73_pypy: + CONFIG: linux_ppc64le_numpy1.22python3.9.____73_pypy UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_ppc64le_numpy1.21python3.9.____cpython: - CONFIG: linux_ppc64le_numpy1.21python3.9.____cpython + linux_ppc64le_numpy1.22python3.9.____cpython: + CONFIG: linux_ppc64le_numpy1.22python3.9.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 linux_ppc64le_numpy1.23python3.11.____cpython: CONFIG: linux_ppc64le_numpy1.23python3.11.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 + linux_ppc64le_numpy1.26python3.12.____cpython: + CONFIG: linux_ppc64le_numpy1.26python3.12.____cpython + UPLOAD_PACKAGES: 'True' + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 timeoutInMinutes: 360 + variables: {} steps: # configure qemu binfmt-misc running. This allows us to run docker containers @@ -93,6 +94,9 @@ jobs: - script: | export CI=azure + export flow_run_id=azure_$(Build.BuildNumber).$(System.JobAttempt) + export remote_url=$(Build.Repository.Uri) + export sha=$(Build.SourceVersion) export GIT_BRANCH=$BUILD_SOURCEBRANCHNAME export FEEDSTOCK_NAME=$(basename ${BUILD_REPOSITORY_NAME}) if [[ "${BUILD_REASON:-}" == "PullRequest" ]]; then diff --git a/.azure-pipelines/azure-pipelines-osx.yml b/.azure-pipelines/azure-pipelines-osx.yml index e3774bfd..27ddd14f 100755 --- a/.azure-pipelines/azure-pipelines-osx.yml +++ b/.azure-pipelines/azure-pipelines-osx.yml @@ -5,45 +5,52 @@ jobs: - job: osx pool: - vmImage: macOS-11 + vmImage: macOS-12 strategy: matrix: - osx_64_numpy1.21python3.10.____cpython: - CONFIG: osx_64_numpy1.21python3.10.____cpython + osx_64_numpy1.22python3.10.____cpython: + CONFIG: osx_64_numpy1.22python3.10.____cpython UPLOAD_PACKAGES: 'True' - osx_64_numpy1.21python3.8.____73_pypy: - CONFIG: osx_64_numpy1.21python3.8.____73_pypy + osx_64_numpy1.22python3.8.____cpython: + CONFIG: osx_64_numpy1.22python3.8.____cpython UPLOAD_PACKAGES: 'True' - osx_64_numpy1.21python3.8.____cpython: - CONFIG: osx_64_numpy1.21python3.8.____cpython + osx_64_numpy1.22python3.9.____73_pypy: + CONFIG: osx_64_numpy1.22python3.9.____73_pypy UPLOAD_PACKAGES: 'True' - osx_64_numpy1.21python3.9.____73_pypy: - CONFIG: osx_64_numpy1.21python3.9.____73_pypy - UPLOAD_PACKAGES: 'True' - osx_64_numpy1.21python3.9.____cpython: - CONFIG: osx_64_numpy1.21python3.9.____cpython + osx_64_numpy1.22python3.9.____cpython: + CONFIG: osx_64_numpy1.22python3.9.____cpython UPLOAD_PACKAGES: 'True' osx_64_numpy1.23python3.11.____cpython: CONFIG: osx_64_numpy1.23python3.11.____cpython UPLOAD_PACKAGES: 'True' - osx_arm64_numpy1.21python3.10.____cpython: - CONFIG: osx_arm64_numpy1.21python3.10.____cpython + osx_64_numpy1.26python3.12.____cpython: + CONFIG: osx_64_numpy1.26python3.12.____cpython + UPLOAD_PACKAGES: 'True' + osx_arm64_numpy1.22python3.10.____cpython: + CONFIG: osx_arm64_numpy1.22python3.10.____cpython UPLOAD_PACKAGES: 'True' - osx_arm64_numpy1.21python3.8.____cpython: - CONFIG: osx_arm64_numpy1.21python3.8.____cpython + osx_arm64_numpy1.22python3.8.____cpython: + CONFIG: osx_arm64_numpy1.22python3.8.____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 UPLOAD_PACKAGES: 'True' + osx_arm64_numpy1.26python3.12.____cpython: + CONFIG: osx_arm64_numpy1.26python3.12.____cpython + UPLOAD_PACKAGES: 'True' timeoutInMinutes: 360 + variables: {} steps: # TODO: Fast finish on azure pipelines? - script: | export CI=azure + export flow_run_id=azure_$(Build.BuildNumber).$(System.JobAttempt) + export remote_url=$(Build.Repository.Uri) + export sha=$(Build.SourceVersion) export OSX_FORCE_SDK_DOWNLOAD="1" export GIT_BRANCH=$BUILD_SOURCEBRANCHNAME export FEEDSTOCK_NAME=$(basename ${BUILD_REPOSITORY_NAME}) diff --git a/.azure-pipelines/azure-pipelines-win.yml b/.azure-pipelines/azure-pipelines-win.yml index 7f5ab156..9f5a7811 100755 --- a/.azure-pipelines/azure-pipelines-win.yml +++ b/.azure-pipelines/azure-pipelines-win.yml @@ -8,30 +8,31 @@ jobs: vmImage: windows-2022 strategy: matrix: - win_64_numpy1.21python3.10.____cpython: - CONFIG: win_64_numpy1.21python3.10.____cpython + win_64_numpy1.22python3.10.____cpython: + CONFIG: win_64_numpy1.22python3.10.____cpython UPLOAD_PACKAGES: 'True' - win_64_numpy1.21python3.8.____73_pypy: - CONFIG: win_64_numpy1.21python3.8.____73_pypy + win_64_numpy1.22python3.8.____cpython: + CONFIG: win_64_numpy1.22python3.8.____cpython UPLOAD_PACKAGES: 'True' - win_64_numpy1.21python3.8.____cpython: - CONFIG: win_64_numpy1.21python3.8.____cpython + win_64_numpy1.22python3.9.____73_pypy: + CONFIG: win_64_numpy1.22python3.9.____73_pypy UPLOAD_PACKAGES: 'True' - win_64_numpy1.21python3.9.____73_pypy: - CONFIG: win_64_numpy1.21python3.9.____73_pypy - UPLOAD_PACKAGES: 'True' - win_64_numpy1.21python3.9.____cpython: - CONFIG: win_64_numpy1.21python3.9.____cpython + win_64_numpy1.22python3.9.____cpython: + CONFIG: win_64_numpy1.22python3.9.____cpython UPLOAD_PACKAGES: 'True' win_64_numpy1.23python3.11.____cpython: CONFIG: win_64_numpy1.23python3.11.____cpython UPLOAD_PACKAGES: 'True' + win_64_numpy1.26python3.12.____cpython: + CONFIG: win_64_numpy1.26python3.12.____cpython + UPLOAD_PACKAGES: 'True' timeoutInMinutes: 360 variables: CONDA_BLD_PATH: D:\\bld\\ UPLOAD_TEMP: D:\\tmp steps: + - task: PythonScript@0 displayName: 'Download Miniforge' inputs: @@ -50,55 +51,17 @@ jobs: displayName: Add conda to PATH - script: | - call activate base - mamba.exe install "python=3.10" conda-build conda pip boa conda-forge-ci-setup=3 -c conda-forge --strict-channel-priority --yes - displayName: Install conda-build - - - script: set PYTHONUNBUFFERED=1 - displayName: Set PYTHONUNBUFFERED - - # Configure the VM - - script: | - call activate base - setup_conda_rc .\ ".\recipe" .\.ci_support\%CONFIG%.yaml - displayName: conda-forge CI setup - - # Configure the VM. - - script: | - set "CI=azure" - call activate base - run_conda_forge_build_setup - displayName: conda-forge build setup - - - script: | - call activate base - if EXIST LICENSE.txt ( - copy LICENSE.txt "recipe\\recipe-scripts-license.txt" - ) - if NOT [%HOST_PLATFORM%] == [%BUILD_PLATFORM%] ( - set "EXTRA_CB_OPTIONS=%EXTRA_CB_OPTIONS% --no-test" - ) - conda.exe mambabuild "recipe" -m .ci_support\%CONFIG%.yaml --suppress-variables %EXTRA_CB_OPTIONS% - displayName: Build recipe + call ".scripts\run_win_build.bat" + displayName: Run Windows build env: PYTHONUNBUFFERED: 1 - - script: | - set "FEEDSTOCK_NAME=%BUILD_REPOSITORY_NAME:*/=%" - call activate base - validate_recipe_outputs "%FEEDSTOCK_NAME%" - displayName: Validate Recipe Outputs - - - script: | - set "GIT_BRANCH=%BUILD_SOURCEBRANCHNAME%" - set "FEEDSTOCK_NAME=%BUILD_REPOSITORY_NAME:*/=%" - set "TEMP=$(UPLOAD_TEMP)" - if not exist "%TEMP%\" md "%TEMP%" - set "TMP=%TEMP%" - call activate base - upload_package --validate --feedstock-name="%FEEDSTOCK_NAME%" .\ ".\recipe" .ci_support\%CONFIG%.yaml - displayName: Upload package - env: + CONFIG: $(CONFIG) + CI: azure + flow_run_id: azure_$(Build.BuildNumber).$(System.JobAttempt) + remote_url: $(Build.Repository.Uri) + sha: $(Build.SourceVersion) + UPLOAD_PACKAGES: $(UPLOAD_PACKAGES) + UPLOAD_TEMP: $(UPLOAD_TEMP) BINSTAR_TOKEN: $(BINSTAR_TOKEN) FEEDSTOCK_TOKEN: $(FEEDSTOCK_TOKEN) - STAGING_BINSTAR_TOKEN: $(STAGING_BINSTAR_TOKEN) - condition: and(succeeded(), not(eq(variables['UPLOAD_PACKAGES'], 'False')), not(eq(variables['Build.Reason'], 'PullRequest'))) \ No newline at end of file + STAGING_BINSTAR_TOKEN: $(STAGING_BINSTAR_TOKEN) \ No newline at end of file diff --git a/.ci_support/linux_64_numpy1.21python3.8.____73_pypy.yaml b/.ci_support/linux_64_numpy1.21python3.8.____73_pypy.yaml deleted file mode 100644 index b541d9a6..00000000 --- a/.ci_support/linux_64_numpy1.21python3.8.____73_pypy.yaml +++ /dev/null @@ -1,40 +0,0 @@ -c_compiler: -- gcc -c_compiler_version: -- '12' -cdt_name: -- cos6 -channel_sources: -- conda-forge -channel_targets: -- conda-forge matplotlib_rc -cxx_compiler: -- gxx -cxx_compiler_version: -- '12' -docker_image: -- quay.io/condaforge/linux-anvil-cos7-x86_64 -freetype: -- '2' -numpy: -- '1.21' -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -python: -- 3.8.* *_73_pypy -python_impl: -- pypy -target_platform: -- linux-64 -tk: -- '8.6' -zip_keys: -- - c_compiler_version - - cxx_compiler_version -- - python - - numpy - - python_impl -zlib: -- '1.2' diff --git a/.ci_support/linux_64_numpy1.21python3.10.____cpython.yaml b/.ci_support/linux_64_numpy1.22python3.10.____cpython.yaml similarity index 96% rename from .ci_support/linux_64_numpy1.21python3.10.____cpython.yaml rename to .ci_support/linux_64_numpy1.22python3.10.____cpython.yaml index 79e954eb..711a1834 100644 --- a/.ci_support/linux_64_numpy1.21python3.10.____cpython.yaml +++ b/.ci_support/linux_64_numpy1.22python3.10.____cpython.yaml @@ -17,7 +17,7 @@ docker_image: freetype: - '2' numpy: -- '1.21' +- '1.22' pin_run_as_build: python: min_pin: x.x @@ -37,4 +37,4 @@ zip_keys: - numpy - python_impl zlib: -- '1.2' +- '1' diff --git a/.ci_support/linux_64_numpy1.21python3.8.____cpython.yaml b/.ci_support/linux_64_numpy1.22python3.8.____cpython.yaml similarity index 96% rename from .ci_support/linux_64_numpy1.21python3.8.____cpython.yaml rename to .ci_support/linux_64_numpy1.22python3.8.____cpython.yaml index 597557ab..84dab33d 100644 --- a/.ci_support/linux_64_numpy1.21python3.8.____cpython.yaml +++ b/.ci_support/linux_64_numpy1.22python3.8.____cpython.yaml @@ -17,7 +17,7 @@ docker_image: freetype: - '2' numpy: -- '1.21' +- '1.22' pin_run_as_build: python: min_pin: x.x @@ -37,4 +37,4 @@ zip_keys: - numpy - python_impl zlib: -- '1.2' +- '1' diff --git a/.ci_support/linux_64_numpy1.21python3.9.____73_pypy.yaml b/.ci_support/linux_64_numpy1.22python3.9.____73_pypy.yaml similarity index 96% rename from .ci_support/linux_64_numpy1.21python3.9.____73_pypy.yaml rename to .ci_support/linux_64_numpy1.22python3.9.____73_pypy.yaml index d7bb831c..7544eb38 100644 --- a/.ci_support/linux_64_numpy1.21python3.9.____73_pypy.yaml +++ b/.ci_support/linux_64_numpy1.22python3.9.____73_pypy.yaml @@ -17,7 +17,7 @@ docker_image: freetype: - '2' numpy: -- '1.21' +- '1.22' pin_run_as_build: python: min_pin: x.x @@ -37,4 +37,4 @@ zip_keys: - numpy - python_impl zlib: -- '1.2' +- '1' diff --git a/.ci_support/linux_64_numpy1.21python3.9.____cpython.yaml b/.ci_support/linux_64_numpy1.22python3.9.____cpython.yaml similarity index 96% rename from .ci_support/linux_64_numpy1.21python3.9.____cpython.yaml rename to .ci_support/linux_64_numpy1.22python3.9.____cpython.yaml index e8fe600d..daa126db 100644 --- a/.ci_support/linux_64_numpy1.21python3.9.____cpython.yaml +++ b/.ci_support/linux_64_numpy1.22python3.9.____cpython.yaml @@ -17,7 +17,7 @@ docker_image: freetype: - '2' numpy: -- '1.21' +- '1.22' pin_run_as_build: python: min_pin: x.x @@ -37,4 +37,4 @@ zip_keys: - numpy - python_impl zlib: -- '1.2' +- '1' diff --git a/.ci_support/linux_64_numpy1.23python3.11.____cpython.yaml b/.ci_support/linux_64_numpy1.23python3.11.____cpython.yaml index 918e96ea..f04f3e00 100644 --- a/.ci_support/linux_64_numpy1.23python3.11.____cpython.yaml +++ b/.ci_support/linux_64_numpy1.23python3.11.____cpython.yaml @@ -37,4 +37,4 @@ zip_keys: - numpy - python_impl zlib: -- '1.2' +- '1' diff --git a/.ci_support/linux_64_numpy1.26python3.12.____cpython.yaml b/.ci_support/linux_64_numpy1.26python3.12.____cpython.yaml new file mode 100644 index 00000000..924eec41 --- /dev/null +++ b/.ci_support/linux_64_numpy1.26python3.12.____cpython.yaml @@ -0,0 +1,40 @@ +c_compiler: +- gcc +c_compiler_version: +- '12' +cdt_name: +- cos6 +channel_sources: +- conda-forge +channel_targets: +- conda-forge matplotlib_rc +cxx_compiler: +- gxx +cxx_compiler_version: +- '12' +docker_image: +- quay.io/condaforge/linux-anvil-cos7-x86_64 +freetype: +- '2' +numpy: +- '1.26' +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +python: +- 3.12.* *_cpython +python_impl: +- cpython +target_platform: +- linux-64 +tk: +- '8.6' +zip_keys: +- - c_compiler_version + - cxx_compiler_version +- - python + - numpy + - python_impl +zlib: +- '1' diff --git a/.ci_support/linux_aarch64_numpy1.21python3.8.____73_pypy.yaml b/.ci_support/linux_aarch64_numpy1.21python3.8.____73_pypy.yaml deleted file mode 100644 index 9f217c11..00000000 --- a/.ci_support/linux_aarch64_numpy1.21python3.8.____73_pypy.yaml +++ /dev/null @@ -1,44 +0,0 @@ -BUILD: -- aarch64-conda_cos7-linux-gnu -c_compiler: -- gcc -c_compiler_version: -- '12' -cdt_arch: -- aarch64 -cdt_name: -- cos7 -channel_sources: -- conda-forge -channel_targets: -- conda-forge matplotlib_rc -cxx_compiler: -- gxx -cxx_compiler_version: -- '12' -docker_image: -- quay.io/condaforge/linux-anvil-cos7-x86_64 -freetype: -- '2' -numpy: -- '1.21' -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -python: -- 3.8.* *_73_pypy -python_impl: -- pypy -target_platform: -- linux-aarch64 -tk: -- '8.6' -zip_keys: -- - c_compiler_version - - cxx_compiler_version -- - python - - numpy - - python_impl -zlib: -- '1.2' diff --git a/.ci_support/linux_aarch64_numpy1.21python3.10.____cpython.yaml b/.ci_support/linux_aarch64_numpy1.22python3.10.____cpython.yaml similarity index 97% rename from .ci_support/linux_aarch64_numpy1.21python3.10.____cpython.yaml rename to .ci_support/linux_aarch64_numpy1.22python3.10.____cpython.yaml index b5881ca1..0d7d0fcb 100644 --- a/.ci_support/linux_aarch64_numpy1.21python3.10.____cpython.yaml +++ b/.ci_support/linux_aarch64_numpy1.22python3.10.____cpython.yaml @@ -21,7 +21,7 @@ docker_image: freetype: - '2' numpy: -- '1.21' +- '1.22' pin_run_as_build: python: min_pin: x.x @@ -41,4 +41,4 @@ zip_keys: - numpy - python_impl zlib: -- '1.2' +- '1' diff --git a/.ci_support/linux_aarch64_numpy1.21python3.8.____cpython.yaml b/.ci_support/linux_aarch64_numpy1.22python3.8.____cpython.yaml similarity index 97% rename from .ci_support/linux_aarch64_numpy1.21python3.8.____cpython.yaml rename to .ci_support/linux_aarch64_numpy1.22python3.8.____cpython.yaml index 07edc4c2..739a3343 100644 --- a/.ci_support/linux_aarch64_numpy1.21python3.8.____cpython.yaml +++ b/.ci_support/linux_aarch64_numpy1.22python3.8.____cpython.yaml @@ -21,7 +21,7 @@ docker_image: freetype: - '2' numpy: -- '1.21' +- '1.22' pin_run_as_build: python: min_pin: x.x @@ -41,4 +41,4 @@ zip_keys: - numpy - python_impl zlib: -- '1.2' +- '1' diff --git a/.ci_support/linux_aarch64_numpy1.21python3.9.____73_pypy.yaml b/.ci_support/linux_aarch64_numpy1.22python3.9.____73_pypy.yaml similarity index 97% rename from .ci_support/linux_aarch64_numpy1.21python3.9.____73_pypy.yaml rename to .ci_support/linux_aarch64_numpy1.22python3.9.____73_pypy.yaml index 19862c32..68b93569 100644 --- a/.ci_support/linux_aarch64_numpy1.21python3.9.____73_pypy.yaml +++ b/.ci_support/linux_aarch64_numpy1.22python3.9.____73_pypy.yaml @@ -21,7 +21,7 @@ docker_image: freetype: - '2' numpy: -- '1.21' +- '1.22' pin_run_as_build: python: min_pin: x.x @@ -41,4 +41,4 @@ zip_keys: - numpy - python_impl zlib: -- '1.2' +- '1' diff --git a/.ci_support/linux_aarch64_numpy1.21python3.9.____cpython.yaml b/.ci_support/linux_aarch64_numpy1.22python3.9.____cpython.yaml similarity index 97% rename from .ci_support/linux_aarch64_numpy1.21python3.9.____cpython.yaml rename to .ci_support/linux_aarch64_numpy1.22python3.9.____cpython.yaml index 47c1c822..63c4b20c 100644 --- a/.ci_support/linux_aarch64_numpy1.21python3.9.____cpython.yaml +++ b/.ci_support/linux_aarch64_numpy1.22python3.9.____cpython.yaml @@ -21,7 +21,7 @@ docker_image: freetype: - '2' numpy: -- '1.21' +- '1.22' pin_run_as_build: python: min_pin: x.x @@ -41,4 +41,4 @@ zip_keys: - numpy - python_impl zlib: -- '1.2' +- '1' diff --git a/.ci_support/linux_aarch64_numpy1.23python3.11.____cpython.yaml b/.ci_support/linux_aarch64_numpy1.23python3.11.____cpython.yaml index 48aac766..c9efd406 100644 --- a/.ci_support/linux_aarch64_numpy1.23python3.11.____cpython.yaml +++ b/.ci_support/linux_aarch64_numpy1.23python3.11.____cpython.yaml @@ -41,4 +41,4 @@ zip_keys: - numpy - python_impl zlib: -- '1.2' +- '1' diff --git a/.ci_support/linux_aarch64_numpy1.26python3.12.____cpython.yaml b/.ci_support/linux_aarch64_numpy1.26python3.12.____cpython.yaml new file mode 100644 index 00000000..23a02890 --- /dev/null +++ b/.ci_support/linux_aarch64_numpy1.26python3.12.____cpython.yaml @@ -0,0 +1,44 @@ +BUILD: +- aarch64-conda_cos7-linux-gnu +c_compiler: +- gcc +c_compiler_version: +- '12' +cdt_arch: +- aarch64 +cdt_name: +- cos7 +channel_sources: +- conda-forge +channel_targets: +- conda-forge matplotlib_rc +cxx_compiler: +- gxx +cxx_compiler_version: +- '12' +docker_image: +- quay.io/condaforge/linux-anvil-cos7-x86_64 +freetype: +- '2' +numpy: +- '1.26' +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +python: +- 3.12.* *_cpython +python_impl: +- cpython +target_platform: +- linux-aarch64 +tk: +- '8.6' +zip_keys: +- - c_compiler_version + - cxx_compiler_version +- - python + - numpy + - python_impl +zlib: +- '1' diff --git a/.ci_support/linux_ppc64le_numpy1.21python3.8.____73_pypy.yaml b/.ci_support/linux_ppc64le_numpy1.21python3.8.____73_pypy.yaml deleted file mode 100644 index 06fc0016..00000000 --- a/.ci_support/linux_ppc64le_numpy1.21python3.8.____73_pypy.yaml +++ /dev/null @@ -1,38 +0,0 @@ -c_compiler: -- gcc -c_compiler_version: -- '12' -cdt_name: -- cos7 -channel_sources: -- conda-forge -channel_targets: -- conda-forge matplotlib_rc -cxx_compiler: -- gxx -cxx_compiler_version: -- '12' -docker_image: -- quay.io/condaforge/linux-anvil-cos7-x86_64 -freetype: -- '2' -numpy: -- '1.21' -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -python: -- 3.8.* *_73_pypy -python_impl: -- pypy -target_platform: -- linux-ppc64le -zip_keys: -- - c_compiler_version - - cxx_compiler_version -- - python - - numpy - - python_impl -zlib: -- '1.2' diff --git a/.ci_support/linux_ppc64le_numpy1.21python3.10.____cpython.yaml b/.ci_support/linux_ppc64le_numpy1.22python3.10.____cpython.yaml similarity index 96% rename from .ci_support/linux_ppc64le_numpy1.21python3.10.____cpython.yaml rename to .ci_support/linux_ppc64le_numpy1.22python3.10.____cpython.yaml index 61235591..ae29958b 100644 --- a/.ci_support/linux_ppc64le_numpy1.21python3.10.____cpython.yaml +++ b/.ci_support/linux_ppc64le_numpy1.22python3.10.____cpython.yaml @@ -17,7 +17,7 @@ docker_image: freetype: - '2' numpy: -- '1.21' +- '1.22' pin_run_as_build: python: min_pin: x.x @@ -35,4 +35,4 @@ zip_keys: - numpy - python_impl zlib: -- '1.2' +- '1' diff --git a/.ci_support/linux_ppc64le_numpy1.21python3.8.____cpython.yaml b/.ci_support/linux_ppc64le_numpy1.22python3.8.____cpython.yaml similarity index 96% rename from .ci_support/linux_ppc64le_numpy1.21python3.8.____cpython.yaml rename to .ci_support/linux_ppc64le_numpy1.22python3.8.____cpython.yaml index 89ac1234..7afc4d88 100644 --- a/.ci_support/linux_ppc64le_numpy1.21python3.8.____cpython.yaml +++ b/.ci_support/linux_ppc64le_numpy1.22python3.8.____cpython.yaml @@ -17,7 +17,7 @@ docker_image: freetype: - '2' numpy: -- '1.21' +- '1.22' pin_run_as_build: python: min_pin: x.x @@ -35,4 +35,4 @@ zip_keys: - numpy - python_impl zlib: -- '1.2' +- '1' diff --git a/.ci_support/linux_ppc64le_numpy1.21python3.9.____73_pypy.yaml b/.ci_support/linux_ppc64le_numpy1.22python3.9.____73_pypy.yaml similarity index 96% rename from .ci_support/linux_ppc64le_numpy1.21python3.9.____73_pypy.yaml rename to .ci_support/linux_ppc64le_numpy1.22python3.9.____73_pypy.yaml index 22f3aa7b..a666e430 100644 --- a/.ci_support/linux_ppc64le_numpy1.21python3.9.____73_pypy.yaml +++ b/.ci_support/linux_ppc64le_numpy1.22python3.9.____73_pypy.yaml @@ -17,7 +17,7 @@ docker_image: freetype: - '2' numpy: -- '1.21' +- '1.22' pin_run_as_build: python: min_pin: x.x @@ -35,4 +35,4 @@ zip_keys: - numpy - python_impl zlib: -- '1.2' +- '1' diff --git a/.ci_support/linux_ppc64le_numpy1.21python3.9.____cpython.yaml b/.ci_support/linux_ppc64le_numpy1.22python3.9.____cpython.yaml similarity index 96% rename from .ci_support/linux_ppc64le_numpy1.21python3.9.____cpython.yaml rename to .ci_support/linux_ppc64le_numpy1.22python3.9.____cpython.yaml index 295f54ec..4b8bcfcb 100644 --- a/.ci_support/linux_ppc64le_numpy1.21python3.9.____cpython.yaml +++ b/.ci_support/linux_ppc64le_numpy1.22python3.9.____cpython.yaml @@ -17,7 +17,7 @@ docker_image: freetype: - '2' numpy: -- '1.21' +- '1.22' pin_run_as_build: python: min_pin: x.x @@ -35,4 +35,4 @@ zip_keys: - numpy - python_impl zlib: -- '1.2' +- '1' diff --git a/.ci_support/linux_ppc64le_numpy1.23python3.11.____cpython.yaml b/.ci_support/linux_ppc64le_numpy1.23python3.11.____cpython.yaml index bb4e5c7c..31751566 100644 --- a/.ci_support/linux_ppc64le_numpy1.23python3.11.____cpython.yaml +++ b/.ci_support/linux_ppc64le_numpy1.23python3.11.____cpython.yaml @@ -35,4 +35,4 @@ zip_keys: - numpy - python_impl zlib: -- '1.2' +- '1' diff --git a/.ci_support/linux_ppc64le_numpy1.26python3.12.____cpython.yaml b/.ci_support/linux_ppc64le_numpy1.26python3.12.____cpython.yaml new file mode 100644 index 00000000..7a563726 --- /dev/null +++ b/.ci_support/linux_ppc64le_numpy1.26python3.12.____cpython.yaml @@ -0,0 +1,38 @@ +c_compiler: +- gcc +c_compiler_version: +- '12' +cdt_name: +- cos7 +channel_sources: +- conda-forge +channel_targets: +- conda-forge matplotlib_rc +cxx_compiler: +- gxx +cxx_compiler_version: +- '12' +docker_image: +- quay.io/condaforge/linux-anvil-cos7-x86_64 +freetype: +- '2' +numpy: +- '1.26' +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +python: +- 3.12.* *_cpython +python_impl: +- cpython +target_platform: +- linux-ppc64le +zip_keys: +- - c_compiler_version + - cxx_compiler_version +- - python + - numpy + - python_impl +zlib: +- '1' diff --git a/.ci_support/migrations/python311.yaml b/.ci_support/migrations/python311.yaml deleted file mode 100644 index d23a0fd2..00000000 --- a/.ci_support/migrations/python311.yaml +++ /dev/null @@ -1,37 +0,0 @@ -migrator_ts: 1666686085 -__migrator: - migration_number: 1 - operation: key_add - primary_key: python - ordering: - python: - - 3.6.* *_cpython - - 3.7.* *_cpython - - 3.8.* *_cpython - - 3.9.* *_cpython - - 3.10.* *_cpython - - 3.11.* *_cpython # new entry - - 3.6.* *_73_pypy - - 3.7.* *_73_pypy - - 3.8.* *_73_pypy - - 3.9.* *_73_pypy - paused: false - longterm: True - pr_limit: 10 - max_solver_attempts: 10 # this will make the bot retry "not solvable" stuff 10 times - exclude: - # this shouldn't attempt to modify the python feedstocks - - python - - pypy3.6 - - pypy-meta - - cross-python - - python_abi - exclude_pinned_pkgs: false - -python: - - 3.11.* *_cpython -# additional entries to add for zip_keys -numpy: - - 1.23 -python_impl: - - cpython diff --git a/.ci_support/osx_64_numpy1.21python3.8.____73_pypy.yaml b/.ci_support/osx_64_numpy1.21python3.8.____73_pypy.yaml deleted file mode 100644 index fb93d678..00000000 --- a/.ci_support/osx_64_numpy1.21python3.8.____73_pypy.yaml +++ /dev/null @@ -1,40 +0,0 @@ -MACOSX_DEPLOYMENT_TARGET: -- '10.12' -MACOSX_SDK_VERSION: -- '10.12' -c_compiler: -- clang -c_compiler_version: -- '15' -channel_sources: -- conda-forge -channel_targets: -- conda-forge matplotlib_rc -cxx_compiler: -- clangxx -cxx_compiler_version: -- '15' -freetype: -- '2' -macos_machine: -- x86_64-apple-darwin13.4.0 -numpy: -- '1.21' -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -python: -- 3.8.* *_73_pypy -python_impl: -- pypy -target_platform: -- osx-64 -zip_keys: -- - c_compiler_version - - cxx_compiler_version -- - python - - numpy - - python_impl -zlib: -- '1.2' diff --git a/.ci_support/osx_64_numpy1.21python3.10.____cpython.yaml b/.ci_support/osx_64_numpy1.22python3.10.____cpython.yaml similarity index 90% rename from .ci_support/osx_64_numpy1.21python3.10.____cpython.yaml rename to .ci_support/osx_64_numpy1.22python3.10.____cpython.yaml index 4ea79216..8118166e 100644 --- a/.ci_support/osx_64_numpy1.21python3.10.____cpython.yaml +++ b/.ci_support/osx_64_numpy1.22python3.10.____cpython.yaml @@ -1,11 +1,11 @@ MACOSX_DEPLOYMENT_TARGET: -- '10.12' +- '10.13' MACOSX_SDK_VERSION: -- '10.12' +- '10.13' c_compiler: - clang c_compiler_version: -- '15' +- '16' channel_sources: - conda-forge channel_targets: @@ -13,13 +13,13 @@ channel_targets: cxx_compiler: - clangxx cxx_compiler_version: -- '15' +- '16' freetype: - '2' macos_machine: - x86_64-apple-darwin13.4.0 numpy: -- '1.21' +- '1.22' pin_run_as_build: python: min_pin: x.x @@ -37,4 +37,4 @@ zip_keys: - numpy - python_impl zlib: -- '1.2' +- '1' diff --git a/.ci_support/osx_64_numpy1.21python3.8.____cpython.yaml b/.ci_support/osx_64_numpy1.22python3.8.____cpython.yaml similarity index 90% rename from .ci_support/osx_64_numpy1.21python3.8.____cpython.yaml rename to .ci_support/osx_64_numpy1.22python3.8.____cpython.yaml index c24278ca..02742abe 100644 --- a/.ci_support/osx_64_numpy1.21python3.8.____cpython.yaml +++ b/.ci_support/osx_64_numpy1.22python3.8.____cpython.yaml @@ -1,11 +1,11 @@ MACOSX_DEPLOYMENT_TARGET: -- '10.12' +- '10.13' MACOSX_SDK_VERSION: -- '10.12' +- '10.13' c_compiler: - clang c_compiler_version: -- '15' +- '16' channel_sources: - conda-forge channel_targets: @@ -13,13 +13,13 @@ channel_targets: cxx_compiler: - clangxx cxx_compiler_version: -- '15' +- '16' freetype: - '2' macos_machine: - x86_64-apple-darwin13.4.0 numpy: -- '1.21' +- '1.22' pin_run_as_build: python: min_pin: x.x @@ -37,4 +37,4 @@ zip_keys: - numpy - python_impl zlib: -- '1.2' +- '1' diff --git a/.ci_support/osx_64_numpy1.21python3.9.____73_pypy.yaml b/.ci_support/osx_64_numpy1.22python3.9.____73_pypy.yaml similarity index 90% rename from .ci_support/osx_64_numpy1.21python3.9.____73_pypy.yaml rename to .ci_support/osx_64_numpy1.22python3.9.____73_pypy.yaml index caa451f1..7f579c67 100644 --- a/.ci_support/osx_64_numpy1.21python3.9.____73_pypy.yaml +++ b/.ci_support/osx_64_numpy1.22python3.9.____73_pypy.yaml @@ -1,11 +1,11 @@ MACOSX_DEPLOYMENT_TARGET: -- '10.12' +- '10.13' MACOSX_SDK_VERSION: -- '10.12' +- '10.13' c_compiler: - clang c_compiler_version: -- '15' +- '16' channel_sources: - conda-forge channel_targets: @@ -13,13 +13,13 @@ channel_targets: cxx_compiler: - clangxx cxx_compiler_version: -- '15' +- '16' freetype: - '2' macos_machine: - x86_64-apple-darwin13.4.0 numpy: -- '1.21' +- '1.22' pin_run_as_build: python: min_pin: x.x @@ -37,4 +37,4 @@ zip_keys: - numpy - python_impl zlib: -- '1.2' +- '1' diff --git a/.ci_support/osx_64_numpy1.21python3.9.____cpython.yaml b/.ci_support/osx_64_numpy1.22python3.9.____cpython.yaml similarity index 90% rename from .ci_support/osx_64_numpy1.21python3.9.____cpython.yaml rename to .ci_support/osx_64_numpy1.22python3.9.____cpython.yaml index 343432f7..3e6a5c3b 100644 --- a/.ci_support/osx_64_numpy1.21python3.9.____cpython.yaml +++ b/.ci_support/osx_64_numpy1.22python3.9.____cpython.yaml @@ -1,11 +1,11 @@ MACOSX_DEPLOYMENT_TARGET: -- '10.12' +- '10.13' MACOSX_SDK_VERSION: -- '10.12' +- '10.13' c_compiler: - clang c_compiler_version: -- '15' +- '16' channel_sources: - conda-forge channel_targets: @@ -13,13 +13,13 @@ channel_targets: cxx_compiler: - clangxx cxx_compiler_version: -- '15' +- '16' freetype: - '2' macos_machine: - x86_64-apple-darwin13.4.0 numpy: -- '1.21' +- '1.22' pin_run_as_build: python: min_pin: x.x @@ -37,4 +37,4 @@ zip_keys: - numpy - python_impl zlib: -- '1.2' +- '1' diff --git a/.ci_support/osx_64_numpy1.23python3.11.____cpython.yaml b/.ci_support/osx_64_numpy1.23python3.11.____cpython.yaml index 1e07c6dc..00d79245 100644 --- a/.ci_support/osx_64_numpy1.23python3.11.____cpython.yaml +++ b/.ci_support/osx_64_numpy1.23python3.11.____cpython.yaml @@ -1,11 +1,11 @@ MACOSX_DEPLOYMENT_TARGET: -- '10.12' +- '10.13' MACOSX_SDK_VERSION: -- '10.12' +- '10.13' c_compiler: - clang c_compiler_version: -- '15' +- '16' channel_sources: - conda-forge channel_targets: @@ -13,7 +13,7 @@ channel_targets: cxx_compiler: - clangxx cxx_compiler_version: -- '15' +- '16' freetype: - '2' macos_machine: @@ -37,4 +37,4 @@ zip_keys: - numpy - python_impl zlib: -- '1.2' +- '1' diff --git a/.ci_support/osx_64_numpy1.26python3.12.____cpython.yaml b/.ci_support/osx_64_numpy1.26python3.12.____cpython.yaml new file mode 100644 index 00000000..91e80545 --- /dev/null +++ b/.ci_support/osx_64_numpy1.26python3.12.____cpython.yaml @@ -0,0 +1,40 @@ +MACOSX_DEPLOYMENT_TARGET: +- '10.13' +MACOSX_SDK_VERSION: +- '10.13' +c_compiler: +- clang +c_compiler_version: +- '16' +channel_sources: +- conda-forge +channel_targets: +- conda-forge matplotlib_rc +cxx_compiler: +- clangxx +cxx_compiler_version: +- '16' +freetype: +- '2' +macos_machine: +- x86_64-apple-darwin13.4.0 +numpy: +- '1.26' +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +python: +- 3.12.* *_cpython +python_impl: +- cpython +target_platform: +- osx-64 +zip_keys: +- - c_compiler_version + - cxx_compiler_version +- - python + - numpy + - python_impl +zlib: +- '1' diff --git a/.ci_support/osx_arm64_numpy1.21python3.10.____cpython.yaml b/.ci_support/osx_arm64_numpy1.22python3.10.____cpython.yaml similarity index 89% rename from .ci_support/osx_arm64_numpy1.21python3.10.____cpython.yaml rename to .ci_support/osx_arm64_numpy1.22python3.10.____cpython.yaml index 0ea2a16e..b74ac1b7 100644 --- a/.ci_support/osx_arm64_numpy1.21python3.10.____cpython.yaml +++ b/.ci_support/osx_arm64_numpy1.22python3.10.____cpython.yaml @@ -1,9 +1,11 @@ MACOSX_DEPLOYMENT_TARGET: - '11.0' +MACOSX_SDK_VERSION: +- '11.0' c_compiler: - clang c_compiler_version: -- '15' +- '16' channel_sources: - conda-forge channel_targets: @@ -11,13 +13,13 @@ channel_targets: cxx_compiler: - clangxx cxx_compiler_version: -- '15' +- '16' freetype: - '2' macos_machine: - arm64-apple-darwin20.0.0 numpy: -- '1.21' +- '1.22' pin_run_as_build: python: min_pin: x.x @@ -35,4 +37,4 @@ zip_keys: - numpy - python_impl zlib: -- '1.2' +- '1' diff --git a/.ci_support/osx_arm64_numpy1.21python3.8.____cpython.yaml b/.ci_support/osx_arm64_numpy1.22python3.8.____cpython.yaml similarity index 89% rename from .ci_support/osx_arm64_numpy1.21python3.8.____cpython.yaml rename to .ci_support/osx_arm64_numpy1.22python3.8.____cpython.yaml index 90d92057..a4786603 100644 --- a/.ci_support/osx_arm64_numpy1.21python3.8.____cpython.yaml +++ b/.ci_support/osx_arm64_numpy1.22python3.8.____cpython.yaml @@ -1,9 +1,11 @@ MACOSX_DEPLOYMENT_TARGET: - '11.0' +MACOSX_SDK_VERSION: +- '11.0' c_compiler: - clang c_compiler_version: -- '15' +- '16' channel_sources: - conda-forge channel_targets: @@ -11,13 +13,13 @@ channel_targets: cxx_compiler: - clangxx cxx_compiler_version: -- '15' +- '16' freetype: - '2' macos_machine: - arm64-apple-darwin20.0.0 numpy: -- '1.21' +- '1.22' pin_run_as_build: python: min_pin: x.x @@ -35,4 +37,4 @@ zip_keys: - numpy - python_impl zlib: -- '1.2' +- '1' diff --git a/.ci_support/osx_arm64_numpy1.21python3.9.____cpython.yaml b/.ci_support/osx_arm64_numpy1.22python3.9.____cpython.yaml similarity index 89% rename from .ci_support/osx_arm64_numpy1.21python3.9.____cpython.yaml rename to .ci_support/osx_arm64_numpy1.22python3.9.____cpython.yaml index f65aaa70..afc04ccf 100644 --- a/.ci_support/osx_arm64_numpy1.21python3.9.____cpython.yaml +++ b/.ci_support/osx_arm64_numpy1.22python3.9.____cpython.yaml @@ -1,9 +1,11 @@ MACOSX_DEPLOYMENT_TARGET: - '11.0' +MACOSX_SDK_VERSION: +- '11.0' c_compiler: - clang c_compiler_version: -- '15' +- '16' channel_sources: - conda-forge channel_targets: @@ -11,13 +13,13 @@ channel_targets: cxx_compiler: - clangxx cxx_compiler_version: -- '15' +- '16' freetype: - '2' macos_machine: - arm64-apple-darwin20.0.0 numpy: -- '1.21' +- '1.22' pin_run_as_build: python: min_pin: x.x @@ -35,4 +37,4 @@ zip_keys: - numpy - python_impl zlib: -- '1.2' +- '1' diff --git a/.ci_support/osx_arm64_numpy1.23python3.11.____cpython.yaml b/.ci_support/osx_arm64_numpy1.23python3.11.____cpython.yaml index c28d327f..36388ae7 100644 --- a/.ci_support/osx_arm64_numpy1.23python3.11.____cpython.yaml +++ b/.ci_support/osx_arm64_numpy1.23python3.11.____cpython.yaml @@ -1,9 +1,11 @@ MACOSX_DEPLOYMENT_TARGET: - '11.0' +MACOSX_SDK_VERSION: +- '11.0' c_compiler: - clang c_compiler_version: -- '15' +- '16' channel_sources: - conda-forge channel_targets: @@ -11,7 +13,7 @@ channel_targets: cxx_compiler: - clangxx cxx_compiler_version: -- '15' +- '16' freetype: - '2' macos_machine: @@ -35,4 +37,4 @@ zip_keys: - numpy - python_impl zlib: -- '1.2' +- '1' diff --git a/.ci_support/osx_arm64_numpy1.26python3.12.____cpython.yaml b/.ci_support/osx_arm64_numpy1.26python3.12.____cpython.yaml new file mode 100644 index 00000000..5f045123 --- /dev/null +++ b/.ci_support/osx_arm64_numpy1.26python3.12.____cpython.yaml @@ -0,0 +1,40 @@ +MACOSX_DEPLOYMENT_TARGET: +- '11.0' +MACOSX_SDK_VERSION: +- '11.0' +c_compiler: +- clang +c_compiler_version: +- '16' +channel_sources: +- conda-forge +channel_targets: +- conda-forge matplotlib_rc +cxx_compiler: +- clangxx +cxx_compiler_version: +- '16' +freetype: +- '2' +macos_machine: +- arm64-apple-darwin20.0.0 +numpy: +- '1.26' +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +python: +- 3.12.* *_cpython +python_impl: +- cpython +target_platform: +- osx-arm64 +zip_keys: +- - c_compiler_version + - cxx_compiler_version +- - python + - numpy + - python_impl +zlib: +- '1' diff --git a/.ci_support/win_64_numpy1.21python3.10.____cpython.yaml b/.ci_support/win_64_numpy1.22python3.10.____cpython.yaml similarity index 95% rename from .ci_support/win_64_numpy1.21python3.10.____cpython.yaml rename to .ci_support/win_64_numpy1.22python3.10.____cpython.yaml index d0c2292c..203091da 100644 --- a/.ci_support/win_64_numpy1.21python3.10.____cpython.yaml +++ b/.ci_support/win_64_numpy1.22python3.10.____cpython.yaml @@ -9,7 +9,7 @@ cxx_compiler: freetype: - '2' numpy: -- '1.21' +- '1.22' pin_run_as_build: python: min_pin: x.x @@ -25,4 +25,4 @@ zip_keys: - numpy - python_impl zlib: -- '1.2' +- '1' diff --git a/.ci_support/win_64_numpy1.21python3.8.____cpython.yaml b/.ci_support/win_64_numpy1.22python3.8.____cpython.yaml similarity index 95% rename from .ci_support/win_64_numpy1.21python3.8.____cpython.yaml rename to .ci_support/win_64_numpy1.22python3.8.____cpython.yaml index 45b7e8f4..956ca2d7 100644 --- a/.ci_support/win_64_numpy1.21python3.8.____cpython.yaml +++ b/.ci_support/win_64_numpy1.22python3.8.____cpython.yaml @@ -9,7 +9,7 @@ cxx_compiler: freetype: - '2' numpy: -- '1.21' +- '1.22' pin_run_as_build: python: min_pin: x.x @@ -25,4 +25,4 @@ zip_keys: - numpy - python_impl zlib: -- '1.2' +- '1' diff --git a/.ci_support/win_64_numpy1.21python3.9.____73_pypy.yaml b/.ci_support/win_64_numpy1.22python3.9.____73_pypy.yaml similarity index 95% rename from .ci_support/win_64_numpy1.21python3.9.____73_pypy.yaml rename to .ci_support/win_64_numpy1.22python3.9.____73_pypy.yaml index 14d84d27..40c86ac4 100644 --- a/.ci_support/win_64_numpy1.21python3.9.____73_pypy.yaml +++ b/.ci_support/win_64_numpy1.22python3.9.____73_pypy.yaml @@ -9,7 +9,7 @@ cxx_compiler: freetype: - '2' numpy: -- '1.21' +- '1.22' pin_run_as_build: python: min_pin: x.x @@ -25,4 +25,4 @@ zip_keys: - numpy - python_impl zlib: -- '1.2' +- '1' diff --git a/.ci_support/win_64_numpy1.21python3.9.____cpython.yaml b/.ci_support/win_64_numpy1.22python3.9.____cpython.yaml similarity index 95% rename from .ci_support/win_64_numpy1.21python3.9.____cpython.yaml rename to .ci_support/win_64_numpy1.22python3.9.____cpython.yaml index 72e65a6a..78b2c77e 100644 --- a/.ci_support/win_64_numpy1.21python3.9.____cpython.yaml +++ b/.ci_support/win_64_numpy1.22python3.9.____cpython.yaml @@ -9,7 +9,7 @@ cxx_compiler: freetype: - '2' numpy: -- '1.21' +- '1.22' pin_run_as_build: python: min_pin: x.x @@ -25,4 +25,4 @@ zip_keys: - numpy - python_impl zlib: -- '1.2' +- '1' diff --git a/.ci_support/win_64_numpy1.23python3.11.____cpython.yaml b/.ci_support/win_64_numpy1.23python3.11.____cpython.yaml index 22caa20a..76fe5467 100644 --- a/.ci_support/win_64_numpy1.23python3.11.____cpython.yaml +++ b/.ci_support/win_64_numpy1.23python3.11.____cpython.yaml @@ -25,4 +25,4 @@ zip_keys: - numpy - python_impl zlib: -- '1.2' +- '1' diff --git a/.ci_support/win_64_numpy1.21python3.8.____73_pypy.yaml b/.ci_support/win_64_numpy1.26python3.12.____cpython.yaml similarity index 87% rename from .ci_support/win_64_numpy1.21python3.8.____73_pypy.yaml rename to .ci_support/win_64_numpy1.26python3.12.____cpython.yaml index fedd13d1..d42aba05 100644 --- a/.ci_support/win_64_numpy1.21python3.8.____73_pypy.yaml +++ b/.ci_support/win_64_numpy1.26python3.12.____cpython.yaml @@ -9,15 +9,15 @@ cxx_compiler: freetype: - '2' numpy: -- '1.21' +- '1.26' pin_run_as_build: python: min_pin: x.x max_pin: x.x python: -- 3.8.* *_73_pypy +- 3.12.* *_cpython python_impl: -- pypy +- cpython target_platform: - win-64 zip_keys: @@ -25,4 +25,4 @@ zip_keys: - numpy - python_impl zlib: -- '1.2' +- '1' diff --git a/.gitattributes b/.gitattributes index 7f327638..18f114a1 100644 --- a/.gitattributes +++ b/.gitattributes @@ -20,8 +20,8 @@ bld.bat text eol=crlf .travis.yml linguist-generated=true .scripts/* linguist-generated=true .woodpecker.yml linguist-generated=true -LICENSE.txt linguist-generated=true -README.md linguist-generated=true +/LICENSE.txt linguist-generated=true +/README.md linguist-generated=true azure-pipelines.yml linguist-generated=true build-locally.py linguist-generated=true shippable.yml linguist-generated=true diff --git a/.gitignore b/.gitignore index c89ecb7d..179afe55 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,24 @@ -*.pyc +# User content belongs under recipe/. +# Feedstock configuration goes in `conda-forge.yml` +# Everything else is managed by the conda-smithy rerender process. +# Please do not modify + +# Ignore all files and folders in root +* +!/conda-forge.yml + +# Don't ignore any files/folders if the parent folder is 'un-ignored' +# This also avoids warnings when adding an already-checked file with an ignored parent. +!/**/ +# Don't ignore any files/folders recursively in the following folders +!/recipe/** +!/.ci_support/** -build_artifacts +# Since we ignore files/folders recursively, any folders inside +# build_artifacts gets ignored which trips some build systems. +# To avoid that we 'un-ignore' all files/folders recursively +# and only ignore the root build_artifacts folder. +!/build_artifacts/** +/build_artifacts + +*.pyc diff --git a/.scripts/build_steps.sh b/.scripts/build_steps.sh index 1682b66b..a147fa70 100755 --- a/.scripts/build_steps.sh +++ b/.scripts/build_steps.sh @@ -28,14 +28,15 @@ conda-build: pkgs_dirs: - ${FEEDSTOCK_ROOT}/build_artifacts/pkg_cache - /opt/conda/pkgs +solver: libmamba CONDARC +export CONDA_LIBMAMBA_SOLVER_NO_CHANNELS_FROM_INSTALLED=1 - -mamba install --update-specs --yes --quiet --channel conda-forge \ - conda-build pip boa conda-forge-ci-setup=3 -mamba update --update-specs --yes --quiet --channel conda-forge \ - conda-build pip boa conda-forge-ci-setup=3 +mamba install --update-specs --yes --quiet --channel conda-forge --strict-channel-priority \ + pip mamba conda-build conda-forge-ci-setup=4 "conda-build>=24.1" +mamba update --update-specs --yes --quiet --channel conda-forge --strict-channel-priority \ + pip mamba conda-build conda-forge-ci-setup=4 "conda-build>=24.1" # set up the condarc setup_conda_rc "${FEEDSTOCK_ROOT}" "${RECIPE_ROOT}" "${CONFIG_FILE}" @@ -75,9 +76,17 @@ if [[ "${BUILD_WITH_CONDA_DEBUG:-0}" == 1 ]]; then # Drop into an interactive shell /bin/bash else - conda mambabuild "${RECIPE_ROOT}" -m "${CI_SUPPORT}/${CONFIG}.yaml" \ + conda-build "${RECIPE_ROOT}" -m "${CI_SUPPORT}/${CONFIG}.yaml" \ --suppress-variables ${EXTRA_CB_OPTIONS:-} \ - --clobber-file "${CI_SUPPORT}/clobber_${CONFIG}.yaml" + --clobber-file "${CI_SUPPORT}/clobber_${CONFIG}.yaml" \ + --extra-meta flow_run_id="${flow_run_id:-}" remote_url="${remote_url:-}" sha="${sha:-}" + + ( startgroup "Inspecting artifacts" ) 2> /dev/null + + # inspect_artifacts was only added in conda-forge-ci-setup 4.6.0 + command -v inspect_artifacts >/dev/null 2>&1 && inspect_artifacts || echo "inspect_artifacts needs conda-forge-ci-setup >=4.6.0" + + ( endgroup "Inspecting artifacts" ) 2> /dev/null ( startgroup "Validating outputs" ) 2> /dev/null validate_recipe_outputs "${FEEDSTOCK_NAME}" diff --git a/.scripts/logging_utils.sh b/.scripts/logging_utils.sh index 57bc95c2..aff009f0 100644 --- a/.scripts/logging_utils.sh +++ b/.scripts/logging_utils.sh @@ -12,7 +12,7 @@ function startgroup { echo "##[group]$1";; travis ) echo "$1" - echo -en 'travis_fold:start:'"${1// /}"'\\r';; + echo -en 'travis_fold:start:'"${1// /}"'\r';; github_actions ) echo "::group::$1";; * ) @@ -28,7 +28,7 @@ function endgroup { azure ) echo "##[endgroup]";; travis ) - echo -en 'travis_fold:end:'"${1// /}"'\\r';; + echo -en 'travis_fold:end:'"${1// /}"'\r';; github_actions ) echo "::endgroup::";; esac diff --git a/.scripts/run_docker_build.sh b/.scripts/run_docker_build.sh index 92362398..00f377a8 100755 --- a/.scripts/run_docker_build.sh +++ b/.scripts/run_docker_build.sh @@ -21,6 +21,12 @@ if [ -z ${FEEDSTOCK_NAME} ]; then export FEEDSTOCK_NAME=$(basename ${FEEDSTOCK_ROOT}) fi +if [[ "${sha:-}" == "" ]]; then + pushd "${FEEDSTOCK_ROOT}" + sha=$(git rev-parse HEAD) + popd +fi + docker info # In order for the conda-build process in the container to write to the mounted @@ -91,6 +97,9 @@ docker run ${DOCKER_RUN_ARGS} \ -e CPU_COUNT \ -e BUILD_WITH_CONDA_DEBUG \ -e BUILD_OUTPUT_ID \ + -e flow_run_id \ + -e remote_url \ + -e sha \ -e BINSTAR_TOKEN \ -e FEEDSTOCK_TOKEN \ -e STAGING_BINSTAR_TOKEN \ diff --git a/.scripts/run_osx_build.sh b/.scripts/run_osx_build.sh index 3969edf3..ba0c8791 100755 --- a/.scripts/run_osx_build.sh +++ b/.scripts/run_osx_build.sh @@ -22,11 +22,13 @@ bash $MINIFORGE_FILE -b -p ${MINIFORGE_HOME} source ${MINIFORGE_HOME}/etc/profile.d/conda.sh conda activate base +export CONDA_SOLVER="libmamba" +export CONDA_LIBMAMBA_SOLVER_NO_CHANNELS_FROM_INSTALLED=1 -mamba install --update-specs --quiet --yes --channel conda-forge \ - conda-build pip boa conda-forge-ci-setup=3 -mamba update --update-specs --yes --quiet --channel conda-forge \ - conda-build pip boa conda-forge-ci-setup=3 +mamba install --update-specs --quiet --yes --channel conda-forge --strict-channel-priority \ + pip mamba conda-build conda-forge-ci-setup=4 "conda-build>=24.1" +mamba update --update-specs --yes --quiet --channel conda-forge --strict-channel-priority \ + pip mamba conda-build conda-forge-ci-setup=4 "conda-build>=24.1" @@ -45,6 +47,10 @@ else echo -e "\n\nNot mangling homebrew as we are not running in CI" fi +if [[ "${sha:-}" == "" ]]; then + sha=$(git rev-parse HEAD) +fi + echo -e "\n\nRunning the build setup script." source run_conda_forge_build_setup @@ -75,9 +81,17 @@ else EXTRA_CB_OPTIONS="${EXTRA_CB_OPTIONS:-} --no-test" fi - conda mambabuild ./recipe -m ./.ci_support/${CONFIG}.yaml \ + conda-build ./recipe -m ./.ci_support/${CONFIG}.yaml \ --suppress-variables ${EXTRA_CB_OPTIONS:-} \ - --clobber-file ./.ci_support/clobber_${CONFIG}.yaml + --clobber-file ./.ci_support/clobber_${CONFIG}.yaml \ + --extra-meta flow_run_id="$flow_run_id" remote_url="$remote_url" sha="$sha" + + ( startgroup "Inspecting artifacts" ) 2> /dev/null + + # inspect_artifacts was only added in conda-forge-ci-setup 4.6.0 + command -v inspect_artifacts >/dev/null 2>&1 && inspect_artifacts || echo "inspect_artifacts needs conda-forge-ci-setup >=4.6.0" + + ( endgroup "Inspecting artifacts" ) 2> /dev/null ( startgroup "Validating outputs" ) 2> /dev/null validate_recipe_outputs "${FEEDSTOCK_NAME}" diff --git a/.scripts/run_win_build.bat b/.scripts/run_win_build.bat new file mode 100755 index 00000000..65650bf2 --- /dev/null +++ b/.scripts/run_win_build.bat @@ -0,0 +1,130 @@ +:: PLEASE NOTE: This script has been automatically generated by conda-smithy. Any changes here +:: will be lost next time ``conda smithy rerender`` is run. If you would like to make permanent +:: changes to this script, consider a proposal to conda-smithy so that other feedstocks can also +:: benefit from the improvement. + +:: Note: we assume a Miniforge installation is available + +:: INPUTS (required environment variables) +:: CONFIG: name of the .ci_support/*.yaml file for this job +:: CI: azure, github_actions, or unset +:: UPLOAD_PACKAGES: true or false +:: UPLOAD_ON_BRANCH: true or false + +setlocal enableextensions enabledelayedexpansion + +call :start_group "Configuring conda" + +:: Activate the base conda environment +call activate base +:: Configure the solver +set "CONDA_SOLVER=libmamba" +if !errorlevel! neq 0 exit /b !errorlevel! +set "CONDA_LIBMAMBA_SOLVER_NO_CHANNELS_FROM_INSTALLED=1" + +:: Provision the necessary dependencies to build the recipe later +echo Installing dependencies +mamba.exe install "python=3.10" pip mamba conda-build conda-forge-ci-setup=4 "conda-build>=24.1" -c conda-forge --strict-channel-priority --yes +if !errorlevel! neq 0 exit /b !errorlevel! + +:: Set basic configuration +echo Setting up configuration +setup_conda_rc .\ ".\recipe" .\.ci_support\%CONFIG%.yaml +if !errorlevel! neq 0 exit /b !errorlevel! +echo Running build setup +CALL run_conda_forge_build_setup + + +if !errorlevel! neq 0 exit /b !errorlevel! + +if EXIST LICENSE.txt ( + echo Copying feedstock license + copy LICENSE.txt "recipe\\recipe-scripts-license.txt" +) +if NOT [%HOST_PLATFORM%] == [%BUILD_PLATFORM%] ( + if [%CROSSCOMPILING_EMULATOR%] == [] ( + set "EXTRA_CB_OPTIONS=%EXTRA_CB_OPTIONS% --no-test" + ) +) + +if NOT [%flow_run_id%] == [] ( + set "EXTRA_CB_OPTIONS=%EXTRA_CB_OPTIONS% --extra-meta flow_run_id=%flow_run_id% remote_url=%remote_url% sha=%sha%" +) + +call :end_group + +:: Build the recipe +echo Building recipe +conda-build.exe "recipe" -m .ci_support\%CONFIG%.yaml --suppress-variables %EXTRA_CB_OPTIONS% +if !errorlevel! neq 0 exit /b !errorlevel! + +call :start_group "Inspecting artifacts" +:: inspect_artifacts was only added in conda-forge-ci-setup 4.6.0 +WHERE inspect_artifacts >nul 2>nul && inspect_artifacts || echo "inspect_artifacts needs conda-forge-ci-setup >=4.6.0" +call :end_group + +:: Prepare some environment variables for the upload step +if /i "%CI%" == "github_actions" ( + set "FEEDSTOCK_NAME=%GITHUB_REPOSITORY:*/=%" + set "GIT_BRANCH=%GITHUB_REF:refs/heads/=%" + if /i "%GITHUB_EVENT_NAME%" == "pull_request" ( + set "IS_PR_BUILD=True" + ) else ( + set "IS_PR_BUILD=False" + ) + set "TEMP=%RUNNER_TEMP%" +) +if /i "%CI%" == "azure" ( + set "FEEDSTOCK_NAME=%BUILD_REPOSITORY_NAME:*/=%" + set "GIT_BRANCH=%BUILD_SOURCEBRANCHNAME%" + if /i "%BUILD_REASON%" == "PullRequest" ( + set "IS_PR_BUILD=True" + ) else ( + set "IS_PR_BUILD=False" + ) + set "TEMP=%UPLOAD_TEMP%" +) + +:: Validate +call :start_group "Validating outputs" +validate_recipe_outputs "%FEEDSTOCK_NAME%" +if !errorlevel! neq 0 exit /b !errorlevel! +call :end_group + +if /i "%UPLOAD_PACKAGES%" == "true" ( + if /i "%IS_PR_BUILD%" == "false" ( + call :start_group "Uploading packages" + if not exist "%TEMP%\" md "%TEMP%" + set "TMP=%TEMP%" + upload_package --validate --feedstock-name="%FEEDSTOCK_NAME%" .\ ".\recipe" .ci_support\%CONFIG%.yaml + if !errorlevel! neq 0 exit /b !errorlevel! + call :end_group + ) +) + +exit + +:: Logging subroutines + +:start_group +if /i "%CI%" == "github_actions" ( + echo ::group::%~1 + exit /b +) +if /i "%CI%" == "azure" ( + echo ##[group]%~1 + exit /b +) +echo %~1 +exit /b + +:end_group +if /i "%CI%" == "github_actions" ( + echo ::endgroup:: + exit /b +) +if /i "%CI%" == "azure" ( + echo ##[endgroup] + exit /b +) +exit /b \ No newline at end of file diff --git a/README.md b/README.md index 5517ad38..0c479bf7 100644 --- a/README.md +++ b/README.md @@ -38,38 +38,31 @@ Current build status - + - + - + - + - - - @@ -80,38 +73,38 @@ Current build status - + - + - + - + - + @@ -122,38 +115,38 @@ Current build status - + - + - + - + - + @@ -164,38 +157,38 @@ Current build status - + - + - + - + - + @@ -206,24 +199,31 @@ Current build status - + - + - + + + + @@ -234,38 +234,38 @@ Current build status - + - + - + - + - + @@ -275,6 +275,13 @@ Current build status variant + + +
VariantStatus
linux_64_numpy1.21python3.10.____cpythonlinux_64_numpy1.22python3.10.____cpython - variant + variant
linux_64_numpy1.21python3.8.____73_pypylinux_64_numpy1.22python3.8.____cpython - variant + variant
linux_64_numpy1.21python3.8.____cpythonlinux_64_numpy1.22python3.9.____73_pypy - variant + variant
linux_64_numpy1.21python3.9.____73_pypylinux_64_numpy1.22python3.9.____cpython - variant - -
linux_64_numpy1.21python3.9.____cpython - - variant + variant
linux_aarch64_numpy1.21python3.10.____cpythonlinux_64_numpy1.26python3.12.____cpython - variant + variant
linux_aarch64_numpy1.21python3.8.____73_pypylinux_aarch64_numpy1.22python3.10.____cpython - variant + variant
linux_aarch64_numpy1.21python3.8.____cpythonlinux_aarch64_numpy1.22python3.8.____cpython - variant + variant
linux_aarch64_numpy1.21python3.9.____73_pypylinux_aarch64_numpy1.22python3.9.____73_pypy - variant + variant
linux_aarch64_numpy1.21python3.9.____cpythonlinux_aarch64_numpy1.22python3.9.____cpython - variant + variant
linux_ppc64le_numpy1.21python3.10.____cpythonlinux_aarch64_numpy1.26python3.12.____cpython - variant + variant
linux_ppc64le_numpy1.21python3.8.____73_pypylinux_ppc64le_numpy1.22python3.10.____cpython - variant + variant
linux_ppc64le_numpy1.21python3.8.____cpythonlinux_ppc64le_numpy1.22python3.8.____cpython - variant + variant
linux_ppc64le_numpy1.21python3.9.____73_pypylinux_ppc64le_numpy1.22python3.9.____73_pypy - variant + variant
linux_ppc64le_numpy1.21python3.9.____cpythonlinux_ppc64le_numpy1.22python3.9.____cpython - variant + variant
osx_64_numpy1.21python3.10.____cpythonlinux_ppc64le_numpy1.26python3.12.____cpython - variant + variant
osx_64_numpy1.21python3.8.____73_pypyosx_64_numpy1.22python3.10.____cpython - variant + variant
osx_64_numpy1.21python3.8.____cpythonosx_64_numpy1.22python3.8.____cpython - variant + variant
osx_64_numpy1.21python3.9.____73_pypyosx_64_numpy1.22python3.9.____73_pypy - variant + variant
osx_64_numpy1.21python3.9.____cpythonosx_64_numpy1.22python3.9.____cpython - variant + variant
osx_arm64_numpy1.21python3.10.____cpythonosx_64_numpy1.26python3.12.____cpython - variant + variant
osx_arm64_numpy1.21python3.8.____cpythonosx_arm64_numpy1.22python3.10.____cpython - variant + variant
osx_arm64_numpy1.21python3.9.____cpythonosx_arm64_numpy1.22python3.8.____cpython - variant + variant + +
osx_arm64_numpy1.22python3.9.____cpython + + variant
win_64_numpy1.21python3.10.____cpythonosx_arm64_numpy1.26python3.12.____cpython - variant + variant
win_64_numpy1.21python3.8.____73_pypywin_64_numpy1.22python3.10.____cpython - variant + variant
win_64_numpy1.21python3.8.____cpythonwin_64_numpy1.22python3.8.____cpython - variant + variant
win_64_numpy1.21python3.9.____73_pypywin_64_numpy1.22python3.9.____73_pypy - variant + variant
win_64_numpy1.21python3.9.____cpythonwin_64_numpy1.22python3.9.____cpython - variant + variant
win_64_numpy1.26python3.12.____cpython + + variant + +
@@ -294,14 +301,14 @@ Current release info Installing matplotlib-suite =========================== -Installing `matplotlib-suite` from the `conda-forge` channel can be achieved by adding `conda-forge` to your channels with: +Installing `matplotlib-suite` from the `conda-forge/label/matplotlib_rc` channel can be achieved by adding `conda-forge/label/matplotlib_rc` to your channels with: ``` -conda config --add channels conda-forge +conda config --add channels conda-forge/label/matplotlib_rc conda config --set channel_priority strict ``` -Once the `conda-forge` channel has been enabled, `matplotlib, matplotlib-base` can be installed with `conda`: +Once the `conda-forge/label/matplotlib_rc` channel has been enabled, `matplotlib, matplotlib-base` can be installed with `conda`: ``` conda install matplotlib matplotlib-base @@ -316,26 +323,26 @@ mamba install matplotlib matplotlib-base It is possible to list all of the versions of `matplotlib` available on your platform with `conda`: ``` -conda search matplotlib --channel conda-forge +conda search matplotlib --channel conda-forge/label/matplotlib_rc ``` or with `mamba`: ``` -mamba search matplotlib --channel conda-forge +mamba search matplotlib --channel conda-forge/label/matplotlib_rc ``` Alternatively, `mamba repoquery` may provide more information: ``` # Search all versions available on your platform: -mamba repoquery search matplotlib --channel conda-forge +mamba repoquery search matplotlib --channel conda-forge/label/matplotlib_rc # List packages depending on `matplotlib`: -mamba repoquery whoneeds matplotlib --channel conda-forge +mamba repoquery whoneeds matplotlib --channel conda-forge/label/matplotlib_rc # List dependencies of `matplotlib`: -mamba repoquery depends matplotlib --channel conda-forge +mamba repoquery depends matplotlib --channel conda-forge/label/matplotlib_rc ``` @@ -357,7 +364,7 @@ available continuous integration services. Thanks to the awesome service provide [CircleCI](https://circleci.com/), [AppVeyor](https://www.appveyor.com/), [Drone](https://cloud.drone.io/welcome), and [TravisCI](https://travis-ci.com/) it is possible to build and upload installable packages to the -[conda-forge](https://anaconda.org/conda-forge) [Anaconda-Cloud](https://anaconda.org/) +[conda-forge](https://anaconda.org/conda-forge) [anaconda.org](https://anaconda.org/) channel for Linux, Windows and OSX respectively. To manage the continuous integration and simplify feedstock maintenance diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 6b346f50..e5306da9 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -4,5 +4,5 @@ jobs: - template: ./.azure-pipelines/azure-pipelines-linux.yml - - template: ./.azure-pipelines/azure-pipelines-win.yml - - template: ./.azure-pipelines/azure-pipelines-osx.yml \ No newline at end of file + - template: ./.azure-pipelines/azure-pipelines-osx.yml + - template: ./.azure-pipelines/azure-pipelines-win.yml \ No newline at end of file diff --git a/build-locally.py b/build-locally.py index 3f4b7a79..e0d408d0 100755 --- a/build-locally.py +++ b/build-locally.py @@ -64,8 +64,9 @@ def verify_config(ns): elif ns.config.startswith("osx"): if "OSX_SDK_DIR" not in os.environ: raise RuntimeError( - "Need OSX_SDK_DIR env variable set. Run 'export OSX_SDK_DIR=SDKs' " - "to download the SDK automatically to 'SDKs/MacOSX.sdk'. " + "Need OSX_SDK_DIR env variable set. Run 'export OSX_SDK_DIR=$PWD/SDKs' " + "to download the SDK automatically to '$PWD/SDKs/MacOSX.sdk'. " + "Note: OSX_SDK_DIR must be set to an absolute path. " "Setting this variable implies agreement to the licensing terms of the SDK by Apple." ) From 58f6b818f1bd3968846fd68fc5522830f9f680ec Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Fri, 28 Jun 2024 12:11:18 +0000 Subject: [PATCH 86/95] Rebuild for numpy 2.0 TL;DR: The way we build against numpy has changed as of numpy 2.0. This bot PR has updated the recipe to account for the changes (see below for details). The biggest change is that we no longer need to use the oldest available numpy version at build time in order to support old numpy version at runtime - numpy will by default use a compatible ABI for the oldest still-supported numpy versions. Additionally, we no longer need to use `{{ pin_compatible("numpy") }}` as a run requirement - this has been handled for more than two years now by a run-export on the numpy package itself. The migrator will therefore remove any occurrences of this. However, by default, building against numpy 2.0 will assume that the package is compatible with numpy 2.0, which is not necessarily the case. You should check that the upstream package explicitly supports numpy 2.0, otherwise you need to add a `- numpy <2.0dev0` run requirement until that happens (check numpy issue 26191 for an overview of the most important packages). ### To-Dos: * [ ] Match run-requirements for numpy (i.e. check upstream `pyproject.toml` or however the project specifies numpy compatibility) * If upstream is not yet compatible with numpy 2.0, add `numpy <2.0dev0` upper bound under `run:`. * If upstream is already compatible with numpy 2.0, nothing else should be necessary in most cases. * If upstream requires a minimum numpy version newer than 1.19, you can add `numpy >=x.y` under `run:`. * [ ] Remove any remaining occurrences of `{{ pin_compatible("numpy") }}` that the bot may have missed. PS. If the build does not compile anymore, this is almost certainly a sign that the upstream project is not yet ready for numpy 2.0; do not close this PR until a version compatible with numpy 2.0 has been released upstream and on this feedstock (in the meantime, you can keep the bot from reopening this PR in case of git conflicts by marking it as a draft). --- .ci_support/migrations/numpy2.yaml | 48 ++++++++++++++++++++++++++++++ conda-forge.yml | 4 +-- recipe/meta.yaml | 2 +- 3 files changed, 51 insertions(+), 3 deletions(-) create mode 100644 .ci_support/migrations/numpy2.yaml diff --git a/.ci_support/migrations/numpy2.yaml b/.ci_support/migrations/numpy2.yaml new file mode 100644 index 00000000..4e6d3ca6 --- /dev/null +++ b/.ci_support/migrations/numpy2.yaml @@ -0,0 +1,48 @@ +__migrator: + build_number: 1 + kind: version + commit_message: | + Rebuild for numpy 2.0 + + TL;DR: The way we build against numpy has changed as of numpy 2.0. This bot + PR has updated the recipe to account for the changes (see below for details). + + The biggest change is that we no longer need to use the oldest available numpy + version at build time in order to support old numpy version at runtime - numpy + will by default use a compatible ABI for the oldest still-supported numpy versions. + + Additionally, we no longer need to use `{{ pin_compatible("numpy") }}` as a + run requirement - this has been handled for more than two years now by a + run-export on the numpy package itself. The migrator will therefore remove + any occurrences of this. + + However, by default, building against numpy 2.0 will assume that the package + is compatible with numpy 2.0, which is not necessarily the case. You should + check that the upstream package explicitly supports numpy 2.0, otherwise you + need to add a `- numpy <2.0dev0` run requirement until that happens (check numpy + issue 26191 for an overview of the most important packages). + + ### To-Dos: + * [ ] Match run-requirements for numpy (i.e. check upstream `pyproject.toml` or however the project specifies numpy compatibility) + * If upstream is not yet compatible with numpy 2.0, add `numpy <2.0dev0` upper bound under `run:`. + * If upstream is already compatible with numpy 2.0, nothing else should be necessary in most cases. + * If upstream requires a minimum numpy version newer than 1.19, you can add `numpy >=x.y` under `run:`. + * [ ] Remove any remaining occurrences of `{{ pin_compatible("numpy") }}` that the bot may have missed. + + PS. If the build does not compile anymore, this is almost certainly a sign that + the upstream project is not yet ready for numpy 2.0; do not close this PR until + a version compatible with numpy 2.0 has been released upstream and on this + feedstock (in the meantime, you can keep the bot from reopening this PR in + case of git conflicts by marking it as a draft). + + migration_number: 1 + +# needs to match length of zip {python, python_impl, numpy} +# as it is in global CBC in order to override it +numpy: + - 1.22 # no py38 support for numpy 2.0 + - 2.0 + - 2.0 + - 2.0 + - 2.0 +migrator_ts: 1713572489.295986 diff --git a/conda-forge.yml b/conda-forge.yml index 1a735061..58154bb6 100644 --- a/conda-forge.yml +++ b/conda-forge.yml @@ -5,6 +5,8 @@ build_platform: linux_aarch64: linux_64 linux_ppc64le: linux_64 osx_arm64: osx_64 +conda_build: + pkg_format: '2' conda_forge_output_validation: true github: branch_name: main @@ -15,6 +17,4 @@ provider: linux_ppc64le: default osx: azure win: azure -conda_build: - pkg_format: '2' test: native_and_emulated diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 967e6a84..74fd402e 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -12,7 +12,7 @@ source: sha256: f97316cbd46b5d28699254e3520e295e30b3deb6ec43b7a1aac62bffa2d9f497 build: - number: 0 + number: 1 outputs: - name: matplotlib-base From ee7b12beb1ea1b38515627466a1ecce777d364cc Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Fri, 28 Jun 2024 12:13:49 +0000 Subject: [PATCH 87/95] MNT: Re-rendered with conda-build 24.5.1, conda-smithy 3.36.2, and conda-forge-pinning 2024.06.28.09.32.10 --- .azure-pipelines/azure-pipelines-linux.yml | 76 +++++---- .azure-pipelines/azure-pipelines-osx.yml | 49 +++--- .azure-pipelines/azure-pipelines-win.yml | 83 +++------ ...nux_64_numpy1.21python3.8.____73_pypy.yaml | 40 ----- ...ux_64_numpy1.22python3.8.____cpython.yaml} | 4 +- ...ux_64_numpy1.22python3.9.____73_pypy.yaml} | 4 +- ...ux_64_numpy2.0python3.10.____cpython.yaml} | 4 +- ...ux_64_numpy2.0python3.11.____cpython.yaml} | 4 +- ...nux_64_numpy2.0python3.12.____cpython.yaml | 40 +++++ ...nux_64_numpy2.0python3.9.____cpython.yaml} | 4 +- ...arch64_numpy1.21python3.8.____73_pypy.yaml | 44 ----- ...rch64_numpy1.22python3.8.____cpython.yaml} | 4 +- ...rch64_numpy1.22python3.9.____73_pypy.yaml} | 4 +- ...rch64_numpy2.0python3.10.____cpython.yaml} | 4 +- ...rch64_numpy2.0python3.11.____cpython.yaml} | 4 +- ...arch64_numpy2.0python3.12.____cpython.yaml | 44 +++++ ...arch64_numpy2.0python3.9.____cpython.yaml} | 4 +- ...pc64le_numpy1.21python3.8.____73_pypy.yaml | 38 ----- ...c64le_numpy1.22python3.8.____cpython.yaml} | 4 +- ...c64le_numpy1.22python3.9.____73_pypy.yaml} | 4 +- ...c64le_numpy2.0python3.10.____cpython.yaml} | 4 +- ...c64le_numpy2.0python3.11.____cpython.yaml} | 4 +- ...pc64le_numpy2.0python3.12.____cpython.yaml | 38 +++++ ...pc64le_numpy2.0python3.9.____cpython.yaml} | 4 +- .ci_support/migrations/python311.yaml | 37 ---- ...osx_64_numpy1.21python3.8.____73_pypy.yaml | 40 ----- ...sx_64_numpy1.22python3.8.____cpython.yaml} | 12 +- ...sx_64_numpy1.22python3.9.____73_pypy.yaml} | 12 +- ...sx_64_numpy2.0python3.10.____cpython.yaml} | 12 +- ...sx_64_numpy2.0python3.11.____cpython.yaml} | 12 +- ...osx_64_numpy2.0python3.12.____cpython.yaml | 40 +++++ ...osx_64_numpy2.0python3.9.____cpython.yaml} | 12 +- ...arm64_numpy1.22python3.8.____cpython.yaml} | 10 +- ...arm64_numpy2.0python3.10.____cpython.yaml} | 10 +- ...arm64_numpy2.0python3.11.____cpython.yaml} | 10 +- ..._arm64_numpy2.0python3.12.____cpython.yaml | 40 +++++ ..._arm64_numpy2.0python3.9.____cpython.yaml} | 10 +- ...win_64_numpy1.21python3.8.____73_pypy.yaml | 28 --- ...in_64_numpy1.22python3.8.____cpython.yaml} | 4 +- ...in_64_numpy1.22python3.9.____73_pypy.yaml} | 4 +- ...in_64_numpy2.0python3.10.____cpython.yaml} | 4 +- ...in_64_numpy2.0python3.11.____cpython.yaml} | 4 +- ...win_64_numpy2.0python3.12.____cpython.yaml | 28 +++ ...win_64_numpy2.0python3.9.____cpython.yaml} | 4 +- .gitattributes | 4 +- .gitignore | 25 ++- .scripts/build_steps.sh | 23 ++- .scripts/logging_utils.sh | 4 +- .scripts/run_docker_build.sh | 9 + .scripts/run_osx_build.sh | 26 ++- .scripts/run_win_build.bat | 130 ++++++++++++++ README.md | 161 +++++++++--------- azure-pipelines.yml | 4 +- build-locally.py | 5 +- 54 files changed, 706 insertions(+), 530 deletions(-) delete mode 100644 .ci_support/linux_64_numpy1.21python3.8.____73_pypy.yaml rename .ci_support/{linux_64_numpy1.21python3.8.____cpython.yaml => linux_64_numpy1.22python3.8.____cpython.yaml} (96%) rename .ci_support/{linux_64_numpy1.21python3.9.____73_pypy.yaml => linux_64_numpy1.22python3.9.____73_pypy.yaml} (96%) rename .ci_support/{linux_64_numpy1.21python3.10.____cpython.yaml => linux_64_numpy2.0python3.10.____cpython.yaml} (96%) rename .ci_support/{linux_64_numpy1.23python3.11.____cpython.yaml => linux_64_numpy2.0python3.11.____cpython.yaml} (96%) create mode 100644 .ci_support/linux_64_numpy2.0python3.12.____cpython.yaml rename .ci_support/{linux_64_numpy1.21python3.9.____cpython.yaml => linux_64_numpy2.0python3.9.____cpython.yaml} (96%) delete mode 100644 .ci_support/linux_aarch64_numpy1.21python3.8.____73_pypy.yaml rename .ci_support/{linux_aarch64_numpy1.21python3.8.____cpython.yaml => linux_aarch64_numpy1.22python3.8.____cpython.yaml} (97%) rename .ci_support/{linux_aarch64_numpy1.21python3.9.____73_pypy.yaml => linux_aarch64_numpy1.22python3.9.____73_pypy.yaml} (97%) rename .ci_support/{linux_aarch64_numpy1.21python3.10.____cpython.yaml => linux_aarch64_numpy2.0python3.10.____cpython.yaml} (97%) rename .ci_support/{linux_aarch64_numpy1.23python3.11.____cpython.yaml => linux_aarch64_numpy2.0python3.11.____cpython.yaml} (97%) create mode 100644 .ci_support/linux_aarch64_numpy2.0python3.12.____cpython.yaml rename .ci_support/{linux_aarch64_numpy1.21python3.9.____cpython.yaml => linux_aarch64_numpy2.0python3.9.____cpython.yaml} (97%) delete mode 100644 .ci_support/linux_ppc64le_numpy1.21python3.8.____73_pypy.yaml rename .ci_support/{linux_ppc64le_numpy1.21python3.8.____cpython.yaml => linux_ppc64le_numpy1.22python3.8.____cpython.yaml} (96%) rename .ci_support/{linux_ppc64le_numpy1.21python3.9.____73_pypy.yaml => linux_ppc64le_numpy1.22python3.9.____73_pypy.yaml} (96%) rename .ci_support/{linux_ppc64le_numpy1.21python3.10.____cpython.yaml => linux_ppc64le_numpy2.0python3.10.____cpython.yaml} (96%) rename .ci_support/{linux_ppc64le_numpy1.23python3.11.____cpython.yaml => linux_ppc64le_numpy2.0python3.11.____cpython.yaml} (96%) create mode 100644 .ci_support/linux_ppc64le_numpy2.0python3.12.____cpython.yaml rename .ci_support/{linux_ppc64le_numpy1.21python3.9.____cpython.yaml => linux_ppc64le_numpy2.0python3.9.____cpython.yaml} (96%) delete mode 100644 .ci_support/migrations/python311.yaml delete mode 100644 .ci_support/osx_64_numpy1.21python3.8.____73_pypy.yaml rename .ci_support/{osx_64_numpy1.21python3.8.____cpython.yaml => osx_64_numpy1.22python3.8.____cpython.yaml} (90%) rename .ci_support/{osx_64_numpy1.21python3.9.____73_pypy.yaml => osx_64_numpy1.22python3.9.____73_pypy.yaml} (90%) rename .ci_support/{osx_64_numpy1.21python3.10.____cpython.yaml => osx_64_numpy2.0python3.10.____cpython.yaml} (90%) rename .ci_support/{osx_64_numpy1.23python3.11.____cpython.yaml => osx_64_numpy2.0python3.11.____cpython.yaml} (90%) create mode 100644 .ci_support/osx_64_numpy2.0python3.12.____cpython.yaml rename .ci_support/{osx_64_numpy1.21python3.9.____cpython.yaml => osx_64_numpy2.0python3.9.____cpython.yaml} (90%) rename .ci_support/{osx_arm64_numpy1.21python3.8.____cpython.yaml => osx_arm64_numpy1.22python3.8.____cpython.yaml} (89%) rename .ci_support/{osx_arm64_numpy1.21python3.10.____cpython.yaml => osx_arm64_numpy2.0python3.10.____cpython.yaml} (89%) rename .ci_support/{osx_arm64_numpy1.23python3.11.____cpython.yaml => osx_arm64_numpy2.0python3.11.____cpython.yaml} (89%) create mode 100644 .ci_support/osx_arm64_numpy2.0python3.12.____cpython.yaml rename .ci_support/{osx_arm64_numpy1.21python3.9.____cpython.yaml => osx_arm64_numpy2.0python3.9.____cpython.yaml} (89%) delete mode 100644 .ci_support/win_64_numpy1.21python3.8.____73_pypy.yaml rename .ci_support/{win_64_numpy1.21python3.8.____cpython.yaml => win_64_numpy1.22python3.8.____cpython.yaml} (95%) rename .ci_support/{win_64_numpy1.21python3.9.____73_pypy.yaml => win_64_numpy1.22python3.9.____73_pypy.yaml} (95%) rename .ci_support/{win_64_numpy1.21python3.10.____cpython.yaml => win_64_numpy2.0python3.10.____cpython.yaml} (95%) rename .ci_support/{win_64_numpy1.23python3.11.____cpython.yaml => win_64_numpy2.0python3.11.____cpython.yaml} (95%) create mode 100644 .ci_support/win_64_numpy2.0python3.12.____cpython.yaml rename .ci_support/{win_64_numpy1.21python3.9.____cpython.yaml => win_64_numpy2.0python3.9.____cpython.yaml} (95%) create mode 100755 .scripts/run_win_build.bat diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml index d42ff128..18e9e16d 100755 --- a/.azure-pipelines/azure-pipelines-linux.yml +++ b/.azure-pipelines/azure-pipelines-linux.yml @@ -8,79 +8,80 @@ jobs: vmImage: ubuntu-latest strategy: matrix: - linux_64_numpy1.21python3.10.____cpython: - CONFIG: linux_64_numpy1.21python3.10.____cpython + linux_64_numpy1.22python3.8.____cpython: + CONFIG: linux_64_numpy1.22python3.8.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_64_numpy1.21python3.8.____73_pypy: - CONFIG: linux_64_numpy1.21python3.8.____73_pypy + linux_64_numpy1.22python3.9.____73_pypy: + CONFIG: linux_64_numpy1.22python3.9.____73_pypy UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_64_numpy1.21python3.8.____cpython: - CONFIG: linux_64_numpy1.21python3.8.____cpython + linux_64_numpy2.0python3.10.____cpython: + CONFIG: linux_64_numpy2.0python3.10.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_64_numpy1.21python3.9.____73_pypy: - CONFIG: linux_64_numpy1.21python3.9.____73_pypy + linux_64_numpy2.0python3.11.____cpython: + CONFIG: linux_64_numpy2.0python3.11.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_64_numpy1.21python3.9.____cpython: - CONFIG: linux_64_numpy1.21python3.9.____cpython + linux_64_numpy2.0python3.12.____cpython: + CONFIG: linux_64_numpy2.0python3.12.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_64_numpy1.23python3.11.____cpython: - CONFIG: linux_64_numpy1.23python3.11.____cpython + linux_64_numpy2.0python3.9.____cpython: + CONFIG: linux_64_numpy2.0python3.9.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_aarch64_numpy1.21python3.10.____cpython: - CONFIG: linux_aarch64_numpy1.21python3.10.____cpython + linux_aarch64_numpy1.22python3.8.____cpython: + CONFIG: linux_aarch64_numpy1.22python3.8.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_aarch64_numpy1.21python3.8.____73_pypy: - CONFIG: linux_aarch64_numpy1.21python3.8.____73_pypy + linux_aarch64_numpy1.22python3.9.____73_pypy: + CONFIG: linux_aarch64_numpy1.22python3.9.____73_pypy UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_aarch64_numpy1.21python3.8.____cpython: - CONFIG: linux_aarch64_numpy1.21python3.8.____cpython + linux_aarch64_numpy2.0python3.10.____cpython: + CONFIG: linux_aarch64_numpy2.0python3.10.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_aarch64_numpy1.21python3.9.____73_pypy: - CONFIG: linux_aarch64_numpy1.21python3.9.____73_pypy + linux_aarch64_numpy2.0python3.11.____cpython: + CONFIG: linux_aarch64_numpy2.0python3.11.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_aarch64_numpy1.21python3.9.____cpython: - CONFIG: linux_aarch64_numpy1.21python3.9.____cpython + linux_aarch64_numpy2.0python3.12.____cpython: + CONFIG: linux_aarch64_numpy2.0python3.12.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_aarch64_numpy1.23python3.11.____cpython: - CONFIG: linux_aarch64_numpy1.23python3.11.____cpython + linux_aarch64_numpy2.0python3.9.____cpython: + CONFIG: linux_aarch64_numpy2.0python3.9.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_ppc64le_numpy1.21python3.10.____cpython: - CONFIG: linux_ppc64le_numpy1.21python3.10.____cpython + linux_ppc64le_numpy1.22python3.8.____cpython: + CONFIG: linux_ppc64le_numpy1.22python3.8.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_ppc64le_numpy1.21python3.8.____73_pypy: - CONFIG: linux_ppc64le_numpy1.21python3.8.____73_pypy + linux_ppc64le_numpy1.22python3.9.____73_pypy: + CONFIG: linux_ppc64le_numpy1.22python3.9.____73_pypy UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_ppc64le_numpy1.21python3.8.____cpython: - CONFIG: linux_ppc64le_numpy1.21python3.8.____cpython + linux_ppc64le_numpy2.0python3.10.____cpython: + CONFIG: linux_ppc64le_numpy2.0python3.10.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_ppc64le_numpy1.21python3.9.____73_pypy: - CONFIG: linux_ppc64le_numpy1.21python3.9.____73_pypy + linux_ppc64le_numpy2.0python3.11.____cpython: + CONFIG: linux_ppc64le_numpy2.0python3.11.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_ppc64le_numpy1.21python3.9.____cpython: - CONFIG: linux_ppc64le_numpy1.21python3.9.____cpython + linux_ppc64le_numpy2.0python3.12.____cpython: + CONFIG: linux_ppc64le_numpy2.0python3.12.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_ppc64le_numpy1.23python3.11.____cpython: - CONFIG: linux_ppc64le_numpy1.23python3.11.____cpython + linux_ppc64le_numpy2.0python3.9.____cpython: + CONFIG: linux_ppc64le_numpy2.0python3.9.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 timeoutInMinutes: 360 + variables: {} steps: # configure qemu binfmt-misc running. This allows us to run docker containers @@ -93,6 +94,9 @@ jobs: - script: | export CI=azure + export flow_run_id=azure_$(Build.BuildNumber).$(System.JobAttempt) + export remote_url=$(Build.Repository.Uri) + export sha=$(Build.SourceVersion) export GIT_BRANCH=$BUILD_SOURCEBRANCHNAME export FEEDSTOCK_NAME=$(basename ${BUILD_REPOSITORY_NAME}) if [[ "${BUILD_REASON:-}" == "PullRequest" ]]; then diff --git a/.azure-pipelines/azure-pipelines-osx.yml b/.azure-pipelines/azure-pipelines-osx.yml index e3774bfd..59e6f8f9 100755 --- a/.azure-pipelines/azure-pipelines-osx.yml +++ b/.azure-pipelines/azure-pipelines-osx.yml @@ -5,45 +5,52 @@ jobs: - job: osx pool: - vmImage: macOS-11 + vmImage: macOS-12 strategy: matrix: - osx_64_numpy1.21python3.10.____cpython: - CONFIG: osx_64_numpy1.21python3.10.____cpython + osx_64_numpy1.22python3.8.____cpython: + CONFIG: osx_64_numpy1.22python3.8.____cpython UPLOAD_PACKAGES: 'True' - osx_64_numpy1.21python3.8.____73_pypy: - CONFIG: osx_64_numpy1.21python3.8.____73_pypy + osx_64_numpy1.22python3.9.____73_pypy: + CONFIG: osx_64_numpy1.22python3.9.____73_pypy UPLOAD_PACKAGES: 'True' - osx_64_numpy1.21python3.8.____cpython: - CONFIG: osx_64_numpy1.21python3.8.____cpython + osx_64_numpy2.0python3.10.____cpython: + CONFIG: osx_64_numpy2.0python3.10.____cpython UPLOAD_PACKAGES: 'True' - osx_64_numpy1.21python3.9.____73_pypy: - CONFIG: osx_64_numpy1.21python3.9.____73_pypy + osx_64_numpy2.0python3.11.____cpython: + CONFIG: osx_64_numpy2.0python3.11.____cpython UPLOAD_PACKAGES: 'True' - osx_64_numpy1.21python3.9.____cpython: - CONFIG: osx_64_numpy1.21python3.9.____cpython + osx_64_numpy2.0python3.12.____cpython: + CONFIG: osx_64_numpy2.0python3.12.____cpython UPLOAD_PACKAGES: 'True' - osx_64_numpy1.23python3.11.____cpython: - CONFIG: osx_64_numpy1.23python3.11.____cpython + osx_64_numpy2.0python3.9.____cpython: + CONFIG: osx_64_numpy2.0python3.9.____cpython UPLOAD_PACKAGES: 'True' - osx_arm64_numpy1.21python3.10.____cpython: - CONFIG: osx_arm64_numpy1.21python3.10.____cpython + osx_arm64_numpy1.22python3.8.____cpython: + CONFIG: osx_arm64_numpy1.22python3.8.____cpython UPLOAD_PACKAGES: 'True' - osx_arm64_numpy1.21python3.8.____cpython: - CONFIG: osx_arm64_numpy1.21python3.8.____cpython + osx_arm64_numpy2.0python3.10.____cpython: + CONFIG: osx_arm64_numpy2.0python3.10.____cpython UPLOAD_PACKAGES: 'True' - osx_arm64_numpy1.21python3.9.____cpython: - CONFIG: osx_arm64_numpy1.21python3.9.____cpython + osx_arm64_numpy2.0python3.11.____cpython: + CONFIG: osx_arm64_numpy2.0python3.11.____cpython UPLOAD_PACKAGES: 'True' - osx_arm64_numpy1.23python3.11.____cpython: - CONFIG: osx_arm64_numpy1.23python3.11.____cpython + osx_arm64_numpy2.0python3.12.____cpython: + CONFIG: osx_arm64_numpy2.0python3.12.____cpython + UPLOAD_PACKAGES: 'True' + osx_arm64_numpy2.0python3.9.____cpython: + CONFIG: osx_arm64_numpy2.0python3.9.____cpython UPLOAD_PACKAGES: 'True' timeoutInMinutes: 360 + variables: {} steps: # TODO: Fast finish on azure pipelines? - script: | export CI=azure + export flow_run_id=azure_$(Build.BuildNumber).$(System.JobAttempt) + export remote_url=$(Build.Repository.Uri) + export sha=$(Build.SourceVersion) export OSX_FORCE_SDK_DOWNLOAD="1" export GIT_BRANCH=$BUILD_SOURCEBRANCHNAME export FEEDSTOCK_NAME=$(basename ${BUILD_REPOSITORY_NAME}) diff --git a/.azure-pipelines/azure-pipelines-win.yml b/.azure-pipelines/azure-pipelines-win.yml index 7f5ab156..6e15e527 100755 --- a/.azure-pipelines/azure-pipelines-win.yml +++ b/.azure-pipelines/azure-pipelines-win.yml @@ -8,23 +8,23 @@ jobs: vmImage: windows-2022 strategy: matrix: - win_64_numpy1.21python3.10.____cpython: - CONFIG: win_64_numpy1.21python3.10.____cpython + win_64_numpy1.22python3.8.____cpython: + CONFIG: win_64_numpy1.22python3.8.____cpython UPLOAD_PACKAGES: 'True' - win_64_numpy1.21python3.8.____73_pypy: - CONFIG: win_64_numpy1.21python3.8.____73_pypy + win_64_numpy1.22python3.9.____73_pypy: + CONFIG: win_64_numpy1.22python3.9.____73_pypy UPLOAD_PACKAGES: 'True' - win_64_numpy1.21python3.8.____cpython: - CONFIG: win_64_numpy1.21python3.8.____cpython + win_64_numpy2.0python3.10.____cpython: + CONFIG: win_64_numpy2.0python3.10.____cpython UPLOAD_PACKAGES: 'True' - win_64_numpy1.21python3.9.____73_pypy: - CONFIG: win_64_numpy1.21python3.9.____73_pypy + win_64_numpy2.0python3.11.____cpython: + CONFIG: win_64_numpy2.0python3.11.____cpython UPLOAD_PACKAGES: 'True' - win_64_numpy1.21python3.9.____cpython: - CONFIG: win_64_numpy1.21python3.9.____cpython + win_64_numpy2.0python3.12.____cpython: + CONFIG: win_64_numpy2.0python3.12.____cpython UPLOAD_PACKAGES: 'True' - win_64_numpy1.23python3.11.____cpython: - CONFIG: win_64_numpy1.23python3.11.____cpython + win_64_numpy2.0python3.9.____cpython: + CONFIG: win_64_numpy2.0python3.9.____cpython UPLOAD_PACKAGES: 'True' timeoutInMinutes: 360 variables: @@ -32,6 +32,7 @@ jobs: UPLOAD_TEMP: D:\\tmp steps: + - task: PythonScript@0 displayName: 'Download Miniforge' inputs: @@ -50,55 +51,17 @@ jobs: displayName: Add conda to PATH - script: | - call activate base - mamba.exe install "python=3.10" conda-build conda pip boa conda-forge-ci-setup=3 -c conda-forge --strict-channel-priority --yes - displayName: Install conda-build - - - script: set PYTHONUNBUFFERED=1 - displayName: Set PYTHONUNBUFFERED - - # Configure the VM - - script: | - call activate base - setup_conda_rc .\ ".\recipe" .\.ci_support\%CONFIG%.yaml - displayName: conda-forge CI setup - - # Configure the VM. - - script: | - set "CI=azure" - call activate base - run_conda_forge_build_setup - displayName: conda-forge build setup - - - script: | - call activate base - if EXIST LICENSE.txt ( - copy LICENSE.txt "recipe\\recipe-scripts-license.txt" - ) - if NOT [%HOST_PLATFORM%] == [%BUILD_PLATFORM%] ( - set "EXTRA_CB_OPTIONS=%EXTRA_CB_OPTIONS% --no-test" - ) - conda.exe mambabuild "recipe" -m .ci_support\%CONFIG%.yaml --suppress-variables %EXTRA_CB_OPTIONS% - displayName: Build recipe + call ".scripts\run_win_build.bat" + displayName: Run Windows build env: PYTHONUNBUFFERED: 1 - - script: | - set "FEEDSTOCK_NAME=%BUILD_REPOSITORY_NAME:*/=%" - call activate base - validate_recipe_outputs "%FEEDSTOCK_NAME%" - displayName: Validate Recipe Outputs - - - script: | - set "GIT_BRANCH=%BUILD_SOURCEBRANCHNAME%" - set "FEEDSTOCK_NAME=%BUILD_REPOSITORY_NAME:*/=%" - set "TEMP=$(UPLOAD_TEMP)" - if not exist "%TEMP%\" md "%TEMP%" - set "TMP=%TEMP%" - call activate base - upload_package --validate --feedstock-name="%FEEDSTOCK_NAME%" .\ ".\recipe" .ci_support\%CONFIG%.yaml - displayName: Upload package - env: + CONFIG: $(CONFIG) + CI: azure + flow_run_id: azure_$(Build.BuildNumber).$(System.JobAttempt) + remote_url: $(Build.Repository.Uri) + sha: $(Build.SourceVersion) + UPLOAD_PACKAGES: $(UPLOAD_PACKAGES) + UPLOAD_TEMP: $(UPLOAD_TEMP) BINSTAR_TOKEN: $(BINSTAR_TOKEN) FEEDSTOCK_TOKEN: $(FEEDSTOCK_TOKEN) - STAGING_BINSTAR_TOKEN: $(STAGING_BINSTAR_TOKEN) - condition: and(succeeded(), not(eq(variables['UPLOAD_PACKAGES'], 'False')), not(eq(variables['Build.Reason'], 'PullRequest'))) \ No newline at end of file + STAGING_BINSTAR_TOKEN: $(STAGING_BINSTAR_TOKEN) \ No newline at end of file diff --git a/.ci_support/linux_64_numpy1.21python3.8.____73_pypy.yaml b/.ci_support/linux_64_numpy1.21python3.8.____73_pypy.yaml deleted file mode 100644 index b541d9a6..00000000 --- a/.ci_support/linux_64_numpy1.21python3.8.____73_pypy.yaml +++ /dev/null @@ -1,40 +0,0 @@ -c_compiler: -- gcc -c_compiler_version: -- '12' -cdt_name: -- cos6 -channel_sources: -- conda-forge -channel_targets: -- conda-forge matplotlib_rc -cxx_compiler: -- gxx -cxx_compiler_version: -- '12' -docker_image: -- quay.io/condaforge/linux-anvil-cos7-x86_64 -freetype: -- '2' -numpy: -- '1.21' -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -python: -- 3.8.* *_73_pypy -python_impl: -- pypy -target_platform: -- linux-64 -tk: -- '8.6' -zip_keys: -- - c_compiler_version - - cxx_compiler_version -- - python - - numpy - - python_impl -zlib: -- '1.2' diff --git a/.ci_support/linux_64_numpy1.21python3.8.____cpython.yaml b/.ci_support/linux_64_numpy1.22python3.8.____cpython.yaml similarity index 96% rename from .ci_support/linux_64_numpy1.21python3.8.____cpython.yaml rename to .ci_support/linux_64_numpy1.22python3.8.____cpython.yaml index 597557ab..84dab33d 100644 --- a/.ci_support/linux_64_numpy1.21python3.8.____cpython.yaml +++ b/.ci_support/linux_64_numpy1.22python3.8.____cpython.yaml @@ -17,7 +17,7 @@ docker_image: freetype: - '2' numpy: -- '1.21' +- '1.22' pin_run_as_build: python: min_pin: x.x @@ -37,4 +37,4 @@ zip_keys: - numpy - python_impl zlib: -- '1.2' +- '1' diff --git a/.ci_support/linux_64_numpy1.21python3.9.____73_pypy.yaml b/.ci_support/linux_64_numpy1.22python3.9.____73_pypy.yaml similarity index 96% rename from .ci_support/linux_64_numpy1.21python3.9.____73_pypy.yaml rename to .ci_support/linux_64_numpy1.22python3.9.____73_pypy.yaml index d7bb831c..7544eb38 100644 --- a/.ci_support/linux_64_numpy1.21python3.9.____73_pypy.yaml +++ b/.ci_support/linux_64_numpy1.22python3.9.____73_pypy.yaml @@ -17,7 +17,7 @@ docker_image: freetype: - '2' numpy: -- '1.21' +- '1.22' pin_run_as_build: python: min_pin: x.x @@ -37,4 +37,4 @@ zip_keys: - numpy - python_impl zlib: -- '1.2' +- '1' diff --git a/.ci_support/linux_64_numpy1.21python3.10.____cpython.yaml b/.ci_support/linux_64_numpy2.0python3.10.____cpython.yaml similarity index 96% rename from .ci_support/linux_64_numpy1.21python3.10.____cpython.yaml rename to .ci_support/linux_64_numpy2.0python3.10.____cpython.yaml index 79e954eb..5f1c1a46 100644 --- a/.ci_support/linux_64_numpy1.21python3.10.____cpython.yaml +++ b/.ci_support/linux_64_numpy2.0python3.10.____cpython.yaml @@ -17,7 +17,7 @@ docker_image: freetype: - '2' numpy: -- '1.21' +- '2.0' pin_run_as_build: python: min_pin: x.x @@ -37,4 +37,4 @@ zip_keys: - numpy - python_impl zlib: -- '1.2' +- '1' diff --git a/.ci_support/linux_64_numpy1.23python3.11.____cpython.yaml b/.ci_support/linux_64_numpy2.0python3.11.____cpython.yaml similarity index 96% rename from .ci_support/linux_64_numpy1.23python3.11.____cpython.yaml rename to .ci_support/linux_64_numpy2.0python3.11.____cpython.yaml index 918e96ea..4aeb103f 100644 --- a/.ci_support/linux_64_numpy1.23python3.11.____cpython.yaml +++ b/.ci_support/linux_64_numpy2.0python3.11.____cpython.yaml @@ -17,7 +17,7 @@ docker_image: freetype: - '2' numpy: -- '1.23' +- '2.0' pin_run_as_build: python: min_pin: x.x @@ -37,4 +37,4 @@ zip_keys: - numpy - python_impl zlib: -- '1.2' +- '1' diff --git a/.ci_support/linux_64_numpy2.0python3.12.____cpython.yaml b/.ci_support/linux_64_numpy2.0python3.12.____cpython.yaml new file mode 100644 index 00000000..2266cd34 --- /dev/null +++ b/.ci_support/linux_64_numpy2.0python3.12.____cpython.yaml @@ -0,0 +1,40 @@ +c_compiler: +- gcc +c_compiler_version: +- '12' +cdt_name: +- cos6 +channel_sources: +- conda-forge +channel_targets: +- conda-forge matplotlib_rc +cxx_compiler: +- gxx +cxx_compiler_version: +- '12' +docker_image: +- quay.io/condaforge/linux-anvil-cos7-x86_64 +freetype: +- '2' +numpy: +- '2.0' +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +python: +- 3.12.* *_cpython +python_impl: +- cpython +target_platform: +- linux-64 +tk: +- '8.6' +zip_keys: +- - c_compiler_version + - cxx_compiler_version +- - python + - numpy + - python_impl +zlib: +- '1' diff --git a/.ci_support/linux_64_numpy1.21python3.9.____cpython.yaml b/.ci_support/linux_64_numpy2.0python3.9.____cpython.yaml similarity index 96% rename from .ci_support/linux_64_numpy1.21python3.9.____cpython.yaml rename to .ci_support/linux_64_numpy2.0python3.9.____cpython.yaml index e8fe600d..90a6124e 100644 --- a/.ci_support/linux_64_numpy1.21python3.9.____cpython.yaml +++ b/.ci_support/linux_64_numpy2.0python3.9.____cpython.yaml @@ -17,7 +17,7 @@ docker_image: freetype: - '2' numpy: -- '1.21' +- '2.0' pin_run_as_build: python: min_pin: x.x @@ -37,4 +37,4 @@ zip_keys: - numpy - python_impl zlib: -- '1.2' +- '1' diff --git a/.ci_support/linux_aarch64_numpy1.21python3.8.____73_pypy.yaml b/.ci_support/linux_aarch64_numpy1.21python3.8.____73_pypy.yaml deleted file mode 100644 index 9f217c11..00000000 --- a/.ci_support/linux_aarch64_numpy1.21python3.8.____73_pypy.yaml +++ /dev/null @@ -1,44 +0,0 @@ -BUILD: -- aarch64-conda_cos7-linux-gnu -c_compiler: -- gcc -c_compiler_version: -- '12' -cdt_arch: -- aarch64 -cdt_name: -- cos7 -channel_sources: -- conda-forge -channel_targets: -- conda-forge matplotlib_rc -cxx_compiler: -- gxx -cxx_compiler_version: -- '12' -docker_image: -- quay.io/condaforge/linux-anvil-cos7-x86_64 -freetype: -- '2' -numpy: -- '1.21' -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -python: -- 3.8.* *_73_pypy -python_impl: -- pypy -target_platform: -- linux-aarch64 -tk: -- '8.6' -zip_keys: -- - c_compiler_version - - cxx_compiler_version -- - python - - numpy - - python_impl -zlib: -- '1.2' diff --git a/.ci_support/linux_aarch64_numpy1.21python3.8.____cpython.yaml b/.ci_support/linux_aarch64_numpy1.22python3.8.____cpython.yaml similarity index 97% rename from .ci_support/linux_aarch64_numpy1.21python3.8.____cpython.yaml rename to .ci_support/linux_aarch64_numpy1.22python3.8.____cpython.yaml index 07edc4c2..739a3343 100644 --- a/.ci_support/linux_aarch64_numpy1.21python3.8.____cpython.yaml +++ b/.ci_support/linux_aarch64_numpy1.22python3.8.____cpython.yaml @@ -21,7 +21,7 @@ docker_image: freetype: - '2' numpy: -- '1.21' +- '1.22' pin_run_as_build: python: min_pin: x.x @@ -41,4 +41,4 @@ zip_keys: - numpy - python_impl zlib: -- '1.2' +- '1' diff --git a/.ci_support/linux_aarch64_numpy1.21python3.9.____73_pypy.yaml b/.ci_support/linux_aarch64_numpy1.22python3.9.____73_pypy.yaml similarity index 97% rename from .ci_support/linux_aarch64_numpy1.21python3.9.____73_pypy.yaml rename to .ci_support/linux_aarch64_numpy1.22python3.9.____73_pypy.yaml index 19862c32..68b93569 100644 --- a/.ci_support/linux_aarch64_numpy1.21python3.9.____73_pypy.yaml +++ b/.ci_support/linux_aarch64_numpy1.22python3.9.____73_pypy.yaml @@ -21,7 +21,7 @@ docker_image: freetype: - '2' numpy: -- '1.21' +- '1.22' pin_run_as_build: python: min_pin: x.x @@ -41,4 +41,4 @@ zip_keys: - numpy - python_impl zlib: -- '1.2' +- '1' diff --git a/.ci_support/linux_aarch64_numpy1.21python3.10.____cpython.yaml b/.ci_support/linux_aarch64_numpy2.0python3.10.____cpython.yaml similarity index 97% rename from .ci_support/linux_aarch64_numpy1.21python3.10.____cpython.yaml rename to .ci_support/linux_aarch64_numpy2.0python3.10.____cpython.yaml index b5881ca1..695751f0 100644 --- a/.ci_support/linux_aarch64_numpy1.21python3.10.____cpython.yaml +++ b/.ci_support/linux_aarch64_numpy2.0python3.10.____cpython.yaml @@ -21,7 +21,7 @@ docker_image: freetype: - '2' numpy: -- '1.21' +- '2.0' pin_run_as_build: python: min_pin: x.x @@ -41,4 +41,4 @@ zip_keys: - numpy - python_impl zlib: -- '1.2' +- '1' diff --git a/.ci_support/linux_aarch64_numpy1.23python3.11.____cpython.yaml b/.ci_support/linux_aarch64_numpy2.0python3.11.____cpython.yaml similarity index 97% rename from .ci_support/linux_aarch64_numpy1.23python3.11.____cpython.yaml rename to .ci_support/linux_aarch64_numpy2.0python3.11.____cpython.yaml index 48aac766..34cd3104 100644 --- a/.ci_support/linux_aarch64_numpy1.23python3.11.____cpython.yaml +++ b/.ci_support/linux_aarch64_numpy2.0python3.11.____cpython.yaml @@ -21,7 +21,7 @@ docker_image: freetype: - '2' numpy: -- '1.23' +- '2.0' pin_run_as_build: python: min_pin: x.x @@ -41,4 +41,4 @@ zip_keys: - numpy - python_impl zlib: -- '1.2' +- '1' diff --git a/.ci_support/linux_aarch64_numpy2.0python3.12.____cpython.yaml b/.ci_support/linux_aarch64_numpy2.0python3.12.____cpython.yaml new file mode 100644 index 00000000..b331b3e0 --- /dev/null +++ b/.ci_support/linux_aarch64_numpy2.0python3.12.____cpython.yaml @@ -0,0 +1,44 @@ +BUILD: +- aarch64-conda_cos7-linux-gnu +c_compiler: +- gcc +c_compiler_version: +- '12' +cdt_arch: +- aarch64 +cdt_name: +- cos7 +channel_sources: +- conda-forge +channel_targets: +- conda-forge matplotlib_rc +cxx_compiler: +- gxx +cxx_compiler_version: +- '12' +docker_image: +- quay.io/condaforge/linux-anvil-cos7-x86_64 +freetype: +- '2' +numpy: +- '2.0' +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +python: +- 3.12.* *_cpython +python_impl: +- cpython +target_platform: +- linux-aarch64 +tk: +- '8.6' +zip_keys: +- - c_compiler_version + - cxx_compiler_version +- - python + - numpy + - python_impl +zlib: +- '1' diff --git a/.ci_support/linux_aarch64_numpy1.21python3.9.____cpython.yaml b/.ci_support/linux_aarch64_numpy2.0python3.9.____cpython.yaml similarity index 97% rename from .ci_support/linux_aarch64_numpy1.21python3.9.____cpython.yaml rename to .ci_support/linux_aarch64_numpy2.0python3.9.____cpython.yaml index 47c1c822..ed9b858d 100644 --- a/.ci_support/linux_aarch64_numpy1.21python3.9.____cpython.yaml +++ b/.ci_support/linux_aarch64_numpy2.0python3.9.____cpython.yaml @@ -21,7 +21,7 @@ docker_image: freetype: - '2' numpy: -- '1.21' +- '2.0' pin_run_as_build: python: min_pin: x.x @@ -41,4 +41,4 @@ zip_keys: - numpy - python_impl zlib: -- '1.2' +- '1' diff --git a/.ci_support/linux_ppc64le_numpy1.21python3.8.____73_pypy.yaml b/.ci_support/linux_ppc64le_numpy1.21python3.8.____73_pypy.yaml deleted file mode 100644 index 06fc0016..00000000 --- a/.ci_support/linux_ppc64le_numpy1.21python3.8.____73_pypy.yaml +++ /dev/null @@ -1,38 +0,0 @@ -c_compiler: -- gcc -c_compiler_version: -- '12' -cdt_name: -- cos7 -channel_sources: -- conda-forge -channel_targets: -- conda-forge matplotlib_rc -cxx_compiler: -- gxx -cxx_compiler_version: -- '12' -docker_image: -- quay.io/condaforge/linux-anvil-cos7-x86_64 -freetype: -- '2' -numpy: -- '1.21' -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -python: -- 3.8.* *_73_pypy -python_impl: -- pypy -target_platform: -- linux-ppc64le -zip_keys: -- - c_compiler_version - - cxx_compiler_version -- - python - - numpy - - python_impl -zlib: -- '1.2' diff --git a/.ci_support/linux_ppc64le_numpy1.21python3.8.____cpython.yaml b/.ci_support/linux_ppc64le_numpy1.22python3.8.____cpython.yaml similarity index 96% rename from .ci_support/linux_ppc64le_numpy1.21python3.8.____cpython.yaml rename to .ci_support/linux_ppc64le_numpy1.22python3.8.____cpython.yaml index 89ac1234..7afc4d88 100644 --- a/.ci_support/linux_ppc64le_numpy1.21python3.8.____cpython.yaml +++ b/.ci_support/linux_ppc64le_numpy1.22python3.8.____cpython.yaml @@ -17,7 +17,7 @@ docker_image: freetype: - '2' numpy: -- '1.21' +- '1.22' pin_run_as_build: python: min_pin: x.x @@ -35,4 +35,4 @@ zip_keys: - numpy - python_impl zlib: -- '1.2' +- '1' diff --git a/.ci_support/linux_ppc64le_numpy1.21python3.9.____73_pypy.yaml b/.ci_support/linux_ppc64le_numpy1.22python3.9.____73_pypy.yaml similarity index 96% rename from .ci_support/linux_ppc64le_numpy1.21python3.9.____73_pypy.yaml rename to .ci_support/linux_ppc64le_numpy1.22python3.9.____73_pypy.yaml index 22f3aa7b..a666e430 100644 --- a/.ci_support/linux_ppc64le_numpy1.21python3.9.____73_pypy.yaml +++ b/.ci_support/linux_ppc64le_numpy1.22python3.9.____73_pypy.yaml @@ -17,7 +17,7 @@ docker_image: freetype: - '2' numpy: -- '1.21' +- '1.22' pin_run_as_build: python: min_pin: x.x @@ -35,4 +35,4 @@ zip_keys: - numpy - python_impl zlib: -- '1.2' +- '1' diff --git a/.ci_support/linux_ppc64le_numpy1.21python3.10.____cpython.yaml b/.ci_support/linux_ppc64le_numpy2.0python3.10.____cpython.yaml similarity index 96% rename from .ci_support/linux_ppc64le_numpy1.21python3.10.____cpython.yaml rename to .ci_support/linux_ppc64le_numpy2.0python3.10.____cpython.yaml index 61235591..026abdd0 100644 --- a/.ci_support/linux_ppc64le_numpy1.21python3.10.____cpython.yaml +++ b/.ci_support/linux_ppc64le_numpy2.0python3.10.____cpython.yaml @@ -17,7 +17,7 @@ docker_image: freetype: - '2' numpy: -- '1.21' +- '2.0' pin_run_as_build: python: min_pin: x.x @@ -35,4 +35,4 @@ zip_keys: - numpy - python_impl zlib: -- '1.2' +- '1' diff --git a/.ci_support/linux_ppc64le_numpy1.23python3.11.____cpython.yaml b/.ci_support/linux_ppc64le_numpy2.0python3.11.____cpython.yaml similarity index 96% rename from .ci_support/linux_ppc64le_numpy1.23python3.11.____cpython.yaml rename to .ci_support/linux_ppc64le_numpy2.0python3.11.____cpython.yaml index bb4e5c7c..aaec4983 100644 --- a/.ci_support/linux_ppc64le_numpy1.23python3.11.____cpython.yaml +++ b/.ci_support/linux_ppc64le_numpy2.0python3.11.____cpython.yaml @@ -17,7 +17,7 @@ docker_image: freetype: - '2' numpy: -- '1.23' +- '2.0' pin_run_as_build: python: min_pin: x.x @@ -35,4 +35,4 @@ zip_keys: - numpy - python_impl zlib: -- '1.2' +- '1' diff --git a/.ci_support/linux_ppc64le_numpy2.0python3.12.____cpython.yaml b/.ci_support/linux_ppc64le_numpy2.0python3.12.____cpython.yaml new file mode 100644 index 00000000..2ce425ba --- /dev/null +++ b/.ci_support/linux_ppc64le_numpy2.0python3.12.____cpython.yaml @@ -0,0 +1,38 @@ +c_compiler: +- gcc +c_compiler_version: +- '12' +cdt_name: +- cos7 +channel_sources: +- conda-forge +channel_targets: +- conda-forge matplotlib_rc +cxx_compiler: +- gxx +cxx_compiler_version: +- '12' +docker_image: +- quay.io/condaforge/linux-anvil-cos7-x86_64 +freetype: +- '2' +numpy: +- '2.0' +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +python: +- 3.12.* *_cpython +python_impl: +- cpython +target_platform: +- linux-ppc64le +zip_keys: +- - c_compiler_version + - cxx_compiler_version +- - python + - numpy + - python_impl +zlib: +- '1' diff --git a/.ci_support/linux_ppc64le_numpy1.21python3.9.____cpython.yaml b/.ci_support/linux_ppc64le_numpy2.0python3.9.____cpython.yaml similarity index 96% rename from .ci_support/linux_ppc64le_numpy1.21python3.9.____cpython.yaml rename to .ci_support/linux_ppc64le_numpy2.0python3.9.____cpython.yaml index 295f54ec..819bcf80 100644 --- a/.ci_support/linux_ppc64le_numpy1.21python3.9.____cpython.yaml +++ b/.ci_support/linux_ppc64le_numpy2.0python3.9.____cpython.yaml @@ -17,7 +17,7 @@ docker_image: freetype: - '2' numpy: -- '1.21' +- '2.0' pin_run_as_build: python: min_pin: x.x @@ -35,4 +35,4 @@ zip_keys: - numpy - python_impl zlib: -- '1.2' +- '1' diff --git a/.ci_support/migrations/python311.yaml b/.ci_support/migrations/python311.yaml deleted file mode 100644 index d23a0fd2..00000000 --- a/.ci_support/migrations/python311.yaml +++ /dev/null @@ -1,37 +0,0 @@ -migrator_ts: 1666686085 -__migrator: - migration_number: 1 - operation: key_add - primary_key: python - ordering: - python: - - 3.6.* *_cpython - - 3.7.* *_cpython - - 3.8.* *_cpython - - 3.9.* *_cpython - - 3.10.* *_cpython - - 3.11.* *_cpython # new entry - - 3.6.* *_73_pypy - - 3.7.* *_73_pypy - - 3.8.* *_73_pypy - - 3.9.* *_73_pypy - paused: false - longterm: True - pr_limit: 10 - max_solver_attempts: 10 # this will make the bot retry "not solvable" stuff 10 times - exclude: - # this shouldn't attempt to modify the python feedstocks - - python - - pypy3.6 - - pypy-meta - - cross-python - - python_abi - exclude_pinned_pkgs: false - -python: - - 3.11.* *_cpython -# additional entries to add for zip_keys -numpy: - - 1.23 -python_impl: - - cpython diff --git a/.ci_support/osx_64_numpy1.21python3.8.____73_pypy.yaml b/.ci_support/osx_64_numpy1.21python3.8.____73_pypy.yaml deleted file mode 100644 index fb93d678..00000000 --- a/.ci_support/osx_64_numpy1.21python3.8.____73_pypy.yaml +++ /dev/null @@ -1,40 +0,0 @@ -MACOSX_DEPLOYMENT_TARGET: -- '10.12' -MACOSX_SDK_VERSION: -- '10.12' -c_compiler: -- clang -c_compiler_version: -- '15' -channel_sources: -- conda-forge -channel_targets: -- conda-forge matplotlib_rc -cxx_compiler: -- clangxx -cxx_compiler_version: -- '15' -freetype: -- '2' -macos_machine: -- x86_64-apple-darwin13.4.0 -numpy: -- '1.21' -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -python: -- 3.8.* *_73_pypy -python_impl: -- pypy -target_platform: -- osx-64 -zip_keys: -- - c_compiler_version - - cxx_compiler_version -- - python - - numpy - - python_impl -zlib: -- '1.2' diff --git a/.ci_support/osx_64_numpy1.21python3.8.____cpython.yaml b/.ci_support/osx_64_numpy1.22python3.8.____cpython.yaml similarity index 90% rename from .ci_support/osx_64_numpy1.21python3.8.____cpython.yaml rename to .ci_support/osx_64_numpy1.22python3.8.____cpython.yaml index c24278ca..02742abe 100644 --- a/.ci_support/osx_64_numpy1.21python3.8.____cpython.yaml +++ b/.ci_support/osx_64_numpy1.22python3.8.____cpython.yaml @@ -1,11 +1,11 @@ MACOSX_DEPLOYMENT_TARGET: -- '10.12' +- '10.13' MACOSX_SDK_VERSION: -- '10.12' +- '10.13' c_compiler: - clang c_compiler_version: -- '15' +- '16' channel_sources: - conda-forge channel_targets: @@ -13,13 +13,13 @@ channel_targets: cxx_compiler: - clangxx cxx_compiler_version: -- '15' +- '16' freetype: - '2' macos_machine: - x86_64-apple-darwin13.4.0 numpy: -- '1.21' +- '1.22' pin_run_as_build: python: min_pin: x.x @@ -37,4 +37,4 @@ zip_keys: - numpy - python_impl zlib: -- '1.2' +- '1' diff --git a/.ci_support/osx_64_numpy1.21python3.9.____73_pypy.yaml b/.ci_support/osx_64_numpy1.22python3.9.____73_pypy.yaml similarity index 90% rename from .ci_support/osx_64_numpy1.21python3.9.____73_pypy.yaml rename to .ci_support/osx_64_numpy1.22python3.9.____73_pypy.yaml index caa451f1..7f579c67 100644 --- a/.ci_support/osx_64_numpy1.21python3.9.____73_pypy.yaml +++ b/.ci_support/osx_64_numpy1.22python3.9.____73_pypy.yaml @@ -1,11 +1,11 @@ MACOSX_DEPLOYMENT_TARGET: -- '10.12' +- '10.13' MACOSX_SDK_VERSION: -- '10.12' +- '10.13' c_compiler: - clang c_compiler_version: -- '15' +- '16' channel_sources: - conda-forge channel_targets: @@ -13,13 +13,13 @@ channel_targets: cxx_compiler: - clangxx cxx_compiler_version: -- '15' +- '16' freetype: - '2' macos_machine: - x86_64-apple-darwin13.4.0 numpy: -- '1.21' +- '1.22' pin_run_as_build: python: min_pin: x.x @@ -37,4 +37,4 @@ zip_keys: - numpy - python_impl zlib: -- '1.2' +- '1' diff --git a/.ci_support/osx_64_numpy1.21python3.10.____cpython.yaml b/.ci_support/osx_64_numpy2.0python3.10.____cpython.yaml similarity index 90% rename from .ci_support/osx_64_numpy1.21python3.10.____cpython.yaml rename to .ci_support/osx_64_numpy2.0python3.10.____cpython.yaml index 4ea79216..eee9802a 100644 --- a/.ci_support/osx_64_numpy1.21python3.10.____cpython.yaml +++ b/.ci_support/osx_64_numpy2.0python3.10.____cpython.yaml @@ -1,11 +1,11 @@ MACOSX_DEPLOYMENT_TARGET: -- '10.12' +- '10.13' MACOSX_SDK_VERSION: -- '10.12' +- '10.13' c_compiler: - clang c_compiler_version: -- '15' +- '16' channel_sources: - conda-forge channel_targets: @@ -13,13 +13,13 @@ channel_targets: cxx_compiler: - clangxx cxx_compiler_version: -- '15' +- '16' freetype: - '2' macos_machine: - x86_64-apple-darwin13.4.0 numpy: -- '1.21' +- '2.0' pin_run_as_build: python: min_pin: x.x @@ -37,4 +37,4 @@ zip_keys: - numpy - python_impl zlib: -- '1.2' +- '1' diff --git a/.ci_support/osx_64_numpy1.23python3.11.____cpython.yaml b/.ci_support/osx_64_numpy2.0python3.11.____cpython.yaml similarity index 90% rename from .ci_support/osx_64_numpy1.23python3.11.____cpython.yaml rename to .ci_support/osx_64_numpy2.0python3.11.____cpython.yaml index 1e07c6dc..d7345eb1 100644 --- a/.ci_support/osx_64_numpy1.23python3.11.____cpython.yaml +++ b/.ci_support/osx_64_numpy2.0python3.11.____cpython.yaml @@ -1,11 +1,11 @@ MACOSX_DEPLOYMENT_TARGET: -- '10.12' +- '10.13' MACOSX_SDK_VERSION: -- '10.12' +- '10.13' c_compiler: - clang c_compiler_version: -- '15' +- '16' channel_sources: - conda-forge channel_targets: @@ -13,13 +13,13 @@ channel_targets: cxx_compiler: - clangxx cxx_compiler_version: -- '15' +- '16' freetype: - '2' macos_machine: - x86_64-apple-darwin13.4.0 numpy: -- '1.23' +- '2.0' pin_run_as_build: python: min_pin: x.x @@ -37,4 +37,4 @@ zip_keys: - numpy - python_impl zlib: -- '1.2' +- '1' diff --git a/.ci_support/osx_64_numpy2.0python3.12.____cpython.yaml b/.ci_support/osx_64_numpy2.0python3.12.____cpython.yaml new file mode 100644 index 00000000..ca5826d3 --- /dev/null +++ b/.ci_support/osx_64_numpy2.0python3.12.____cpython.yaml @@ -0,0 +1,40 @@ +MACOSX_DEPLOYMENT_TARGET: +- '10.13' +MACOSX_SDK_VERSION: +- '10.13' +c_compiler: +- clang +c_compiler_version: +- '16' +channel_sources: +- conda-forge +channel_targets: +- conda-forge matplotlib_rc +cxx_compiler: +- clangxx +cxx_compiler_version: +- '16' +freetype: +- '2' +macos_machine: +- x86_64-apple-darwin13.4.0 +numpy: +- '2.0' +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +python: +- 3.12.* *_cpython +python_impl: +- cpython +target_platform: +- osx-64 +zip_keys: +- - c_compiler_version + - cxx_compiler_version +- - python + - numpy + - python_impl +zlib: +- '1' diff --git a/.ci_support/osx_64_numpy1.21python3.9.____cpython.yaml b/.ci_support/osx_64_numpy2.0python3.9.____cpython.yaml similarity index 90% rename from .ci_support/osx_64_numpy1.21python3.9.____cpython.yaml rename to .ci_support/osx_64_numpy2.0python3.9.____cpython.yaml index 343432f7..e86d835f 100644 --- a/.ci_support/osx_64_numpy1.21python3.9.____cpython.yaml +++ b/.ci_support/osx_64_numpy2.0python3.9.____cpython.yaml @@ -1,11 +1,11 @@ MACOSX_DEPLOYMENT_TARGET: -- '10.12' +- '10.13' MACOSX_SDK_VERSION: -- '10.12' +- '10.13' c_compiler: - clang c_compiler_version: -- '15' +- '16' channel_sources: - conda-forge channel_targets: @@ -13,13 +13,13 @@ channel_targets: cxx_compiler: - clangxx cxx_compiler_version: -- '15' +- '16' freetype: - '2' macos_machine: - x86_64-apple-darwin13.4.0 numpy: -- '1.21' +- '2.0' pin_run_as_build: python: min_pin: x.x @@ -37,4 +37,4 @@ zip_keys: - numpy - python_impl zlib: -- '1.2' +- '1' diff --git a/.ci_support/osx_arm64_numpy1.21python3.8.____cpython.yaml b/.ci_support/osx_arm64_numpy1.22python3.8.____cpython.yaml similarity index 89% rename from .ci_support/osx_arm64_numpy1.21python3.8.____cpython.yaml rename to .ci_support/osx_arm64_numpy1.22python3.8.____cpython.yaml index 90d92057..a4786603 100644 --- a/.ci_support/osx_arm64_numpy1.21python3.8.____cpython.yaml +++ b/.ci_support/osx_arm64_numpy1.22python3.8.____cpython.yaml @@ -1,9 +1,11 @@ MACOSX_DEPLOYMENT_TARGET: - '11.0' +MACOSX_SDK_VERSION: +- '11.0' c_compiler: - clang c_compiler_version: -- '15' +- '16' channel_sources: - conda-forge channel_targets: @@ -11,13 +13,13 @@ channel_targets: cxx_compiler: - clangxx cxx_compiler_version: -- '15' +- '16' freetype: - '2' macos_machine: - arm64-apple-darwin20.0.0 numpy: -- '1.21' +- '1.22' pin_run_as_build: python: min_pin: x.x @@ -35,4 +37,4 @@ zip_keys: - numpy - python_impl zlib: -- '1.2' +- '1' diff --git a/.ci_support/osx_arm64_numpy1.21python3.10.____cpython.yaml b/.ci_support/osx_arm64_numpy2.0python3.10.____cpython.yaml similarity index 89% rename from .ci_support/osx_arm64_numpy1.21python3.10.____cpython.yaml rename to .ci_support/osx_arm64_numpy2.0python3.10.____cpython.yaml index 0ea2a16e..ba71cb13 100644 --- a/.ci_support/osx_arm64_numpy1.21python3.10.____cpython.yaml +++ b/.ci_support/osx_arm64_numpy2.0python3.10.____cpython.yaml @@ -1,9 +1,11 @@ MACOSX_DEPLOYMENT_TARGET: - '11.0' +MACOSX_SDK_VERSION: +- '11.0' c_compiler: - clang c_compiler_version: -- '15' +- '16' channel_sources: - conda-forge channel_targets: @@ -11,13 +13,13 @@ channel_targets: cxx_compiler: - clangxx cxx_compiler_version: -- '15' +- '16' freetype: - '2' macos_machine: - arm64-apple-darwin20.0.0 numpy: -- '1.21' +- '2.0' pin_run_as_build: python: min_pin: x.x @@ -35,4 +37,4 @@ zip_keys: - numpy - python_impl zlib: -- '1.2' +- '1' diff --git a/.ci_support/osx_arm64_numpy1.23python3.11.____cpython.yaml b/.ci_support/osx_arm64_numpy2.0python3.11.____cpython.yaml similarity index 89% rename from .ci_support/osx_arm64_numpy1.23python3.11.____cpython.yaml rename to .ci_support/osx_arm64_numpy2.0python3.11.____cpython.yaml index c28d327f..ffee977d 100644 --- a/.ci_support/osx_arm64_numpy1.23python3.11.____cpython.yaml +++ b/.ci_support/osx_arm64_numpy2.0python3.11.____cpython.yaml @@ -1,9 +1,11 @@ MACOSX_DEPLOYMENT_TARGET: - '11.0' +MACOSX_SDK_VERSION: +- '11.0' c_compiler: - clang c_compiler_version: -- '15' +- '16' channel_sources: - conda-forge channel_targets: @@ -11,13 +13,13 @@ channel_targets: cxx_compiler: - clangxx cxx_compiler_version: -- '15' +- '16' freetype: - '2' macos_machine: - arm64-apple-darwin20.0.0 numpy: -- '1.23' +- '2.0' pin_run_as_build: python: min_pin: x.x @@ -35,4 +37,4 @@ zip_keys: - numpy - python_impl zlib: -- '1.2' +- '1' diff --git a/.ci_support/osx_arm64_numpy2.0python3.12.____cpython.yaml b/.ci_support/osx_arm64_numpy2.0python3.12.____cpython.yaml new file mode 100644 index 00000000..245db317 --- /dev/null +++ b/.ci_support/osx_arm64_numpy2.0python3.12.____cpython.yaml @@ -0,0 +1,40 @@ +MACOSX_DEPLOYMENT_TARGET: +- '11.0' +MACOSX_SDK_VERSION: +- '11.0' +c_compiler: +- clang +c_compiler_version: +- '16' +channel_sources: +- conda-forge +channel_targets: +- conda-forge matplotlib_rc +cxx_compiler: +- clangxx +cxx_compiler_version: +- '16' +freetype: +- '2' +macos_machine: +- arm64-apple-darwin20.0.0 +numpy: +- '2.0' +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +python: +- 3.12.* *_cpython +python_impl: +- cpython +target_platform: +- osx-arm64 +zip_keys: +- - c_compiler_version + - cxx_compiler_version +- - python + - numpy + - python_impl +zlib: +- '1' diff --git a/.ci_support/osx_arm64_numpy1.21python3.9.____cpython.yaml b/.ci_support/osx_arm64_numpy2.0python3.9.____cpython.yaml similarity index 89% rename from .ci_support/osx_arm64_numpy1.21python3.9.____cpython.yaml rename to .ci_support/osx_arm64_numpy2.0python3.9.____cpython.yaml index f65aaa70..ca447b5e 100644 --- a/.ci_support/osx_arm64_numpy1.21python3.9.____cpython.yaml +++ b/.ci_support/osx_arm64_numpy2.0python3.9.____cpython.yaml @@ -1,9 +1,11 @@ MACOSX_DEPLOYMENT_TARGET: - '11.0' +MACOSX_SDK_VERSION: +- '11.0' c_compiler: - clang c_compiler_version: -- '15' +- '16' channel_sources: - conda-forge channel_targets: @@ -11,13 +13,13 @@ channel_targets: cxx_compiler: - clangxx cxx_compiler_version: -- '15' +- '16' freetype: - '2' macos_machine: - arm64-apple-darwin20.0.0 numpy: -- '1.21' +- '2.0' pin_run_as_build: python: min_pin: x.x @@ -35,4 +37,4 @@ zip_keys: - numpy - python_impl zlib: -- '1.2' +- '1' diff --git a/.ci_support/win_64_numpy1.21python3.8.____73_pypy.yaml b/.ci_support/win_64_numpy1.21python3.8.____73_pypy.yaml deleted file mode 100644 index fedd13d1..00000000 --- a/.ci_support/win_64_numpy1.21python3.8.____73_pypy.yaml +++ /dev/null @@ -1,28 +0,0 @@ -c_compiler: -- vs2019 -channel_sources: -- conda-forge -channel_targets: -- conda-forge matplotlib_rc -cxx_compiler: -- vs2019 -freetype: -- '2' -numpy: -- '1.21' -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -python: -- 3.8.* *_73_pypy -python_impl: -- pypy -target_platform: -- win-64 -zip_keys: -- - python - - numpy - - python_impl -zlib: -- '1.2' diff --git a/.ci_support/win_64_numpy1.21python3.8.____cpython.yaml b/.ci_support/win_64_numpy1.22python3.8.____cpython.yaml similarity index 95% rename from .ci_support/win_64_numpy1.21python3.8.____cpython.yaml rename to .ci_support/win_64_numpy1.22python3.8.____cpython.yaml index 45b7e8f4..956ca2d7 100644 --- a/.ci_support/win_64_numpy1.21python3.8.____cpython.yaml +++ b/.ci_support/win_64_numpy1.22python3.8.____cpython.yaml @@ -9,7 +9,7 @@ cxx_compiler: freetype: - '2' numpy: -- '1.21' +- '1.22' pin_run_as_build: python: min_pin: x.x @@ -25,4 +25,4 @@ zip_keys: - numpy - python_impl zlib: -- '1.2' +- '1' diff --git a/.ci_support/win_64_numpy1.21python3.9.____73_pypy.yaml b/.ci_support/win_64_numpy1.22python3.9.____73_pypy.yaml similarity index 95% rename from .ci_support/win_64_numpy1.21python3.9.____73_pypy.yaml rename to .ci_support/win_64_numpy1.22python3.9.____73_pypy.yaml index 14d84d27..40c86ac4 100644 --- a/.ci_support/win_64_numpy1.21python3.9.____73_pypy.yaml +++ b/.ci_support/win_64_numpy1.22python3.9.____73_pypy.yaml @@ -9,7 +9,7 @@ cxx_compiler: freetype: - '2' numpy: -- '1.21' +- '1.22' pin_run_as_build: python: min_pin: x.x @@ -25,4 +25,4 @@ zip_keys: - numpy - python_impl zlib: -- '1.2' +- '1' diff --git a/.ci_support/win_64_numpy1.21python3.10.____cpython.yaml b/.ci_support/win_64_numpy2.0python3.10.____cpython.yaml similarity index 95% rename from .ci_support/win_64_numpy1.21python3.10.____cpython.yaml rename to .ci_support/win_64_numpy2.0python3.10.____cpython.yaml index d0c2292c..cdfb0a30 100644 --- a/.ci_support/win_64_numpy1.21python3.10.____cpython.yaml +++ b/.ci_support/win_64_numpy2.0python3.10.____cpython.yaml @@ -9,7 +9,7 @@ cxx_compiler: freetype: - '2' numpy: -- '1.21' +- '2.0' pin_run_as_build: python: min_pin: x.x @@ -25,4 +25,4 @@ zip_keys: - numpy - python_impl zlib: -- '1.2' +- '1' diff --git a/.ci_support/win_64_numpy1.23python3.11.____cpython.yaml b/.ci_support/win_64_numpy2.0python3.11.____cpython.yaml similarity index 95% rename from .ci_support/win_64_numpy1.23python3.11.____cpython.yaml rename to .ci_support/win_64_numpy2.0python3.11.____cpython.yaml index 22caa20a..d1527f53 100644 --- a/.ci_support/win_64_numpy1.23python3.11.____cpython.yaml +++ b/.ci_support/win_64_numpy2.0python3.11.____cpython.yaml @@ -9,7 +9,7 @@ cxx_compiler: freetype: - '2' numpy: -- '1.23' +- '2.0' pin_run_as_build: python: min_pin: x.x @@ -25,4 +25,4 @@ zip_keys: - numpy - python_impl zlib: -- '1.2' +- '1' diff --git a/.ci_support/win_64_numpy2.0python3.12.____cpython.yaml b/.ci_support/win_64_numpy2.0python3.12.____cpython.yaml new file mode 100644 index 00000000..3ee026d5 --- /dev/null +++ b/.ci_support/win_64_numpy2.0python3.12.____cpython.yaml @@ -0,0 +1,28 @@ +c_compiler: +- vs2019 +channel_sources: +- conda-forge +channel_targets: +- conda-forge matplotlib_rc +cxx_compiler: +- vs2019 +freetype: +- '2' +numpy: +- '2.0' +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +python: +- 3.12.* *_cpython +python_impl: +- cpython +target_platform: +- win-64 +zip_keys: +- - python + - numpy + - python_impl +zlib: +- '1' diff --git a/.ci_support/win_64_numpy1.21python3.9.____cpython.yaml b/.ci_support/win_64_numpy2.0python3.9.____cpython.yaml similarity index 95% rename from .ci_support/win_64_numpy1.21python3.9.____cpython.yaml rename to .ci_support/win_64_numpy2.0python3.9.____cpython.yaml index 72e65a6a..06ad6e6f 100644 --- a/.ci_support/win_64_numpy1.21python3.9.____cpython.yaml +++ b/.ci_support/win_64_numpy2.0python3.9.____cpython.yaml @@ -9,7 +9,7 @@ cxx_compiler: freetype: - '2' numpy: -- '1.21' +- '2.0' pin_run_as_build: python: min_pin: x.x @@ -25,4 +25,4 @@ zip_keys: - numpy - python_impl zlib: -- '1.2' +- '1' diff --git a/.gitattributes b/.gitattributes index 7f327638..18f114a1 100644 --- a/.gitattributes +++ b/.gitattributes @@ -20,8 +20,8 @@ bld.bat text eol=crlf .travis.yml linguist-generated=true .scripts/* linguist-generated=true .woodpecker.yml linguist-generated=true -LICENSE.txt linguist-generated=true -README.md linguist-generated=true +/LICENSE.txt linguist-generated=true +/README.md linguist-generated=true azure-pipelines.yml linguist-generated=true build-locally.py linguist-generated=true shippable.yml linguist-generated=true diff --git a/.gitignore b/.gitignore index c89ecb7d..179afe55 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,24 @@ -*.pyc +# User content belongs under recipe/. +# Feedstock configuration goes in `conda-forge.yml` +# Everything else is managed by the conda-smithy rerender process. +# Please do not modify + +# Ignore all files and folders in root +* +!/conda-forge.yml + +# Don't ignore any files/folders if the parent folder is 'un-ignored' +# This also avoids warnings when adding an already-checked file with an ignored parent. +!/**/ +# Don't ignore any files/folders recursively in the following folders +!/recipe/** +!/.ci_support/** -build_artifacts +# Since we ignore files/folders recursively, any folders inside +# build_artifacts gets ignored which trips some build systems. +# To avoid that we 'un-ignore' all files/folders recursively +# and only ignore the root build_artifacts folder. +!/build_artifacts/** +/build_artifacts + +*.pyc diff --git a/.scripts/build_steps.sh b/.scripts/build_steps.sh index 1682b66b..a147fa70 100755 --- a/.scripts/build_steps.sh +++ b/.scripts/build_steps.sh @@ -28,14 +28,15 @@ conda-build: pkgs_dirs: - ${FEEDSTOCK_ROOT}/build_artifacts/pkg_cache - /opt/conda/pkgs +solver: libmamba CONDARC +export CONDA_LIBMAMBA_SOLVER_NO_CHANNELS_FROM_INSTALLED=1 - -mamba install --update-specs --yes --quiet --channel conda-forge \ - conda-build pip boa conda-forge-ci-setup=3 -mamba update --update-specs --yes --quiet --channel conda-forge \ - conda-build pip boa conda-forge-ci-setup=3 +mamba install --update-specs --yes --quiet --channel conda-forge --strict-channel-priority \ + pip mamba conda-build conda-forge-ci-setup=4 "conda-build>=24.1" +mamba update --update-specs --yes --quiet --channel conda-forge --strict-channel-priority \ + pip mamba conda-build conda-forge-ci-setup=4 "conda-build>=24.1" # set up the condarc setup_conda_rc "${FEEDSTOCK_ROOT}" "${RECIPE_ROOT}" "${CONFIG_FILE}" @@ -75,9 +76,17 @@ if [[ "${BUILD_WITH_CONDA_DEBUG:-0}" == 1 ]]; then # Drop into an interactive shell /bin/bash else - conda mambabuild "${RECIPE_ROOT}" -m "${CI_SUPPORT}/${CONFIG}.yaml" \ + conda-build "${RECIPE_ROOT}" -m "${CI_SUPPORT}/${CONFIG}.yaml" \ --suppress-variables ${EXTRA_CB_OPTIONS:-} \ - --clobber-file "${CI_SUPPORT}/clobber_${CONFIG}.yaml" + --clobber-file "${CI_SUPPORT}/clobber_${CONFIG}.yaml" \ + --extra-meta flow_run_id="${flow_run_id:-}" remote_url="${remote_url:-}" sha="${sha:-}" + + ( startgroup "Inspecting artifacts" ) 2> /dev/null + + # inspect_artifacts was only added in conda-forge-ci-setup 4.6.0 + command -v inspect_artifacts >/dev/null 2>&1 && inspect_artifacts || echo "inspect_artifacts needs conda-forge-ci-setup >=4.6.0" + + ( endgroup "Inspecting artifacts" ) 2> /dev/null ( startgroup "Validating outputs" ) 2> /dev/null validate_recipe_outputs "${FEEDSTOCK_NAME}" diff --git a/.scripts/logging_utils.sh b/.scripts/logging_utils.sh index 57bc95c2..aff009f0 100644 --- a/.scripts/logging_utils.sh +++ b/.scripts/logging_utils.sh @@ -12,7 +12,7 @@ function startgroup { echo "##[group]$1";; travis ) echo "$1" - echo -en 'travis_fold:start:'"${1// /}"'\\r';; + echo -en 'travis_fold:start:'"${1// /}"'\r';; github_actions ) echo "::group::$1";; * ) @@ -28,7 +28,7 @@ function endgroup { azure ) echo "##[endgroup]";; travis ) - echo -en 'travis_fold:end:'"${1// /}"'\\r';; + echo -en 'travis_fold:end:'"${1// /}"'\r';; github_actions ) echo "::endgroup::";; esac diff --git a/.scripts/run_docker_build.sh b/.scripts/run_docker_build.sh index 92362398..00f377a8 100755 --- a/.scripts/run_docker_build.sh +++ b/.scripts/run_docker_build.sh @@ -21,6 +21,12 @@ if [ -z ${FEEDSTOCK_NAME} ]; then export FEEDSTOCK_NAME=$(basename ${FEEDSTOCK_ROOT}) fi +if [[ "${sha:-}" == "" ]]; then + pushd "${FEEDSTOCK_ROOT}" + sha=$(git rev-parse HEAD) + popd +fi + docker info # In order for the conda-build process in the container to write to the mounted @@ -91,6 +97,9 @@ docker run ${DOCKER_RUN_ARGS} \ -e CPU_COUNT \ -e BUILD_WITH_CONDA_DEBUG \ -e BUILD_OUTPUT_ID \ + -e flow_run_id \ + -e remote_url \ + -e sha \ -e BINSTAR_TOKEN \ -e FEEDSTOCK_TOKEN \ -e STAGING_BINSTAR_TOKEN \ diff --git a/.scripts/run_osx_build.sh b/.scripts/run_osx_build.sh index 3969edf3..ba0c8791 100755 --- a/.scripts/run_osx_build.sh +++ b/.scripts/run_osx_build.sh @@ -22,11 +22,13 @@ bash $MINIFORGE_FILE -b -p ${MINIFORGE_HOME} source ${MINIFORGE_HOME}/etc/profile.d/conda.sh conda activate base +export CONDA_SOLVER="libmamba" +export CONDA_LIBMAMBA_SOLVER_NO_CHANNELS_FROM_INSTALLED=1 -mamba install --update-specs --quiet --yes --channel conda-forge \ - conda-build pip boa conda-forge-ci-setup=3 -mamba update --update-specs --yes --quiet --channel conda-forge \ - conda-build pip boa conda-forge-ci-setup=3 +mamba install --update-specs --quiet --yes --channel conda-forge --strict-channel-priority \ + pip mamba conda-build conda-forge-ci-setup=4 "conda-build>=24.1" +mamba update --update-specs --yes --quiet --channel conda-forge --strict-channel-priority \ + pip mamba conda-build conda-forge-ci-setup=4 "conda-build>=24.1" @@ -45,6 +47,10 @@ else echo -e "\n\nNot mangling homebrew as we are not running in CI" fi +if [[ "${sha:-}" == "" ]]; then + sha=$(git rev-parse HEAD) +fi + echo -e "\n\nRunning the build setup script." source run_conda_forge_build_setup @@ -75,9 +81,17 @@ else EXTRA_CB_OPTIONS="${EXTRA_CB_OPTIONS:-} --no-test" fi - conda mambabuild ./recipe -m ./.ci_support/${CONFIG}.yaml \ + conda-build ./recipe -m ./.ci_support/${CONFIG}.yaml \ --suppress-variables ${EXTRA_CB_OPTIONS:-} \ - --clobber-file ./.ci_support/clobber_${CONFIG}.yaml + --clobber-file ./.ci_support/clobber_${CONFIG}.yaml \ + --extra-meta flow_run_id="$flow_run_id" remote_url="$remote_url" sha="$sha" + + ( startgroup "Inspecting artifacts" ) 2> /dev/null + + # inspect_artifacts was only added in conda-forge-ci-setup 4.6.0 + command -v inspect_artifacts >/dev/null 2>&1 && inspect_artifacts || echo "inspect_artifacts needs conda-forge-ci-setup >=4.6.0" + + ( endgroup "Inspecting artifacts" ) 2> /dev/null ( startgroup "Validating outputs" ) 2> /dev/null validate_recipe_outputs "${FEEDSTOCK_NAME}" diff --git a/.scripts/run_win_build.bat b/.scripts/run_win_build.bat new file mode 100755 index 00000000..65650bf2 --- /dev/null +++ b/.scripts/run_win_build.bat @@ -0,0 +1,130 @@ +:: PLEASE NOTE: This script has been automatically generated by conda-smithy. Any changes here +:: will be lost next time ``conda smithy rerender`` is run. If you would like to make permanent +:: changes to this script, consider a proposal to conda-smithy so that other feedstocks can also +:: benefit from the improvement. + +:: Note: we assume a Miniforge installation is available + +:: INPUTS (required environment variables) +:: CONFIG: name of the .ci_support/*.yaml file for this job +:: CI: azure, github_actions, or unset +:: UPLOAD_PACKAGES: true or false +:: UPLOAD_ON_BRANCH: true or false + +setlocal enableextensions enabledelayedexpansion + +call :start_group "Configuring conda" + +:: Activate the base conda environment +call activate base +:: Configure the solver +set "CONDA_SOLVER=libmamba" +if !errorlevel! neq 0 exit /b !errorlevel! +set "CONDA_LIBMAMBA_SOLVER_NO_CHANNELS_FROM_INSTALLED=1" + +:: Provision the necessary dependencies to build the recipe later +echo Installing dependencies +mamba.exe install "python=3.10" pip mamba conda-build conda-forge-ci-setup=4 "conda-build>=24.1" -c conda-forge --strict-channel-priority --yes +if !errorlevel! neq 0 exit /b !errorlevel! + +:: Set basic configuration +echo Setting up configuration +setup_conda_rc .\ ".\recipe" .\.ci_support\%CONFIG%.yaml +if !errorlevel! neq 0 exit /b !errorlevel! +echo Running build setup +CALL run_conda_forge_build_setup + + +if !errorlevel! neq 0 exit /b !errorlevel! + +if EXIST LICENSE.txt ( + echo Copying feedstock license + copy LICENSE.txt "recipe\\recipe-scripts-license.txt" +) +if NOT [%HOST_PLATFORM%] == [%BUILD_PLATFORM%] ( + if [%CROSSCOMPILING_EMULATOR%] == [] ( + set "EXTRA_CB_OPTIONS=%EXTRA_CB_OPTIONS% --no-test" + ) +) + +if NOT [%flow_run_id%] == [] ( + set "EXTRA_CB_OPTIONS=%EXTRA_CB_OPTIONS% --extra-meta flow_run_id=%flow_run_id% remote_url=%remote_url% sha=%sha%" +) + +call :end_group + +:: Build the recipe +echo Building recipe +conda-build.exe "recipe" -m .ci_support\%CONFIG%.yaml --suppress-variables %EXTRA_CB_OPTIONS% +if !errorlevel! neq 0 exit /b !errorlevel! + +call :start_group "Inspecting artifacts" +:: inspect_artifacts was only added in conda-forge-ci-setup 4.6.0 +WHERE inspect_artifacts >nul 2>nul && inspect_artifacts || echo "inspect_artifacts needs conda-forge-ci-setup >=4.6.0" +call :end_group + +:: Prepare some environment variables for the upload step +if /i "%CI%" == "github_actions" ( + set "FEEDSTOCK_NAME=%GITHUB_REPOSITORY:*/=%" + set "GIT_BRANCH=%GITHUB_REF:refs/heads/=%" + if /i "%GITHUB_EVENT_NAME%" == "pull_request" ( + set "IS_PR_BUILD=True" + ) else ( + set "IS_PR_BUILD=False" + ) + set "TEMP=%RUNNER_TEMP%" +) +if /i "%CI%" == "azure" ( + set "FEEDSTOCK_NAME=%BUILD_REPOSITORY_NAME:*/=%" + set "GIT_BRANCH=%BUILD_SOURCEBRANCHNAME%" + if /i "%BUILD_REASON%" == "PullRequest" ( + set "IS_PR_BUILD=True" + ) else ( + set "IS_PR_BUILD=False" + ) + set "TEMP=%UPLOAD_TEMP%" +) + +:: Validate +call :start_group "Validating outputs" +validate_recipe_outputs "%FEEDSTOCK_NAME%" +if !errorlevel! neq 0 exit /b !errorlevel! +call :end_group + +if /i "%UPLOAD_PACKAGES%" == "true" ( + if /i "%IS_PR_BUILD%" == "false" ( + call :start_group "Uploading packages" + if not exist "%TEMP%\" md "%TEMP%" + set "TMP=%TEMP%" + upload_package --validate --feedstock-name="%FEEDSTOCK_NAME%" .\ ".\recipe" .ci_support\%CONFIG%.yaml + if !errorlevel! neq 0 exit /b !errorlevel! + call :end_group + ) +) + +exit + +:: Logging subroutines + +:start_group +if /i "%CI%" == "github_actions" ( + echo ::group::%~1 + exit /b +) +if /i "%CI%" == "azure" ( + echo ##[group]%~1 + exit /b +) +echo %~1 +exit /b + +:end_group +if /i "%CI%" == "github_actions" ( + echo ::endgroup:: + exit /b +) +if /i "%CI%" == "azure" ( + echo ##[endgroup] + exit /b +) +exit /b \ No newline at end of file diff --git a/README.md b/README.md index 5517ad38..4b9a8aad 100644 --- a/README.md +++ b/README.md @@ -38,241 +38,248 @@ Current build status - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + + + + @@ -294,14 +301,14 @@ Current release info Installing matplotlib-suite =========================== -Installing `matplotlib-suite` from the `conda-forge` channel can be achieved by adding `conda-forge` to your channels with: +Installing `matplotlib-suite` from the `conda-forge/label/matplotlib_rc` channel can be achieved by adding `conda-forge/label/matplotlib_rc` to your channels with: ``` -conda config --add channels conda-forge +conda config --add channels conda-forge/label/matplotlib_rc conda config --set channel_priority strict ``` -Once the `conda-forge` channel has been enabled, `matplotlib, matplotlib-base` can be installed with `conda`: +Once the `conda-forge/label/matplotlib_rc` channel has been enabled, `matplotlib, matplotlib-base` can be installed with `conda`: ``` conda install matplotlib matplotlib-base @@ -316,26 +323,26 @@ mamba install matplotlib matplotlib-base It is possible to list all of the versions of `matplotlib` available on your platform with `conda`: ``` -conda search matplotlib --channel conda-forge +conda search matplotlib --channel conda-forge/label/matplotlib_rc ``` or with `mamba`: ``` -mamba search matplotlib --channel conda-forge +mamba search matplotlib --channel conda-forge/label/matplotlib_rc ``` Alternatively, `mamba repoquery` may provide more information: ``` # Search all versions available on your platform: -mamba repoquery search matplotlib --channel conda-forge +mamba repoquery search matplotlib --channel conda-forge/label/matplotlib_rc # List packages depending on `matplotlib`: -mamba repoquery whoneeds matplotlib --channel conda-forge +mamba repoquery whoneeds matplotlib --channel conda-forge/label/matplotlib_rc # List dependencies of `matplotlib`: -mamba repoquery depends matplotlib --channel conda-forge +mamba repoquery depends matplotlib --channel conda-forge/label/matplotlib_rc ``` @@ -357,7 +364,7 @@ available continuous integration services. Thanks to the awesome service provide [CircleCI](https://circleci.com/), [AppVeyor](https://www.appveyor.com/), [Drone](https://cloud.drone.io/welcome), and [TravisCI](https://travis-ci.com/) it is possible to build and upload installable packages to the -[conda-forge](https://anaconda.org/conda-forge) [Anaconda-Cloud](https://anaconda.org/) +[conda-forge](https://anaconda.org/conda-forge) [anaconda.org](https://anaconda.org/) channel for Linux, Windows and OSX respectively. To manage the continuous integration and simplify feedstock maintenance diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 6b346f50..e5306da9 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -4,5 +4,5 @@ jobs: - template: ./.azure-pipelines/azure-pipelines-linux.yml - - template: ./.azure-pipelines/azure-pipelines-win.yml - - template: ./.azure-pipelines/azure-pipelines-osx.yml \ No newline at end of file + - template: ./.azure-pipelines/azure-pipelines-osx.yml + - template: ./.azure-pipelines/azure-pipelines-win.yml \ No newline at end of file diff --git a/build-locally.py b/build-locally.py index 3f4b7a79..e0d408d0 100755 --- a/build-locally.py +++ b/build-locally.py @@ -64,8 +64,9 @@ def verify_config(ns): elif ns.config.startswith("osx"): if "OSX_SDK_DIR" not in os.environ: raise RuntimeError( - "Need OSX_SDK_DIR env variable set. Run 'export OSX_SDK_DIR=SDKs' " - "to download the SDK automatically to 'SDKs/MacOSX.sdk'. " + "Need OSX_SDK_DIR env variable set. Run 'export OSX_SDK_DIR=$PWD/SDKs' " + "to download the SDK automatically to '$PWD/SDKs/MacOSX.sdk'. " + "Note: OSX_SDK_DIR must be set to an absolute path. " "Setting this variable implies agreement to the licensing terms of the SDK by Apple." ) From 939e7222d338ecd5f3048522504fb0c68c81d96a Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Fri, 28 Jun 2024 12:41:47 +0000 Subject: [PATCH 88/95] Rebuild for python312 --- .ci_support/migrations/python312.yaml | 38 +++++++++++++++++++++++++++ conda-forge.yml | 4 +-- recipe/meta.yaml | 2 +- 3 files changed, 41 insertions(+), 3 deletions(-) create mode 100644 .ci_support/migrations/python312.yaml diff --git a/.ci_support/migrations/python312.yaml b/.ci_support/migrations/python312.yaml new file mode 100644 index 00000000..d71f6f16 --- /dev/null +++ b/.ci_support/migrations/python312.yaml @@ -0,0 +1,38 @@ +migrator_ts: 1695046563 +__migrator: + migration_number: 1 + operation: key_add + primary_key: python + ordering: + python: + - 3.6.* *_cpython + - 3.7.* *_cpython + - 3.8.* *_cpython + - 3.9.* *_cpython + - 3.10.* *_cpython + - 3.11.* *_cpython + - 3.12.* *_cpython # new entry + - 3.6.* *_73_pypy + - 3.7.* *_73_pypy + - 3.8.* *_73_pypy + - 3.9.* *_73_pypy + paused: false + longterm: True + pr_limit: 5 + max_solver_attempts: 6 # this will make the bot retry "not solvable" stuff 6 times + exclude: + # this shouldn't attempt to modify the python feedstocks + - python + - pypy3.6 + - pypy-meta + - cross-python + - python_abi + exclude_pinned_pkgs: false + +python: + - 3.12.* *_cpython +# additional entries to add for zip_keys +numpy: + - 1.26 +python_impl: + - cpython diff --git a/conda-forge.yml b/conda-forge.yml index 1a735061..58154bb6 100644 --- a/conda-forge.yml +++ b/conda-forge.yml @@ -5,6 +5,8 @@ build_platform: linux_aarch64: linux_64 linux_ppc64le: linux_64 osx_arm64: osx_64 +conda_build: + pkg_format: '2' conda_forge_output_validation: true github: branch_name: main @@ -15,6 +17,4 @@ provider: linux_ppc64le: default osx: azure win: azure -conda_build: - pkg_format: '2' test: native_and_emulated diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 967e6a84..74fd402e 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -12,7 +12,7 @@ source: sha256: f97316cbd46b5d28699254e3520e295e30b3deb6ec43b7a1aac62bffa2d9f497 build: - number: 0 + number: 1 outputs: - name: matplotlib-base From 715f29904925abef6f4ff4fd775c16c200c31555 Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Fri, 28 Jun 2024 12:44:34 +0000 Subject: [PATCH 89/95] MNT: Re-rendered with conda-build 24.5.1, conda-smithy 3.36.2, and conda-forge-pinning 2024.06.28.09.32.10 --- .azure-pipelines/azure-pipelines-linux.yml | 68 ++++---- .azure-pipelines/azure-pipelines-osx.yml | 43 ++--- .azure-pipelines/azure-pipelines-win.yml | 81 +++------- ...nux_64_numpy1.21python3.8.____73_pypy.yaml | 40 ----- ...x_64_numpy1.22python3.10.____cpython.yaml} | 4 +- ...ux_64_numpy1.22python3.8.____cpython.yaml} | 4 +- ...ux_64_numpy1.22python3.9.____73_pypy.yaml} | 4 +- ...ux_64_numpy1.22python3.9.____cpython.yaml} | 4 +- ...ux_64_numpy1.23python3.11.____cpython.yaml | 2 +- ...ux_64_numpy1.26python3.12.____cpython.yaml | 40 +++++ ...arch64_numpy1.21python3.8.____73_pypy.yaml | 44 ------ ...ch64_numpy1.22python3.10.____cpython.yaml} | 4 +- ...rch64_numpy1.22python3.8.____cpython.yaml} | 4 +- ...rch64_numpy1.22python3.9.____73_pypy.yaml} | 4 +- ...rch64_numpy1.22python3.9.____cpython.yaml} | 4 +- ...rch64_numpy1.23python3.11.____cpython.yaml | 2 +- ...rch64_numpy1.26python3.12.____cpython.yaml | 44 ++++++ ...pc64le_numpy1.21python3.8.____73_pypy.yaml | 38 ----- ...64le_numpy1.22python3.10.____cpython.yaml} | 4 +- ...c64le_numpy1.22python3.8.____cpython.yaml} | 4 +- ...c64le_numpy1.22python3.9.____73_pypy.yaml} | 4 +- ...c64le_numpy1.22python3.9.____cpython.yaml} | 4 +- ...c64le_numpy1.23python3.11.____cpython.yaml | 2 +- ...c64le_numpy1.26python3.12.____cpython.yaml | 38 +++++ .ci_support/migrations/python311.yaml | 37 ----- ...osx_64_numpy1.21python3.8.____73_pypy.yaml | 40 ----- ...x_64_numpy1.22python3.10.____cpython.yaml} | 12 +- ...sx_64_numpy1.22python3.8.____cpython.yaml} | 12 +- ...sx_64_numpy1.22python3.9.____73_pypy.yaml} | 12 +- ...sx_64_numpy1.22python3.9.____cpython.yaml} | 12 +- ...sx_64_numpy1.23python3.11.____cpython.yaml | 10 +- ...sx_64_numpy1.26python3.12.____cpython.yaml | 40 +++++ ...rm64_numpy1.22python3.10.____cpython.yaml} | 10 +- ...arm64_numpy1.22python3.8.____cpython.yaml} | 10 +- ...arm64_numpy1.22python3.9.____cpython.yaml} | 10 +- ...arm64_numpy1.23python3.11.____cpython.yaml | 8 +- ...arm64_numpy1.26python3.12.____cpython.yaml | 40 +++++ ...n_64_numpy1.22python3.10.____cpython.yaml} | 4 +- ...in_64_numpy1.22python3.8.____cpython.yaml} | 4 +- ...in_64_numpy1.22python3.9.____73_pypy.yaml} | 4 +- ...in_64_numpy1.22python3.9.____cpython.yaml} | 4 +- ...in_64_numpy1.23python3.11.____cpython.yaml | 2 +- ...n_64_numpy1.26python3.12.____cpython.yaml} | 8 +- .gitattributes | 4 +- .gitignore | 25 ++- .scripts/build_steps.sh | 23 ++- .scripts/logging_utils.sh | 4 +- .scripts/run_docker_build.sh | 9 ++ .scripts/run_osx_build.sh | 26 +++- .scripts/run_win_build.bat | 130 ++++++++++++++++ README.md | 147 +++++++++--------- azure-pipelines.yml | 4 +- build-locally.py | 5 +- 53 files changed, 661 insertions(+), 485 deletions(-) delete mode 100644 .ci_support/linux_64_numpy1.21python3.8.____73_pypy.yaml rename .ci_support/{linux_64_numpy1.21python3.10.____cpython.yaml => linux_64_numpy1.22python3.10.____cpython.yaml} (96%) rename .ci_support/{linux_64_numpy1.21python3.8.____cpython.yaml => linux_64_numpy1.22python3.8.____cpython.yaml} (96%) rename .ci_support/{linux_64_numpy1.21python3.9.____73_pypy.yaml => linux_64_numpy1.22python3.9.____73_pypy.yaml} (96%) rename .ci_support/{linux_64_numpy1.21python3.9.____cpython.yaml => linux_64_numpy1.22python3.9.____cpython.yaml} (96%) create mode 100644 .ci_support/linux_64_numpy1.26python3.12.____cpython.yaml delete mode 100644 .ci_support/linux_aarch64_numpy1.21python3.8.____73_pypy.yaml rename .ci_support/{linux_aarch64_numpy1.21python3.10.____cpython.yaml => linux_aarch64_numpy1.22python3.10.____cpython.yaml} (97%) rename .ci_support/{linux_aarch64_numpy1.21python3.8.____cpython.yaml => linux_aarch64_numpy1.22python3.8.____cpython.yaml} (97%) rename .ci_support/{linux_aarch64_numpy1.21python3.9.____73_pypy.yaml => linux_aarch64_numpy1.22python3.9.____73_pypy.yaml} (97%) rename .ci_support/{linux_aarch64_numpy1.21python3.9.____cpython.yaml => linux_aarch64_numpy1.22python3.9.____cpython.yaml} (97%) create mode 100644 .ci_support/linux_aarch64_numpy1.26python3.12.____cpython.yaml delete mode 100644 .ci_support/linux_ppc64le_numpy1.21python3.8.____73_pypy.yaml rename .ci_support/{linux_ppc64le_numpy1.21python3.10.____cpython.yaml => linux_ppc64le_numpy1.22python3.10.____cpython.yaml} (96%) rename .ci_support/{linux_ppc64le_numpy1.21python3.8.____cpython.yaml => linux_ppc64le_numpy1.22python3.8.____cpython.yaml} (96%) rename .ci_support/{linux_ppc64le_numpy1.21python3.9.____73_pypy.yaml => linux_ppc64le_numpy1.22python3.9.____73_pypy.yaml} (96%) rename .ci_support/{linux_ppc64le_numpy1.21python3.9.____cpython.yaml => linux_ppc64le_numpy1.22python3.9.____cpython.yaml} (96%) create mode 100644 .ci_support/linux_ppc64le_numpy1.26python3.12.____cpython.yaml delete mode 100644 .ci_support/migrations/python311.yaml delete mode 100644 .ci_support/osx_64_numpy1.21python3.8.____73_pypy.yaml rename .ci_support/{osx_64_numpy1.21python3.10.____cpython.yaml => osx_64_numpy1.22python3.10.____cpython.yaml} (90%) rename .ci_support/{osx_64_numpy1.21python3.8.____cpython.yaml => osx_64_numpy1.22python3.8.____cpython.yaml} (90%) rename .ci_support/{osx_64_numpy1.21python3.9.____73_pypy.yaml => osx_64_numpy1.22python3.9.____73_pypy.yaml} (90%) rename .ci_support/{osx_64_numpy1.21python3.9.____cpython.yaml => osx_64_numpy1.22python3.9.____cpython.yaml} (90%) create mode 100644 .ci_support/osx_64_numpy1.26python3.12.____cpython.yaml rename .ci_support/{osx_arm64_numpy1.21python3.10.____cpython.yaml => osx_arm64_numpy1.22python3.10.____cpython.yaml} (89%) rename .ci_support/{osx_arm64_numpy1.21python3.8.____cpython.yaml => osx_arm64_numpy1.22python3.8.____cpython.yaml} (89%) rename .ci_support/{osx_arm64_numpy1.21python3.9.____cpython.yaml => osx_arm64_numpy1.22python3.9.____cpython.yaml} (89%) create mode 100644 .ci_support/osx_arm64_numpy1.26python3.12.____cpython.yaml rename .ci_support/{win_64_numpy1.21python3.10.____cpython.yaml => win_64_numpy1.22python3.10.____cpython.yaml} (95%) rename .ci_support/{win_64_numpy1.21python3.8.____cpython.yaml => win_64_numpy1.22python3.8.____cpython.yaml} (95%) rename .ci_support/{win_64_numpy1.21python3.9.____73_pypy.yaml => win_64_numpy1.22python3.9.____73_pypy.yaml} (95%) rename .ci_support/{win_64_numpy1.21python3.9.____cpython.yaml => win_64_numpy1.22python3.9.____cpython.yaml} (95%) rename .ci_support/{win_64_numpy1.21python3.8.____73_pypy.yaml => win_64_numpy1.26python3.12.____cpython.yaml} (87%) create mode 100755 .scripts/run_win_build.bat diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml index d42ff128..229a62a6 100755 --- a/.azure-pipelines/azure-pipelines-linux.yml +++ b/.azure-pipelines/azure-pipelines-linux.yml @@ -8,79 +8,80 @@ jobs: vmImage: ubuntu-latest strategy: matrix: - linux_64_numpy1.21python3.10.____cpython: - CONFIG: linux_64_numpy1.21python3.10.____cpython + linux_64_numpy1.22python3.10.____cpython: + CONFIG: linux_64_numpy1.22python3.10.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_64_numpy1.21python3.8.____73_pypy: - CONFIG: linux_64_numpy1.21python3.8.____73_pypy + linux_64_numpy1.22python3.8.____cpython: + CONFIG: linux_64_numpy1.22python3.8.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_64_numpy1.21python3.8.____cpython: - CONFIG: linux_64_numpy1.21python3.8.____cpython + linux_64_numpy1.22python3.9.____73_pypy: + CONFIG: linux_64_numpy1.22python3.9.____73_pypy UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_64_numpy1.21python3.9.____73_pypy: - CONFIG: linux_64_numpy1.21python3.9.____73_pypy - UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_64_numpy1.21python3.9.____cpython: - CONFIG: linux_64_numpy1.21python3.9.____cpython + linux_64_numpy1.22python3.9.____cpython: + CONFIG: linux_64_numpy1.22python3.9.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 linux_64_numpy1.23python3.11.____cpython: CONFIG: linux_64_numpy1.23python3.11.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_aarch64_numpy1.21python3.10.____cpython: - CONFIG: linux_aarch64_numpy1.21python3.10.____cpython + linux_64_numpy1.26python3.12.____cpython: + CONFIG: linux_64_numpy1.26python3.12.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_aarch64_numpy1.21python3.8.____73_pypy: - CONFIG: linux_aarch64_numpy1.21python3.8.____73_pypy + linux_aarch64_numpy1.22python3.10.____cpython: + CONFIG: linux_aarch64_numpy1.22python3.10.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_aarch64_numpy1.21python3.8.____cpython: - CONFIG: linux_aarch64_numpy1.21python3.8.____cpython + linux_aarch64_numpy1.22python3.8.____cpython: + CONFIG: linux_aarch64_numpy1.22python3.8.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_aarch64_numpy1.21python3.9.____73_pypy: - CONFIG: linux_aarch64_numpy1.21python3.9.____73_pypy + linux_aarch64_numpy1.22python3.9.____73_pypy: + CONFIG: linux_aarch64_numpy1.22python3.9.____73_pypy UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_aarch64_numpy1.21python3.9.____cpython: - CONFIG: linux_aarch64_numpy1.21python3.9.____cpython + linux_aarch64_numpy1.22python3.9.____cpython: + CONFIG: linux_aarch64_numpy1.22python3.9.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 linux_aarch64_numpy1.23python3.11.____cpython: CONFIG: linux_aarch64_numpy1.23python3.11.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_ppc64le_numpy1.21python3.10.____cpython: - CONFIG: linux_ppc64le_numpy1.21python3.10.____cpython + linux_aarch64_numpy1.26python3.12.____cpython: + CONFIG: linux_aarch64_numpy1.26python3.12.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_ppc64le_numpy1.21python3.8.____73_pypy: - CONFIG: linux_ppc64le_numpy1.21python3.8.____73_pypy + linux_ppc64le_numpy1.22python3.10.____cpython: + CONFIG: linux_ppc64le_numpy1.22python3.10.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_ppc64le_numpy1.21python3.8.____cpython: - CONFIG: linux_ppc64le_numpy1.21python3.8.____cpython + linux_ppc64le_numpy1.22python3.8.____cpython: + CONFIG: linux_ppc64le_numpy1.22python3.8.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_ppc64le_numpy1.21python3.9.____73_pypy: - CONFIG: linux_ppc64le_numpy1.21python3.9.____73_pypy + linux_ppc64le_numpy1.22python3.9.____73_pypy: + CONFIG: linux_ppc64le_numpy1.22python3.9.____73_pypy UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_ppc64le_numpy1.21python3.9.____cpython: - CONFIG: linux_ppc64le_numpy1.21python3.9.____cpython + linux_ppc64le_numpy1.22python3.9.____cpython: + CONFIG: linux_ppc64le_numpy1.22python3.9.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 linux_ppc64le_numpy1.23python3.11.____cpython: CONFIG: linux_ppc64le_numpy1.23python3.11.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 + linux_ppc64le_numpy1.26python3.12.____cpython: + CONFIG: linux_ppc64le_numpy1.26python3.12.____cpython + UPLOAD_PACKAGES: 'True' + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 timeoutInMinutes: 360 + variables: {} steps: # configure qemu binfmt-misc running. This allows us to run docker containers @@ -93,6 +94,9 @@ jobs: - script: | export CI=azure + export flow_run_id=azure_$(Build.BuildNumber).$(System.JobAttempt) + export remote_url=$(Build.Repository.Uri) + export sha=$(Build.SourceVersion) export GIT_BRANCH=$BUILD_SOURCEBRANCHNAME export FEEDSTOCK_NAME=$(basename ${BUILD_REPOSITORY_NAME}) if [[ "${BUILD_REASON:-}" == "PullRequest" ]]; then diff --git a/.azure-pipelines/azure-pipelines-osx.yml b/.azure-pipelines/azure-pipelines-osx.yml index e3774bfd..27ddd14f 100755 --- a/.azure-pipelines/azure-pipelines-osx.yml +++ b/.azure-pipelines/azure-pipelines-osx.yml @@ -5,45 +5,52 @@ jobs: - job: osx pool: - vmImage: macOS-11 + vmImage: macOS-12 strategy: matrix: - osx_64_numpy1.21python3.10.____cpython: - CONFIG: osx_64_numpy1.21python3.10.____cpython + osx_64_numpy1.22python3.10.____cpython: + CONFIG: osx_64_numpy1.22python3.10.____cpython UPLOAD_PACKAGES: 'True' - osx_64_numpy1.21python3.8.____73_pypy: - CONFIG: osx_64_numpy1.21python3.8.____73_pypy + osx_64_numpy1.22python3.8.____cpython: + CONFIG: osx_64_numpy1.22python3.8.____cpython UPLOAD_PACKAGES: 'True' - osx_64_numpy1.21python3.8.____cpython: - CONFIG: osx_64_numpy1.21python3.8.____cpython + osx_64_numpy1.22python3.9.____73_pypy: + CONFIG: osx_64_numpy1.22python3.9.____73_pypy UPLOAD_PACKAGES: 'True' - osx_64_numpy1.21python3.9.____73_pypy: - CONFIG: osx_64_numpy1.21python3.9.____73_pypy - UPLOAD_PACKAGES: 'True' - osx_64_numpy1.21python3.9.____cpython: - CONFIG: osx_64_numpy1.21python3.9.____cpython + osx_64_numpy1.22python3.9.____cpython: + CONFIG: osx_64_numpy1.22python3.9.____cpython UPLOAD_PACKAGES: 'True' osx_64_numpy1.23python3.11.____cpython: CONFIG: osx_64_numpy1.23python3.11.____cpython UPLOAD_PACKAGES: 'True' - osx_arm64_numpy1.21python3.10.____cpython: - CONFIG: osx_arm64_numpy1.21python3.10.____cpython + osx_64_numpy1.26python3.12.____cpython: + CONFIG: osx_64_numpy1.26python3.12.____cpython + UPLOAD_PACKAGES: 'True' + osx_arm64_numpy1.22python3.10.____cpython: + CONFIG: osx_arm64_numpy1.22python3.10.____cpython UPLOAD_PACKAGES: 'True' - osx_arm64_numpy1.21python3.8.____cpython: - CONFIG: osx_arm64_numpy1.21python3.8.____cpython + osx_arm64_numpy1.22python3.8.____cpython: + CONFIG: osx_arm64_numpy1.22python3.8.____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 UPLOAD_PACKAGES: 'True' + osx_arm64_numpy1.26python3.12.____cpython: + CONFIG: osx_arm64_numpy1.26python3.12.____cpython + UPLOAD_PACKAGES: 'True' timeoutInMinutes: 360 + variables: {} steps: # TODO: Fast finish on azure pipelines? - script: | export CI=azure + export flow_run_id=azure_$(Build.BuildNumber).$(System.JobAttempt) + export remote_url=$(Build.Repository.Uri) + export sha=$(Build.SourceVersion) export OSX_FORCE_SDK_DOWNLOAD="1" export GIT_BRANCH=$BUILD_SOURCEBRANCHNAME export FEEDSTOCK_NAME=$(basename ${BUILD_REPOSITORY_NAME}) diff --git a/.azure-pipelines/azure-pipelines-win.yml b/.azure-pipelines/azure-pipelines-win.yml index 7f5ab156..9f5a7811 100755 --- a/.azure-pipelines/azure-pipelines-win.yml +++ b/.azure-pipelines/azure-pipelines-win.yml @@ -8,30 +8,31 @@ jobs: vmImage: windows-2022 strategy: matrix: - win_64_numpy1.21python3.10.____cpython: - CONFIG: win_64_numpy1.21python3.10.____cpython + win_64_numpy1.22python3.10.____cpython: + CONFIG: win_64_numpy1.22python3.10.____cpython UPLOAD_PACKAGES: 'True' - win_64_numpy1.21python3.8.____73_pypy: - CONFIG: win_64_numpy1.21python3.8.____73_pypy + win_64_numpy1.22python3.8.____cpython: + CONFIG: win_64_numpy1.22python3.8.____cpython UPLOAD_PACKAGES: 'True' - win_64_numpy1.21python3.8.____cpython: - CONFIG: win_64_numpy1.21python3.8.____cpython + win_64_numpy1.22python3.9.____73_pypy: + CONFIG: win_64_numpy1.22python3.9.____73_pypy UPLOAD_PACKAGES: 'True' - win_64_numpy1.21python3.9.____73_pypy: - CONFIG: win_64_numpy1.21python3.9.____73_pypy - UPLOAD_PACKAGES: 'True' - win_64_numpy1.21python3.9.____cpython: - CONFIG: win_64_numpy1.21python3.9.____cpython + win_64_numpy1.22python3.9.____cpython: + CONFIG: win_64_numpy1.22python3.9.____cpython UPLOAD_PACKAGES: 'True' win_64_numpy1.23python3.11.____cpython: CONFIG: win_64_numpy1.23python3.11.____cpython UPLOAD_PACKAGES: 'True' + win_64_numpy1.26python3.12.____cpython: + CONFIG: win_64_numpy1.26python3.12.____cpython + UPLOAD_PACKAGES: 'True' timeoutInMinutes: 360 variables: CONDA_BLD_PATH: D:\\bld\\ UPLOAD_TEMP: D:\\tmp steps: + - task: PythonScript@0 displayName: 'Download Miniforge' inputs: @@ -50,55 +51,17 @@ jobs: displayName: Add conda to PATH - script: | - call activate base - mamba.exe install "python=3.10" conda-build conda pip boa conda-forge-ci-setup=3 -c conda-forge --strict-channel-priority --yes - displayName: Install conda-build - - - script: set PYTHONUNBUFFERED=1 - displayName: Set PYTHONUNBUFFERED - - # Configure the VM - - script: | - call activate base - setup_conda_rc .\ ".\recipe" .\.ci_support\%CONFIG%.yaml - displayName: conda-forge CI setup - - # Configure the VM. - - script: | - set "CI=azure" - call activate base - run_conda_forge_build_setup - displayName: conda-forge build setup - - - script: | - call activate base - if EXIST LICENSE.txt ( - copy LICENSE.txt "recipe\\recipe-scripts-license.txt" - ) - if NOT [%HOST_PLATFORM%] == [%BUILD_PLATFORM%] ( - set "EXTRA_CB_OPTIONS=%EXTRA_CB_OPTIONS% --no-test" - ) - conda.exe mambabuild "recipe" -m .ci_support\%CONFIG%.yaml --suppress-variables %EXTRA_CB_OPTIONS% - displayName: Build recipe + call ".scripts\run_win_build.bat" + displayName: Run Windows build env: PYTHONUNBUFFERED: 1 - - script: | - set "FEEDSTOCK_NAME=%BUILD_REPOSITORY_NAME:*/=%" - call activate base - validate_recipe_outputs "%FEEDSTOCK_NAME%" - displayName: Validate Recipe Outputs - - - script: | - set "GIT_BRANCH=%BUILD_SOURCEBRANCHNAME%" - set "FEEDSTOCK_NAME=%BUILD_REPOSITORY_NAME:*/=%" - set "TEMP=$(UPLOAD_TEMP)" - if not exist "%TEMP%\" md "%TEMP%" - set "TMP=%TEMP%" - call activate base - upload_package --validate --feedstock-name="%FEEDSTOCK_NAME%" .\ ".\recipe" .ci_support\%CONFIG%.yaml - displayName: Upload package - env: + CONFIG: $(CONFIG) + CI: azure + flow_run_id: azure_$(Build.BuildNumber).$(System.JobAttempt) + remote_url: $(Build.Repository.Uri) + sha: $(Build.SourceVersion) + UPLOAD_PACKAGES: $(UPLOAD_PACKAGES) + UPLOAD_TEMP: $(UPLOAD_TEMP) BINSTAR_TOKEN: $(BINSTAR_TOKEN) FEEDSTOCK_TOKEN: $(FEEDSTOCK_TOKEN) - STAGING_BINSTAR_TOKEN: $(STAGING_BINSTAR_TOKEN) - condition: and(succeeded(), not(eq(variables['UPLOAD_PACKAGES'], 'False')), not(eq(variables['Build.Reason'], 'PullRequest'))) \ No newline at end of file + STAGING_BINSTAR_TOKEN: $(STAGING_BINSTAR_TOKEN) \ No newline at end of file diff --git a/.ci_support/linux_64_numpy1.21python3.8.____73_pypy.yaml b/.ci_support/linux_64_numpy1.21python3.8.____73_pypy.yaml deleted file mode 100644 index b541d9a6..00000000 --- a/.ci_support/linux_64_numpy1.21python3.8.____73_pypy.yaml +++ /dev/null @@ -1,40 +0,0 @@ -c_compiler: -- gcc -c_compiler_version: -- '12' -cdt_name: -- cos6 -channel_sources: -- conda-forge -channel_targets: -- conda-forge matplotlib_rc -cxx_compiler: -- gxx -cxx_compiler_version: -- '12' -docker_image: -- quay.io/condaforge/linux-anvil-cos7-x86_64 -freetype: -- '2' -numpy: -- '1.21' -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -python: -- 3.8.* *_73_pypy -python_impl: -- pypy -target_platform: -- linux-64 -tk: -- '8.6' -zip_keys: -- - c_compiler_version - - cxx_compiler_version -- - python - - numpy - - python_impl -zlib: -- '1.2' diff --git a/.ci_support/linux_64_numpy1.21python3.10.____cpython.yaml b/.ci_support/linux_64_numpy1.22python3.10.____cpython.yaml similarity index 96% rename from .ci_support/linux_64_numpy1.21python3.10.____cpython.yaml rename to .ci_support/linux_64_numpy1.22python3.10.____cpython.yaml index 79e954eb..711a1834 100644 --- a/.ci_support/linux_64_numpy1.21python3.10.____cpython.yaml +++ b/.ci_support/linux_64_numpy1.22python3.10.____cpython.yaml @@ -17,7 +17,7 @@ docker_image: freetype: - '2' numpy: -- '1.21' +- '1.22' pin_run_as_build: python: min_pin: x.x @@ -37,4 +37,4 @@ zip_keys: - numpy - python_impl zlib: -- '1.2' +- '1' diff --git a/.ci_support/linux_64_numpy1.21python3.8.____cpython.yaml b/.ci_support/linux_64_numpy1.22python3.8.____cpython.yaml similarity index 96% rename from .ci_support/linux_64_numpy1.21python3.8.____cpython.yaml rename to .ci_support/linux_64_numpy1.22python3.8.____cpython.yaml index 597557ab..84dab33d 100644 --- a/.ci_support/linux_64_numpy1.21python3.8.____cpython.yaml +++ b/.ci_support/linux_64_numpy1.22python3.8.____cpython.yaml @@ -17,7 +17,7 @@ docker_image: freetype: - '2' numpy: -- '1.21' +- '1.22' pin_run_as_build: python: min_pin: x.x @@ -37,4 +37,4 @@ zip_keys: - numpy - python_impl zlib: -- '1.2' +- '1' diff --git a/.ci_support/linux_64_numpy1.21python3.9.____73_pypy.yaml b/.ci_support/linux_64_numpy1.22python3.9.____73_pypy.yaml similarity index 96% rename from .ci_support/linux_64_numpy1.21python3.9.____73_pypy.yaml rename to .ci_support/linux_64_numpy1.22python3.9.____73_pypy.yaml index d7bb831c..7544eb38 100644 --- a/.ci_support/linux_64_numpy1.21python3.9.____73_pypy.yaml +++ b/.ci_support/linux_64_numpy1.22python3.9.____73_pypy.yaml @@ -17,7 +17,7 @@ docker_image: freetype: - '2' numpy: -- '1.21' +- '1.22' pin_run_as_build: python: min_pin: x.x @@ -37,4 +37,4 @@ zip_keys: - numpy - python_impl zlib: -- '1.2' +- '1' diff --git a/.ci_support/linux_64_numpy1.21python3.9.____cpython.yaml b/.ci_support/linux_64_numpy1.22python3.9.____cpython.yaml similarity index 96% rename from .ci_support/linux_64_numpy1.21python3.9.____cpython.yaml rename to .ci_support/linux_64_numpy1.22python3.9.____cpython.yaml index e8fe600d..daa126db 100644 --- a/.ci_support/linux_64_numpy1.21python3.9.____cpython.yaml +++ b/.ci_support/linux_64_numpy1.22python3.9.____cpython.yaml @@ -17,7 +17,7 @@ docker_image: freetype: - '2' numpy: -- '1.21' +- '1.22' pin_run_as_build: python: min_pin: x.x @@ -37,4 +37,4 @@ zip_keys: - numpy - python_impl zlib: -- '1.2' +- '1' diff --git a/.ci_support/linux_64_numpy1.23python3.11.____cpython.yaml b/.ci_support/linux_64_numpy1.23python3.11.____cpython.yaml index 918e96ea..f04f3e00 100644 --- a/.ci_support/linux_64_numpy1.23python3.11.____cpython.yaml +++ b/.ci_support/linux_64_numpy1.23python3.11.____cpython.yaml @@ -37,4 +37,4 @@ zip_keys: - numpy - python_impl zlib: -- '1.2' +- '1' diff --git a/.ci_support/linux_64_numpy1.26python3.12.____cpython.yaml b/.ci_support/linux_64_numpy1.26python3.12.____cpython.yaml new file mode 100644 index 00000000..924eec41 --- /dev/null +++ b/.ci_support/linux_64_numpy1.26python3.12.____cpython.yaml @@ -0,0 +1,40 @@ +c_compiler: +- gcc +c_compiler_version: +- '12' +cdt_name: +- cos6 +channel_sources: +- conda-forge +channel_targets: +- conda-forge matplotlib_rc +cxx_compiler: +- gxx +cxx_compiler_version: +- '12' +docker_image: +- quay.io/condaforge/linux-anvil-cos7-x86_64 +freetype: +- '2' +numpy: +- '1.26' +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +python: +- 3.12.* *_cpython +python_impl: +- cpython +target_platform: +- linux-64 +tk: +- '8.6' +zip_keys: +- - c_compiler_version + - cxx_compiler_version +- - python + - numpy + - python_impl +zlib: +- '1' diff --git a/.ci_support/linux_aarch64_numpy1.21python3.8.____73_pypy.yaml b/.ci_support/linux_aarch64_numpy1.21python3.8.____73_pypy.yaml deleted file mode 100644 index 9f217c11..00000000 --- a/.ci_support/linux_aarch64_numpy1.21python3.8.____73_pypy.yaml +++ /dev/null @@ -1,44 +0,0 @@ -BUILD: -- aarch64-conda_cos7-linux-gnu -c_compiler: -- gcc -c_compiler_version: -- '12' -cdt_arch: -- aarch64 -cdt_name: -- cos7 -channel_sources: -- conda-forge -channel_targets: -- conda-forge matplotlib_rc -cxx_compiler: -- gxx -cxx_compiler_version: -- '12' -docker_image: -- quay.io/condaforge/linux-anvil-cos7-x86_64 -freetype: -- '2' -numpy: -- '1.21' -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -python: -- 3.8.* *_73_pypy -python_impl: -- pypy -target_platform: -- linux-aarch64 -tk: -- '8.6' -zip_keys: -- - c_compiler_version - - cxx_compiler_version -- - python - - numpy - - python_impl -zlib: -- '1.2' diff --git a/.ci_support/linux_aarch64_numpy1.21python3.10.____cpython.yaml b/.ci_support/linux_aarch64_numpy1.22python3.10.____cpython.yaml similarity index 97% rename from .ci_support/linux_aarch64_numpy1.21python3.10.____cpython.yaml rename to .ci_support/linux_aarch64_numpy1.22python3.10.____cpython.yaml index b5881ca1..0d7d0fcb 100644 --- a/.ci_support/linux_aarch64_numpy1.21python3.10.____cpython.yaml +++ b/.ci_support/linux_aarch64_numpy1.22python3.10.____cpython.yaml @@ -21,7 +21,7 @@ docker_image: freetype: - '2' numpy: -- '1.21' +- '1.22' pin_run_as_build: python: min_pin: x.x @@ -41,4 +41,4 @@ zip_keys: - numpy - python_impl zlib: -- '1.2' +- '1' diff --git a/.ci_support/linux_aarch64_numpy1.21python3.8.____cpython.yaml b/.ci_support/linux_aarch64_numpy1.22python3.8.____cpython.yaml similarity index 97% rename from .ci_support/linux_aarch64_numpy1.21python3.8.____cpython.yaml rename to .ci_support/linux_aarch64_numpy1.22python3.8.____cpython.yaml index 07edc4c2..739a3343 100644 --- a/.ci_support/linux_aarch64_numpy1.21python3.8.____cpython.yaml +++ b/.ci_support/linux_aarch64_numpy1.22python3.8.____cpython.yaml @@ -21,7 +21,7 @@ docker_image: freetype: - '2' numpy: -- '1.21' +- '1.22' pin_run_as_build: python: min_pin: x.x @@ -41,4 +41,4 @@ zip_keys: - numpy - python_impl zlib: -- '1.2' +- '1' diff --git a/.ci_support/linux_aarch64_numpy1.21python3.9.____73_pypy.yaml b/.ci_support/linux_aarch64_numpy1.22python3.9.____73_pypy.yaml similarity index 97% rename from .ci_support/linux_aarch64_numpy1.21python3.9.____73_pypy.yaml rename to .ci_support/linux_aarch64_numpy1.22python3.9.____73_pypy.yaml index 19862c32..68b93569 100644 --- a/.ci_support/linux_aarch64_numpy1.21python3.9.____73_pypy.yaml +++ b/.ci_support/linux_aarch64_numpy1.22python3.9.____73_pypy.yaml @@ -21,7 +21,7 @@ docker_image: freetype: - '2' numpy: -- '1.21' +- '1.22' pin_run_as_build: python: min_pin: x.x @@ -41,4 +41,4 @@ zip_keys: - numpy - python_impl zlib: -- '1.2' +- '1' diff --git a/.ci_support/linux_aarch64_numpy1.21python3.9.____cpython.yaml b/.ci_support/linux_aarch64_numpy1.22python3.9.____cpython.yaml similarity index 97% rename from .ci_support/linux_aarch64_numpy1.21python3.9.____cpython.yaml rename to .ci_support/linux_aarch64_numpy1.22python3.9.____cpython.yaml index 47c1c822..63c4b20c 100644 --- a/.ci_support/linux_aarch64_numpy1.21python3.9.____cpython.yaml +++ b/.ci_support/linux_aarch64_numpy1.22python3.9.____cpython.yaml @@ -21,7 +21,7 @@ docker_image: freetype: - '2' numpy: -- '1.21' +- '1.22' pin_run_as_build: python: min_pin: x.x @@ -41,4 +41,4 @@ zip_keys: - numpy - python_impl zlib: -- '1.2' +- '1' diff --git a/.ci_support/linux_aarch64_numpy1.23python3.11.____cpython.yaml b/.ci_support/linux_aarch64_numpy1.23python3.11.____cpython.yaml index 48aac766..c9efd406 100644 --- a/.ci_support/linux_aarch64_numpy1.23python3.11.____cpython.yaml +++ b/.ci_support/linux_aarch64_numpy1.23python3.11.____cpython.yaml @@ -41,4 +41,4 @@ zip_keys: - numpy - python_impl zlib: -- '1.2' +- '1' diff --git a/.ci_support/linux_aarch64_numpy1.26python3.12.____cpython.yaml b/.ci_support/linux_aarch64_numpy1.26python3.12.____cpython.yaml new file mode 100644 index 00000000..23a02890 --- /dev/null +++ b/.ci_support/linux_aarch64_numpy1.26python3.12.____cpython.yaml @@ -0,0 +1,44 @@ +BUILD: +- aarch64-conda_cos7-linux-gnu +c_compiler: +- gcc +c_compiler_version: +- '12' +cdt_arch: +- aarch64 +cdt_name: +- cos7 +channel_sources: +- conda-forge +channel_targets: +- conda-forge matplotlib_rc +cxx_compiler: +- gxx +cxx_compiler_version: +- '12' +docker_image: +- quay.io/condaforge/linux-anvil-cos7-x86_64 +freetype: +- '2' +numpy: +- '1.26' +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +python: +- 3.12.* *_cpython +python_impl: +- cpython +target_platform: +- linux-aarch64 +tk: +- '8.6' +zip_keys: +- - c_compiler_version + - cxx_compiler_version +- - python + - numpy + - python_impl +zlib: +- '1' diff --git a/.ci_support/linux_ppc64le_numpy1.21python3.8.____73_pypy.yaml b/.ci_support/linux_ppc64le_numpy1.21python3.8.____73_pypy.yaml deleted file mode 100644 index 06fc0016..00000000 --- a/.ci_support/linux_ppc64le_numpy1.21python3.8.____73_pypy.yaml +++ /dev/null @@ -1,38 +0,0 @@ -c_compiler: -- gcc -c_compiler_version: -- '12' -cdt_name: -- cos7 -channel_sources: -- conda-forge -channel_targets: -- conda-forge matplotlib_rc -cxx_compiler: -- gxx -cxx_compiler_version: -- '12' -docker_image: -- quay.io/condaforge/linux-anvil-cos7-x86_64 -freetype: -- '2' -numpy: -- '1.21' -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -python: -- 3.8.* *_73_pypy -python_impl: -- pypy -target_platform: -- linux-ppc64le -zip_keys: -- - c_compiler_version - - cxx_compiler_version -- - python - - numpy - - python_impl -zlib: -- '1.2' diff --git a/.ci_support/linux_ppc64le_numpy1.21python3.10.____cpython.yaml b/.ci_support/linux_ppc64le_numpy1.22python3.10.____cpython.yaml similarity index 96% rename from .ci_support/linux_ppc64le_numpy1.21python3.10.____cpython.yaml rename to .ci_support/linux_ppc64le_numpy1.22python3.10.____cpython.yaml index 61235591..ae29958b 100644 --- a/.ci_support/linux_ppc64le_numpy1.21python3.10.____cpython.yaml +++ b/.ci_support/linux_ppc64le_numpy1.22python3.10.____cpython.yaml @@ -17,7 +17,7 @@ docker_image: freetype: - '2' numpy: -- '1.21' +- '1.22' pin_run_as_build: python: min_pin: x.x @@ -35,4 +35,4 @@ zip_keys: - numpy - python_impl zlib: -- '1.2' +- '1' diff --git a/.ci_support/linux_ppc64le_numpy1.21python3.8.____cpython.yaml b/.ci_support/linux_ppc64le_numpy1.22python3.8.____cpython.yaml similarity index 96% rename from .ci_support/linux_ppc64le_numpy1.21python3.8.____cpython.yaml rename to .ci_support/linux_ppc64le_numpy1.22python3.8.____cpython.yaml index 89ac1234..7afc4d88 100644 --- a/.ci_support/linux_ppc64le_numpy1.21python3.8.____cpython.yaml +++ b/.ci_support/linux_ppc64le_numpy1.22python3.8.____cpython.yaml @@ -17,7 +17,7 @@ docker_image: freetype: - '2' numpy: -- '1.21' +- '1.22' pin_run_as_build: python: min_pin: x.x @@ -35,4 +35,4 @@ zip_keys: - numpy - python_impl zlib: -- '1.2' +- '1' diff --git a/.ci_support/linux_ppc64le_numpy1.21python3.9.____73_pypy.yaml b/.ci_support/linux_ppc64le_numpy1.22python3.9.____73_pypy.yaml similarity index 96% rename from .ci_support/linux_ppc64le_numpy1.21python3.9.____73_pypy.yaml rename to .ci_support/linux_ppc64le_numpy1.22python3.9.____73_pypy.yaml index 22f3aa7b..a666e430 100644 --- a/.ci_support/linux_ppc64le_numpy1.21python3.9.____73_pypy.yaml +++ b/.ci_support/linux_ppc64le_numpy1.22python3.9.____73_pypy.yaml @@ -17,7 +17,7 @@ docker_image: freetype: - '2' numpy: -- '1.21' +- '1.22' pin_run_as_build: python: min_pin: x.x @@ -35,4 +35,4 @@ zip_keys: - numpy - python_impl zlib: -- '1.2' +- '1' diff --git a/.ci_support/linux_ppc64le_numpy1.21python3.9.____cpython.yaml b/.ci_support/linux_ppc64le_numpy1.22python3.9.____cpython.yaml similarity index 96% rename from .ci_support/linux_ppc64le_numpy1.21python3.9.____cpython.yaml rename to .ci_support/linux_ppc64le_numpy1.22python3.9.____cpython.yaml index 295f54ec..4b8bcfcb 100644 --- a/.ci_support/linux_ppc64le_numpy1.21python3.9.____cpython.yaml +++ b/.ci_support/linux_ppc64le_numpy1.22python3.9.____cpython.yaml @@ -17,7 +17,7 @@ docker_image: freetype: - '2' numpy: -- '1.21' +- '1.22' pin_run_as_build: python: min_pin: x.x @@ -35,4 +35,4 @@ zip_keys: - numpy - python_impl zlib: -- '1.2' +- '1' diff --git a/.ci_support/linux_ppc64le_numpy1.23python3.11.____cpython.yaml b/.ci_support/linux_ppc64le_numpy1.23python3.11.____cpython.yaml index bb4e5c7c..31751566 100644 --- a/.ci_support/linux_ppc64le_numpy1.23python3.11.____cpython.yaml +++ b/.ci_support/linux_ppc64le_numpy1.23python3.11.____cpython.yaml @@ -35,4 +35,4 @@ zip_keys: - numpy - python_impl zlib: -- '1.2' +- '1' diff --git a/.ci_support/linux_ppc64le_numpy1.26python3.12.____cpython.yaml b/.ci_support/linux_ppc64le_numpy1.26python3.12.____cpython.yaml new file mode 100644 index 00000000..7a563726 --- /dev/null +++ b/.ci_support/linux_ppc64le_numpy1.26python3.12.____cpython.yaml @@ -0,0 +1,38 @@ +c_compiler: +- gcc +c_compiler_version: +- '12' +cdt_name: +- cos7 +channel_sources: +- conda-forge +channel_targets: +- conda-forge matplotlib_rc +cxx_compiler: +- gxx +cxx_compiler_version: +- '12' +docker_image: +- quay.io/condaforge/linux-anvil-cos7-x86_64 +freetype: +- '2' +numpy: +- '1.26' +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +python: +- 3.12.* *_cpython +python_impl: +- cpython +target_platform: +- linux-ppc64le +zip_keys: +- - c_compiler_version + - cxx_compiler_version +- - python + - numpy + - python_impl +zlib: +- '1' diff --git a/.ci_support/migrations/python311.yaml b/.ci_support/migrations/python311.yaml deleted file mode 100644 index d23a0fd2..00000000 --- a/.ci_support/migrations/python311.yaml +++ /dev/null @@ -1,37 +0,0 @@ -migrator_ts: 1666686085 -__migrator: - migration_number: 1 - operation: key_add - primary_key: python - ordering: - python: - - 3.6.* *_cpython - - 3.7.* *_cpython - - 3.8.* *_cpython - - 3.9.* *_cpython - - 3.10.* *_cpython - - 3.11.* *_cpython # new entry - - 3.6.* *_73_pypy - - 3.7.* *_73_pypy - - 3.8.* *_73_pypy - - 3.9.* *_73_pypy - paused: false - longterm: True - pr_limit: 10 - max_solver_attempts: 10 # this will make the bot retry "not solvable" stuff 10 times - exclude: - # this shouldn't attempt to modify the python feedstocks - - python - - pypy3.6 - - pypy-meta - - cross-python - - python_abi - exclude_pinned_pkgs: false - -python: - - 3.11.* *_cpython -# additional entries to add for zip_keys -numpy: - - 1.23 -python_impl: - - cpython diff --git a/.ci_support/osx_64_numpy1.21python3.8.____73_pypy.yaml b/.ci_support/osx_64_numpy1.21python3.8.____73_pypy.yaml deleted file mode 100644 index fb93d678..00000000 --- a/.ci_support/osx_64_numpy1.21python3.8.____73_pypy.yaml +++ /dev/null @@ -1,40 +0,0 @@ -MACOSX_DEPLOYMENT_TARGET: -- '10.12' -MACOSX_SDK_VERSION: -- '10.12' -c_compiler: -- clang -c_compiler_version: -- '15' -channel_sources: -- conda-forge -channel_targets: -- conda-forge matplotlib_rc -cxx_compiler: -- clangxx -cxx_compiler_version: -- '15' -freetype: -- '2' -macos_machine: -- x86_64-apple-darwin13.4.0 -numpy: -- '1.21' -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -python: -- 3.8.* *_73_pypy -python_impl: -- pypy -target_platform: -- osx-64 -zip_keys: -- - c_compiler_version - - cxx_compiler_version -- - python - - numpy - - python_impl -zlib: -- '1.2' diff --git a/.ci_support/osx_64_numpy1.21python3.10.____cpython.yaml b/.ci_support/osx_64_numpy1.22python3.10.____cpython.yaml similarity index 90% rename from .ci_support/osx_64_numpy1.21python3.10.____cpython.yaml rename to .ci_support/osx_64_numpy1.22python3.10.____cpython.yaml index 4ea79216..8118166e 100644 --- a/.ci_support/osx_64_numpy1.21python3.10.____cpython.yaml +++ b/.ci_support/osx_64_numpy1.22python3.10.____cpython.yaml @@ -1,11 +1,11 @@ MACOSX_DEPLOYMENT_TARGET: -- '10.12' +- '10.13' MACOSX_SDK_VERSION: -- '10.12' +- '10.13' c_compiler: - clang c_compiler_version: -- '15' +- '16' channel_sources: - conda-forge channel_targets: @@ -13,13 +13,13 @@ channel_targets: cxx_compiler: - clangxx cxx_compiler_version: -- '15' +- '16' freetype: - '2' macos_machine: - x86_64-apple-darwin13.4.0 numpy: -- '1.21' +- '1.22' pin_run_as_build: python: min_pin: x.x @@ -37,4 +37,4 @@ zip_keys: - numpy - python_impl zlib: -- '1.2' +- '1' diff --git a/.ci_support/osx_64_numpy1.21python3.8.____cpython.yaml b/.ci_support/osx_64_numpy1.22python3.8.____cpython.yaml similarity index 90% rename from .ci_support/osx_64_numpy1.21python3.8.____cpython.yaml rename to .ci_support/osx_64_numpy1.22python3.8.____cpython.yaml index c24278ca..02742abe 100644 --- a/.ci_support/osx_64_numpy1.21python3.8.____cpython.yaml +++ b/.ci_support/osx_64_numpy1.22python3.8.____cpython.yaml @@ -1,11 +1,11 @@ MACOSX_DEPLOYMENT_TARGET: -- '10.12' +- '10.13' MACOSX_SDK_VERSION: -- '10.12' +- '10.13' c_compiler: - clang c_compiler_version: -- '15' +- '16' channel_sources: - conda-forge channel_targets: @@ -13,13 +13,13 @@ channel_targets: cxx_compiler: - clangxx cxx_compiler_version: -- '15' +- '16' freetype: - '2' macos_machine: - x86_64-apple-darwin13.4.0 numpy: -- '1.21' +- '1.22' pin_run_as_build: python: min_pin: x.x @@ -37,4 +37,4 @@ zip_keys: - numpy - python_impl zlib: -- '1.2' +- '1' diff --git a/.ci_support/osx_64_numpy1.21python3.9.____73_pypy.yaml b/.ci_support/osx_64_numpy1.22python3.9.____73_pypy.yaml similarity index 90% rename from .ci_support/osx_64_numpy1.21python3.9.____73_pypy.yaml rename to .ci_support/osx_64_numpy1.22python3.9.____73_pypy.yaml index caa451f1..7f579c67 100644 --- a/.ci_support/osx_64_numpy1.21python3.9.____73_pypy.yaml +++ b/.ci_support/osx_64_numpy1.22python3.9.____73_pypy.yaml @@ -1,11 +1,11 @@ MACOSX_DEPLOYMENT_TARGET: -- '10.12' +- '10.13' MACOSX_SDK_VERSION: -- '10.12' +- '10.13' c_compiler: - clang c_compiler_version: -- '15' +- '16' channel_sources: - conda-forge channel_targets: @@ -13,13 +13,13 @@ channel_targets: cxx_compiler: - clangxx cxx_compiler_version: -- '15' +- '16' freetype: - '2' macos_machine: - x86_64-apple-darwin13.4.0 numpy: -- '1.21' +- '1.22' pin_run_as_build: python: min_pin: x.x @@ -37,4 +37,4 @@ zip_keys: - numpy - python_impl zlib: -- '1.2' +- '1' diff --git a/.ci_support/osx_64_numpy1.21python3.9.____cpython.yaml b/.ci_support/osx_64_numpy1.22python3.9.____cpython.yaml similarity index 90% rename from .ci_support/osx_64_numpy1.21python3.9.____cpython.yaml rename to .ci_support/osx_64_numpy1.22python3.9.____cpython.yaml index 343432f7..3e6a5c3b 100644 --- a/.ci_support/osx_64_numpy1.21python3.9.____cpython.yaml +++ b/.ci_support/osx_64_numpy1.22python3.9.____cpython.yaml @@ -1,11 +1,11 @@ MACOSX_DEPLOYMENT_TARGET: -- '10.12' +- '10.13' MACOSX_SDK_VERSION: -- '10.12' +- '10.13' c_compiler: - clang c_compiler_version: -- '15' +- '16' channel_sources: - conda-forge channel_targets: @@ -13,13 +13,13 @@ channel_targets: cxx_compiler: - clangxx cxx_compiler_version: -- '15' +- '16' freetype: - '2' macos_machine: - x86_64-apple-darwin13.4.0 numpy: -- '1.21' +- '1.22' pin_run_as_build: python: min_pin: x.x @@ -37,4 +37,4 @@ zip_keys: - numpy - python_impl zlib: -- '1.2' +- '1' diff --git a/.ci_support/osx_64_numpy1.23python3.11.____cpython.yaml b/.ci_support/osx_64_numpy1.23python3.11.____cpython.yaml index 1e07c6dc..00d79245 100644 --- a/.ci_support/osx_64_numpy1.23python3.11.____cpython.yaml +++ b/.ci_support/osx_64_numpy1.23python3.11.____cpython.yaml @@ -1,11 +1,11 @@ MACOSX_DEPLOYMENT_TARGET: -- '10.12' +- '10.13' MACOSX_SDK_VERSION: -- '10.12' +- '10.13' c_compiler: - clang c_compiler_version: -- '15' +- '16' channel_sources: - conda-forge channel_targets: @@ -13,7 +13,7 @@ channel_targets: cxx_compiler: - clangxx cxx_compiler_version: -- '15' +- '16' freetype: - '2' macos_machine: @@ -37,4 +37,4 @@ zip_keys: - numpy - python_impl zlib: -- '1.2' +- '1' diff --git a/.ci_support/osx_64_numpy1.26python3.12.____cpython.yaml b/.ci_support/osx_64_numpy1.26python3.12.____cpython.yaml new file mode 100644 index 00000000..91e80545 --- /dev/null +++ b/.ci_support/osx_64_numpy1.26python3.12.____cpython.yaml @@ -0,0 +1,40 @@ +MACOSX_DEPLOYMENT_TARGET: +- '10.13' +MACOSX_SDK_VERSION: +- '10.13' +c_compiler: +- clang +c_compiler_version: +- '16' +channel_sources: +- conda-forge +channel_targets: +- conda-forge matplotlib_rc +cxx_compiler: +- clangxx +cxx_compiler_version: +- '16' +freetype: +- '2' +macos_machine: +- x86_64-apple-darwin13.4.0 +numpy: +- '1.26' +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +python: +- 3.12.* *_cpython +python_impl: +- cpython +target_platform: +- osx-64 +zip_keys: +- - c_compiler_version + - cxx_compiler_version +- - python + - numpy + - python_impl +zlib: +- '1' diff --git a/.ci_support/osx_arm64_numpy1.21python3.10.____cpython.yaml b/.ci_support/osx_arm64_numpy1.22python3.10.____cpython.yaml similarity index 89% rename from .ci_support/osx_arm64_numpy1.21python3.10.____cpython.yaml rename to .ci_support/osx_arm64_numpy1.22python3.10.____cpython.yaml index 0ea2a16e..b74ac1b7 100644 --- a/.ci_support/osx_arm64_numpy1.21python3.10.____cpython.yaml +++ b/.ci_support/osx_arm64_numpy1.22python3.10.____cpython.yaml @@ -1,9 +1,11 @@ MACOSX_DEPLOYMENT_TARGET: - '11.0' +MACOSX_SDK_VERSION: +- '11.0' c_compiler: - clang c_compiler_version: -- '15' +- '16' channel_sources: - conda-forge channel_targets: @@ -11,13 +13,13 @@ channel_targets: cxx_compiler: - clangxx cxx_compiler_version: -- '15' +- '16' freetype: - '2' macos_machine: - arm64-apple-darwin20.0.0 numpy: -- '1.21' +- '1.22' pin_run_as_build: python: min_pin: x.x @@ -35,4 +37,4 @@ zip_keys: - numpy - python_impl zlib: -- '1.2' +- '1' diff --git a/.ci_support/osx_arm64_numpy1.21python3.8.____cpython.yaml b/.ci_support/osx_arm64_numpy1.22python3.8.____cpython.yaml similarity index 89% rename from .ci_support/osx_arm64_numpy1.21python3.8.____cpython.yaml rename to .ci_support/osx_arm64_numpy1.22python3.8.____cpython.yaml index 90d92057..a4786603 100644 --- a/.ci_support/osx_arm64_numpy1.21python3.8.____cpython.yaml +++ b/.ci_support/osx_arm64_numpy1.22python3.8.____cpython.yaml @@ -1,9 +1,11 @@ MACOSX_DEPLOYMENT_TARGET: - '11.0' +MACOSX_SDK_VERSION: +- '11.0' c_compiler: - clang c_compiler_version: -- '15' +- '16' channel_sources: - conda-forge channel_targets: @@ -11,13 +13,13 @@ channel_targets: cxx_compiler: - clangxx cxx_compiler_version: -- '15' +- '16' freetype: - '2' macos_machine: - arm64-apple-darwin20.0.0 numpy: -- '1.21' +- '1.22' pin_run_as_build: python: min_pin: x.x @@ -35,4 +37,4 @@ zip_keys: - numpy - python_impl zlib: -- '1.2' +- '1' diff --git a/.ci_support/osx_arm64_numpy1.21python3.9.____cpython.yaml b/.ci_support/osx_arm64_numpy1.22python3.9.____cpython.yaml similarity index 89% rename from .ci_support/osx_arm64_numpy1.21python3.9.____cpython.yaml rename to .ci_support/osx_arm64_numpy1.22python3.9.____cpython.yaml index f65aaa70..afc04ccf 100644 --- a/.ci_support/osx_arm64_numpy1.21python3.9.____cpython.yaml +++ b/.ci_support/osx_arm64_numpy1.22python3.9.____cpython.yaml @@ -1,9 +1,11 @@ MACOSX_DEPLOYMENT_TARGET: - '11.0' +MACOSX_SDK_VERSION: +- '11.0' c_compiler: - clang c_compiler_version: -- '15' +- '16' channel_sources: - conda-forge channel_targets: @@ -11,13 +13,13 @@ channel_targets: cxx_compiler: - clangxx cxx_compiler_version: -- '15' +- '16' freetype: - '2' macos_machine: - arm64-apple-darwin20.0.0 numpy: -- '1.21' +- '1.22' pin_run_as_build: python: min_pin: x.x @@ -35,4 +37,4 @@ zip_keys: - numpy - python_impl zlib: -- '1.2' +- '1' diff --git a/.ci_support/osx_arm64_numpy1.23python3.11.____cpython.yaml b/.ci_support/osx_arm64_numpy1.23python3.11.____cpython.yaml index c28d327f..36388ae7 100644 --- a/.ci_support/osx_arm64_numpy1.23python3.11.____cpython.yaml +++ b/.ci_support/osx_arm64_numpy1.23python3.11.____cpython.yaml @@ -1,9 +1,11 @@ MACOSX_DEPLOYMENT_TARGET: - '11.0' +MACOSX_SDK_VERSION: +- '11.0' c_compiler: - clang c_compiler_version: -- '15' +- '16' channel_sources: - conda-forge channel_targets: @@ -11,7 +13,7 @@ channel_targets: cxx_compiler: - clangxx cxx_compiler_version: -- '15' +- '16' freetype: - '2' macos_machine: @@ -35,4 +37,4 @@ zip_keys: - numpy - python_impl zlib: -- '1.2' +- '1' diff --git a/.ci_support/osx_arm64_numpy1.26python3.12.____cpython.yaml b/.ci_support/osx_arm64_numpy1.26python3.12.____cpython.yaml new file mode 100644 index 00000000..5f045123 --- /dev/null +++ b/.ci_support/osx_arm64_numpy1.26python3.12.____cpython.yaml @@ -0,0 +1,40 @@ +MACOSX_DEPLOYMENT_TARGET: +- '11.0' +MACOSX_SDK_VERSION: +- '11.0' +c_compiler: +- clang +c_compiler_version: +- '16' +channel_sources: +- conda-forge +channel_targets: +- conda-forge matplotlib_rc +cxx_compiler: +- clangxx +cxx_compiler_version: +- '16' +freetype: +- '2' +macos_machine: +- arm64-apple-darwin20.0.0 +numpy: +- '1.26' +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +python: +- 3.12.* *_cpython +python_impl: +- cpython +target_platform: +- osx-arm64 +zip_keys: +- - c_compiler_version + - cxx_compiler_version +- - python + - numpy + - python_impl +zlib: +- '1' diff --git a/.ci_support/win_64_numpy1.21python3.10.____cpython.yaml b/.ci_support/win_64_numpy1.22python3.10.____cpython.yaml similarity index 95% rename from .ci_support/win_64_numpy1.21python3.10.____cpython.yaml rename to .ci_support/win_64_numpy1.22python3.10.____cpython.yaml index d0c2292c..203091da 100644 --- a/.ci_support/win_64_numpy1.21python3.10.____cpython.yaml +++ b/.ci_support/win_64_numpy1.22python3.10.____cpython.yaml @@ -9,7 +9,7 @@ cxx_compiler: freetype: - '2' numpy: -- '1.21' +- '1.22' pin_run_as_build: python: min_pin: x.x @@ -25,4 +25,4 @@ zip_keys: - numpy - python_impl zlib: -- '1.2' +- '1' diff --git a/.ci_support/win_64_numpy1.21python3.8.____cpython.yaml b/.ci_support/win_64_numpy1.22python3.8.____cpython.yaml similarity index 95% rename from .ci_support/win_64_numpy1.21python3.8.____cpython.yaml rename to .ci_support/win_64_numpy1.22python3.8.____cpython.yaml index 45b7e8f4..956ca2d7 100644 --- a/.ci_support/win_64_numpy1.21python3.8.____cpython.yaml +++ b/.ci_support/win_64_numpy1.22python3.8.____cpython.yaml @@ -9,7 +9,7 @@ cxx_compiler: freetype: - '2' numpy: -- '1.21' +- '1.22' pin_run_as_build: python: min_pin: x.x @@ -25,4 +25,4 @@ zip_keys: - numpy - python_impl zlib: -- '1.2' +- '1' diff --git a/.ci_support/win_64_numpy1.21python3.9.____73_pypy.yaml b/.ci_support/win_64_numpy1.22python3.9.____73_pypy.yaml similarity index 95% rename from .ci_support/win_64_numpy1.21python3.9.____73_pypy.yaml rename to .ci_support/win_64_numpy1.22python3.9.____73_pypy.yaml index 14d84d27..40c86ac4 100644 --- a/.ci_support/win_64_numpy1.21python3.9.____73_pypy.yaml +++ b/.ci_support/win_64_numpy1.22python3.9.____73_pypy.yaml @@ -9,7 +9,7 @@ cxx_compiler: freetype: - '2' numpy: -- '1.21' +- '1.22' pin_run_as_build: python: min_pin: x.x @@ -25,4 +25,4 @@ zip_keys: - numpy - python_impl zlib: -- '1.2' +- '1' diff --git a/.ci_support/win_64_numpy1.21python3.9.____cpython.yaml b/.ci_support/win_64_numpy1.22python3.9.____cpython.yaml similarity index 95% rename from .ci_support/win_64_numpy1.21python3.9.____cpython.yaml rename to .ci_support/win_64_numpy1.22python3.9.____cpython.yaml index 72e65a6a..78b2c77e 100644 --- a/.ci_support/win_64_numpy1.21python3.9.____cpython.yaml +++ b/.ci_support/win_64_numpy1.22python3.9.____cpython.yaml @@ -9,7 +9,7 @@ cxx_compiler: freetype: - '2' numpy: -- '1.21' +- '1.22' pin_run_as_build: python: min_pin: x.x @@ -25,4 +25,4 @@ zip_keys: - numpy - python_impl zlib: -- '1.2' +- '1' diff --git a/.ci_support/win_64_numpy1.23python3.11.____cpython.yaml b/.ci_support/win_64_numpy1.23python3.11.____cpython.yaml index 22caa20a..76fe5467 100644 --- a/.ci_support/win_64_numpy1.23python3.11.____cpython.yaml +++ b/.ci_support/win_64_numpy1.23python3.11.____cpython.yaml @@ -25,4 +25,4 @@ zip_keys: - numpy - python_impl zlib: -- '1.2' +- '1' diff --git a/.ci_support/win_64_numpy1.21python3.8.____73_pypy.yaml b/.ci_support/win_64_numpy1.26python3.12.____cpython.yaml similarity index 87% rename from .ci_support/win_64_numpy1.21python3.8.____73_pypy.yaml rename to .ci_support/win_64_numpy1.26python3.12.____cpython.yaml index fedd13d1..d42aba05 100644 --- a/.ci_support/win_64_numpy1.21python3.8.____73_pypy.yaml +++ b/.ci_support/win_64_numpy1.26python3.12.____cpython.yaml @@ -9,15 +9,15 @@ cxx_compiler: freetype: - '2' numpy: -- '1.21' +- '1.26' pin_run_as_build: python: min_pin: x.x max_pin: x.x python: -- 3.8.* *_73_pypy +- 3.12.* *_cpython python_impl: -- pypy +- cpython target_platform: - win-64 zip_keys: @@ -25,4 +25,4 @@ zip_keys: - numpy - python_impl zlib: -- '1.2' +- '1' diff --git a/.gitattributes b/.gitattributes index 7f327638..18f114a1 100644 --- a/.gitattributes +++ b/.gitattributes @@ -20,8 +20,8 @@ bld.bat text eol=crlf .travis.yml linguist-generated=true .scripts/* linguist-generated=true .woodpecker.yml linguist-generated=true -LICENSE.txt linguist-generated=true -README.md linguist-generated=true +/LICENSE.txt linguist-generated=true +/README.md linguist-generated=true azure-pipelines.yml linguist-generated=true build-locally.py linguist-generated=true shippable.yml linguist-generated=true diff --git a/.gitignore b/.gitignore index c89ecb7d..179afe55 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,24 @@ -*.pyc +# User content belongs under recipe/. +# Feedstock configuration goes in `conda-forge.yml` +# Everything else is managed by the conda-smithy rerender process. +# Please do not modify + +# Ignore all files and folders in root +* +!/conda-forge.yml + +# Don't ignore any files/folders if the parent folder is 'un-ignored' +# This also avoids warnings when adding an already-checked file with an ignored parent. +!/**/ +# Don't ignore any files/folders recursively in the following folders +!/recipe/** +!/.ci_support/** -build_artifacts +# Since we ignore files/folders recursively, any folders inside +# build_artifacts gets ignored which trips some build systems. +# To avoid that we 'un-ignore' all files/folders recursively +# and only ignore the root build_artifacts folder. +!/build_artifacts/** +/build_artifacts + +*.pyc diff --git a/.scripts/build_steps.sh b/.scripts/build_steps.sh index 1682b66b..a147fa70 100755 --- a/.scripts/build_steps.sh +++ b/.scripts/build_steps.sh @@ -28,14 +28,15 @@ conda-build: pkgs_dirs: - ${FEEDSTOCK_ROOT}/build_artifacts/pkg_cache - /opt/conda/pkgs +solver: libmamba CONDARC +export CONDA_LIBMAMBA_SOLVER_NO_CHANNELS_FROM_INSTALLED=1 - -mamba install --update-specs --yes --quiet --channel conda-forge \ - conda-build pip boa conda-forge-ci-setup=3 -mamba update --update-specs --yes --quiet --channel conda-forge \ - conda-build pip boa conda-forge-ci-setup=3 +mamba install --update-specs --yes --quiet --channel conda-forge --strict-channel-priority \ + pip mamba conda-build conda-forge-ci-setup=4 "conda-build>=24.1" +mamba update --update-specs --yes --quiet --channel conda-forge --strict-channel-priority \ + pip mamba conda-build conda-forge-ci-setup=4 "conda-build>=24.1" # set up the condarc setup_conda_rc "${FEEDSTOCK_ROOT}" "${RECIPE_ROOT}" "${CONFIG_FILE}" @@ -75,9 +76,17 @@ if [[ "${BUILD_WITH_CONDA_DEBUG:-0}" == 1 ]]; then # Drop into an interactive shell /bin/bash else - conda mambabuild "${RECIPE_ROOT}" -m "${CI_SUPPORT}/${CONFIG}.yaml" \ + conda-build "${RECIPE_ROOT}" -m "${CI_SUPPORT}/${CONFIG}.yaml" \ --suppress-variables ${EXTRA_CB_OPTIONS:-} \ - --clobber-file "${CI_SUPPORT}/clobber_${CONFIG}.yaml" + --clobber-file "${CI_SUPPORT}/clobber_${CONFIG}.yaml" \ + --extra-meta flow_run_id="${flow_run_id:-}" remote_url="${remote_url:-}" sha="${sha:-}" + + ( startgroup "Inspecting artifacts" ) 2> /dev/null + + # inspect_artifacts was only added in conda-forge-ci-setup 4.6.0 + command -v inspect_artifacts >/dev/null 2>&1 && inspect_artifacts || echo "inspect_artifacts needs conda-forge-ci-setup >=4.6.0" + + ( endgroup "Inspecting artifacts" ) 2> /dev/null ( startgroup "Validating outputs" ) 2> /dev/null validate_recipe_outputs "${FEEDSTOCK_NAME}" diff --git a/.scripts/logging_utils.sh b/.scripts/logging_utils.sh index 57bc95c2..aff009f0 100644 --- a/.scripts/logging_utils.sh +++ b/.scripts/logging_utils.sh @@ -12,7 +12,7 @@ function startgroup { echo "##[group]$1";; travis ) echo "$1" - echo -en 'travis_fold:start:'"${1// /}"'\\r';; + echo -en 'travis_fold:start:'"${1// /}"'\r';; github_actions ) echo "::group::$1";; * ) @@ -28,7 +28,7 @@ function endgroup { azure ) echo "##[endgroup]";; travis ) - echo -en 'travis_fold:end:'"${1// /}"'\\r';; + echo -en 'travis_fold:end:'"${1// /}"'\r';; github_actions ) echo "::endgroup::";; esac diff --git a/.scripts/run_docker_build.sh b/.scripts/run_docker_build.sh index 92362398..00f377a8 100755 --- a/.scripts/run_docker_build.sh +++ b/.scripts/run_docker_build.sh @@ -21,6 +21,12 @@ if [ -z ${FEEDSTOCK_NAME} ]; then export FEEDSTOCK_NAME=$(basename ${FEEDSTOCK_ROOT}) fi +if [[ "${sha:-}" == "" ]]; then + pushd "${FEEDSTOCK_ROOT}" + sha=$(git rev-parse HEAD) + popd +fi + docker info # In order for the conda-build process in the container to write to the mounted @@ -91,6 +97,9 @@ docker run ${DOCKER_RUN_ARGS} \ -e CPU_COUNT \ -e BUILD_WITH_CONDA_DEBUG \ -e BUILD_OUTPUT_ID \ + -e flow_run_id \ + -e remote_url \ + -e sha \ -e BINSTAR_TOKEN \ -e FEEDSTOCK_TOKEN \ -e STAGING_BINSTAR_TOKEN \ diff --git a/.scripts/run_osx_build.sh b/.scripts/run_osx_build.sh index 3969edf3..ba0c8791 100755 --- a/.scripts/run_osx_build.sh +++ b/.scripts/run_osx_build.sh @@ -22,11 +22,13 @@ bash $MINIFORGE_FILE -b -p ${MINIFORGE_HOME} source ${MINIFORGE_HOME}/etc/profile.d/conda.sh conda activate base +export CONDA_SOLVER="libmamba" +export CONDA_LIBMAMBA_SOLVER_NO_CHANNELS_FROM_INSTALLED=1 -mamba install --update-specs --quiet --yes --channel conda-forge \ - conda-build pip boa conda-forge-ci-setup=3 -mamba update --update-specs --yes --quiet --channel conda-forge \ - conda-build pip boa conda-forge-ci-setup=3 +mamba install --update-specs --quiet --yes --channel conda-forge --strict-channel-priority \ + pip mamba conda-build conda-forge-ci-setup=4 "conda-build>=24.1" +mamba update --update-specs --yes --quiet --channel conda-forge --strict-channel-priority \ + pip mamba conda-build conda-forge-ci-setup=4 "conda-build>=24.1" @@ -45,6 +47,10 @@ else echo -e "\n\nNot mangling homebrew as we are not running in CI" fi +if [[ "${sha:-}" == "" ]]; then + sha=$(git rev-parse HEAD) +fi + echo -e "\n\nRunning the build setup script." source run_conda_forge_build_setup @@ -75,9 +81,17 @@ else EXTRA_CB_OPTIONS="${EXTRA_CB_OPTIONS:-} --no-test" fi - conda mambabuild ./recipe -m ./.ci_support/${CONFIG}.yaml \ + conda-build ./recipe -m ./.ci_support/${CONFIG}.yaml \ --suppress-variables ${EXTRA_CB_OPTIONS:-} \ - --clobber-file ./.ci_support/clobber_${CONFIG}.yaml + --clobber-file ./.ci_support/clobber_${CONFIG}.yaml \ + --extra-meta flow_run_id="$flow_run_id" remote_url="$remote_url" sha="$sha" + + ( startgroup "Inspecting artifacts" ) 2> /dev/null + + # inspect_artifacts was only added in conda-forge-ci-setup 4.6.0 + command -v inspect_artifacts >/dev/null 2>&1 && inspect_artifacts || echo "inspect_artifacts needs conda-forge-ci-setup >=4.6.0" + + ( endgroup "Inspecting artifacts" ) 2> /dev/null ( startgroup "Validating outputs" ) 2> /dev/null validate_recipe_outputs "${FEEDSTOCK_NAME}" diff --git a/.scripts/run_win_build.bat b/.scripts/run_win_build.bat new file mode 100755 index 00000000..65650bf2 --- /dev/null +++ b/.scripts/run_win_build.bat @@ -0,0 +1,130 @@ +:: PLEASE NOTE: This script has been automatically generated by conda-smithy. Any changes here +:: will be lost next time ``conda smithy rerender`` is run. If you would like to make permanent +:: changes to this script, consider a proposal to conda-smithy so that other feedstocks can also +:: benefit from the improvement. + +:: Note: we assume a Miniforge installation is available + +:: INPUTS (required environment variables) +:: CONFIG: name of the .ci_support/*.yaml file for this job +:: CI: azure, github_actions, or unset +:: UPLOAD_PACKAGES: true or false +:: UPLOAD_ON_BRANCH: true or false + +setlocal enableextensions enabledelayedexpansion + +call :start_group "Configuring conda" + +:: Activate the base conda environment +call activate base +:: Configure the solver +set "CONDA_SOLVER=libmamba" +if !errorlevel! neq 0 exit /b !errorlevel! +set "CONDA_LIBMAMBA_SOLVER_NO_CHANNELS_FROM_INSTALLED=1" + +:: Provision the necessary dependencies to build the recipe later +echo Installing dependencies +mamba.exe install "python=3.10" pip mamba conda-build conda-forge-ci-setup=4 "conda-build>=24.1" -c conda-forge --strict-channel-priority --yes +if !errorlevel! neq 0 exit /b !errorlevel! + +:: Set basic configuration +echo Setting up configuration +setup_conda_rc .\ ".\recipe" .\.ci_support\%CONFIG%.yaml +if !errorlevel! neq 0 exit /b !errorlevel! +echo Running build setup +CALL run_conda_forge_build_setup + + +if !errorlevel! neq 0 exit /b !errorlevel! + +if EXIST LICENSE.txt ( + echo Copying feedstock license + copy LICENSE.txt "recipe\\recipe-scripts-license.txt" +) +if NOT [%HOST_PLATFORM%] == [%BUILD_PLATFORM%] ( + if [%CROSSCOMPILING_EMULATOR%] == [] ( + set "EXTRA_CB_OPTIONS=%EXTRA_CB_OPTIONS% --no-test" + ) +) + +if NOT [%flow_run_id%] == [] ( + set "EXTRA_CB_OPTIONS=%EXTRA_CB_OPTIONS% --extra-meta flow_run_id=%flow_run_id% remote_url=%remote_url% sha=%sha%" +) + +call :end_group + +:: Build the recipe +echo Building recipe +conda-build.exe "recipe" -m .ci_support\%CONFIG%.yaml --suppress-variables %EXTRA_CB_OPTIONS% +if !errorlevel! neq 0 exit /b !errorlevel! + +call :start_group "Inspecting artifacts" +:: inspect_artifacts was only added in conda-forge-ci-setup 4.6.0 +WHERE inspect_artifacts >nul 2>nul && inspect_artifacts || echo "inspect_artifacts needs conda-forge-ci-setup >=4.6.0" +call :end_group + +:: Prepare some environment variables for the upload step +if /i "%CI%" == "github_actions" ( + set "FEEDSTOCK_NAME=%GITHUB_REPOSITORY:*/=%" + set "GIT_BRANCH=%GITHUB_REF:refs/heads/=%" + if /i "%GITHUB_EVENT_NAME%" == "pull_request" ( + set "IS_PR_BUILD=True" + ) else ( + set "IS_PR_BUILD=False" + ) + set "TEMP=%RUNNER_TEMP%" +) +if /i "%CI%" == "azure" ( + set "FEEDSTOCK_NAME=%BUILD_REPOSITORY_NAME:*/=%" + set "GIT_BRANCH=%BUILD_SOURCEBRANCHNAME%" + if /i "%BUILD_REASON%" == "PullRequest" ( + set "IS_PR_BUILD=True" + ) else ( + set "IS_PR_BUILD=False" + ) + set "TEMP=%UPLOAD_TEMP%" +) + +:: Validate +call :start_group "Validating outputs" +validate_recipe_outputs "%FEEDSTOCK_NAME%" +if !errorlevel! neq 0 exit /b !errorlevel! +call :end_group + +if /i "%UPLOAD_PACKAGES%" == "true" ( + if /i "%IS_PR_BUILD%" == "false" ( + call :start_group "Uploading packages" + if not exist "%TEMP%\" md "%TEMP%" + set "TMP=%TEMP%" + upload_package --validate --feedstock-name="%FEEDSTOCK_NAME%" .\ ".\recipe" .ci_support\%CONFIG%.yaml + if !errorlevel! neq 0 exit /b !errorlevel! + call :end_group + ) +) + +exit + +:: Logging subroutines + +:start_group +if /i "%CI%" == "github_actions" ( + echo ::group::%~1 + exit /b +) +if /i "%CI%" == "azure" ( + echo ##[group]%~1 + exit /b +) +echo %~1 +exit /b + +:end_group +if /i "%CI%" == "github_actions" ( + echo ::endgroup:: + exit /b +) +if /i "%CI%" == "azure" ( + echo ##[endgroup] + exit /b +) +exit /b \ No newline at end of file diff --git a/README.md b/README.md index 5517ad38..0c479bf7 100644 --- a/README.md +++ b/README.md @@ -38,38 +38,31 @@ Current build status
VariantStatus
linux_64_numpy1.21python3.10.____cpythonlinux_64_numpy1.22python3.8.____cpython - variant + variant
linux_64_numpy1.21python3.8.____73_pypylinux_64_numpy1.22python3.9.____73_pypy - variant + variant
linux_64_numpy1.21python3.8.____cpythonlinux_64_numpy2.0python3.10.____cpython - variant + variant
linux_64_numpy1.21python3.9.____73_pypylinux_64_numpy2.0python3.11.____cpython - variant + variant
linux_64_numpy1.21python3.9.____cpythonlinux_64_numpy2.0python3.12.____cpython - variant + variant
linux_64_numpy1.23python3.11.____cpythonlinux_64_numpy2.0python3.9.____cpython - variant + variant
linux_aarch64_numpy1.21python3.10.____cpythonlinux_aarch64_numpy1.22python3.8.____cpython - variant + variant
linux_aarch64_numpy1.21python3.8.____73_pypylinux_aarch64_numpy1.22python3.9.____73_pypy - variant + variant
linux_aarch64_numpy1.21python3.8.____cpythonlinux_aarch64_numpy2.0python3.10.____cpython - variant + variant
linux_aarch64_numpy1.21python3.9.____73_pypylinux_aarch64_numpy2.0python3.11.____cpython - variant + variant
linux_aarch64_numpy1.21python3.9.____cpythonlinux_aarch64_numpy2.0python3.12.____cpython - variant + variant
linux_aarch64_numpy1.23python3.11.____cpythonlinux_aarch64_numpy2.0python3.9.____cpython - variant + variant
linux_ppc64le_numpy1.21python3.10.____cpythonlinux_ppc64le_numpy1.22python3.8.____cpython - variant + variant
linux_ppc64le_numpy1.21python3.8.____73_pypylinux_ppc64le_numpy1.22python3.9.____73_pypy - variant + variant
linux_ppc64le_numpy1.21python3.8.____cpythonlinux_ppc64le_numpy2.0python3.10.____cpython - variant + variant
linux_ppc64le_numpy1.21python3.9.____73_pypylinux_ppc64le_numpy2.0python3.11.____cpython - variant + variant
linux_ppc64le_numpy1.21python3.9.____cpythonlinux_ppc64le_numpy2.0python3.12.____cpython - variant + variant
linux_ppc64le_numpy1.23python3.11.____cpythonlinux_ppc64le_numpy2.0python3.9.____cpython - variant + variant
osx_64_numpy1.21python3.10.____cpythonosx_64_numpy1.22python3.8.____cpython - variant + variant
osx_64_numpy1.21python3.8.____73_pypyosx_64_numpy1.22python3.9.____73_pypy - variant + variant
osx_64_numpy1.21python3.8.____cpythonosx_64_numpy2.0python3.10.____cpython - variant + variant
osx_64_numpy1.21python3.9.____73_pypyosx_64_numpy2.0python3.11.____cpython - variant + variant
osx_64_numpy1.21python3.9.____cpythonosx_64_numpy2.0python3.12.____cpython - variant + variant
osx_64_numpy1.23python3.11.____cpythonosx_64_numpy2.0python3.9.____cpython - variant + variant
osx_arm64_numpy1.21python3.10.____cpythonosx_arm64_numpy1.22python3.8.____cpython - variant + variant
osx_arm64_numpy1.21python3.8.____cpythonosx_arm64_numpy2.0python3.10.____cpython - variant + variant
osx_arm64_numpy1.21python3.9.____cpythonosx_arm64_numpy2.0python3.11.____cpython - variant + variant
osx_arm64_numpy1.23python3.11.____cpythonosx_arm64_numpy2.0python3.12.____cpython - variant + variant
win_64_numpy1.21python3.10.____cpythonosx_arm64_numpy2.0python3.9.____cpython - variant + variant
win_64_numpy1.21python3.8.____73_pypywin_64_numpy1.22python3.8.____cpython - variant + variant
win_64_numpy1.21python3.8.____cpythonwin_64_numpy1.22python3.9.____73_pypy - variant + variant
win_64_numpy1.21python3.9.____73_pypywin_64_numpy2.0python3.10.____cpython - variant + variant
win_64_numpy1.21python3.9.____cpythonwin_64_numpy2.0python3.11.____cpython - variant + variant
win_64_numpy1.23python3.11.____cpythonwin_64_numpy2.0python3.12.____cpython - variant + variant + +
win_64_numpy2.0python3.9.____cpython + + variant
- + - + - + - + - - - @@ -80,38 +73,38 @@ Current build status - + - + - + - + - + @@ -122,38 +115,38 @@ Current build status - + - + - + - + - + @@ -164,38 +157,38 @@ Current build status - + - + - + - + - + @@ -206,24 +199,31 @@ Current build status - + - + - + + + + @@ -234,38 +234,38 @@ Current build status - + - + - + - + - + @@ -275,6 +275,13 @@ Current build status variant + + +
VariantStatus
linux_64_numpy1.21python3.10.____cpythonlinux_64_numpy1.22python3.10.____cpython - variant + variant
linux_64_numpy1.21python3.8.____73_pypylinux_64_numpy1.22python3.8.____cpython - variant + variant
linux_64_numpy1.21python3.8.____cpythonlinux_64_numpy1.22python3.9.____73_pypy - variant + variant
linux_64_numpy1.21python3.9.____73_pypylinux_64_numpy1.22python3.9.____cpython - variant - -
linux_64_numpy1.21python3.9.____cpython - - variant + variant
linux_aarch64_numpy1.21python3.10.____cpythonlinux_64_numpy1.26python3.12.____cpython - variant + variant
linux_aarch64_numpy1.21python3.8.____73_pypylinux_aarch64_numpy1.22python3.10.____cpython - variant + variant
linux_aarch64_numpy1.21python3.8.____cpythonlinux_aarch64_numpy1.22python3.8.____cpython - variant + variant
linux_aarch64_numpy1.21python3.9.____73_pypylinux_aarch64_numpy1.22python3.9.____73_pypy - variant + variant
linux_aarch64_numpy1.21python3.9.____cpythonlinux_aarch64_numpy1.22python3.9.____cpython - variant + variant
linux_ppc64le_numpy1.21python3.10.____cpythonlinux_aarch64_numpy1.26python3.12.____cpython - variant + variant
linux_ppc64le_numpy1.21python3.8.____73_pypylinux_ppc64le_numpy1.22python3.10.____cpython - variant + variant
linux_ppc64le_numpy1.21python3.8.____cpythonlinux_ppc64le_numpy1.22python3.8.____cpython - variant + variant
linux_ppc64le_numpy1.21python3.9.____73_pypylinux_ppc64le_numpy1.22python3.9.____73_pypy - variant + variant
linux_ppc64le_numpy1.21python3.9.____cpythonlinux_ppc64le_numpy1.22python3.9.____cpython - variant + variant
osx_64_numpy1.21python3.10.____cpythonlinux_ppc64le_numpy1.26python3.12.____cpython - variant + variant
osx_64_numpy1.21python3.8.____73_pypyosx_64_numpy1.22python3.10.____cpython - variant + variant
osx_64_numpy1.21python3.8.____cpythonosx_64_numpy1.22python3.8.____cpython - variant + variant
osx_64_numpy1.21python3.9.____73_pypyosx_64_numpy1.22python3.9.____73_pypy - variant + variant
osx_64_numpy1.21python3.9.____cpythonosx_64_numpy1.22python3.9.____cpython - variant + variant
osx_arm64_numpy1.21python3.10.____cpythonosx_64_numpy1.26python3.12.____cpython - variant + variant
osx_arm64_numpy1.21python3.8.____cpythonosx_arm64_numpy1.22python3.10.____cpython - variant + variant
osx_arm64_numpy1.21python3.9.____cpythonosx_arm64_numpy1.22python3.8.____cpython - variant + variant + +
osx_arm64_numpy1.22python3.9.____cpython + + variant
win_64_numpy1.21python3.10.____cpythonosx_arm64_numpy1.26python3.12.____cpython - variant + variant
win_64_numpy1.21python3.8.____73_pypywin_64_numpy1.22python3.10.____cpython - variant + variant
win_64_numpy1.21python3.8.____cpythonwin_64_numpy1.22python3.8.____cpython - variant + variant
win_64_numpy1.21python3.9.____73_pypywin_64_numpy1.22python3.9.____73_pypy - variant + variant
win_64_numpy1.21python3.9.____cpythonwin_64_numpy1.22python3.9.____cpython - variant + variant
win_64_numpy1.26python3.12.____cpython + + variant + +
@@ -294,14 +301,14 @@ Current release info Installing matplotlib-suite =========================== -Installing `matplotlib-suite` from the `conda-forge` channel can be achieved by adding `conda-forge` to your channels with: +Installing `matplotlib-suite` from the `conda-forge/label/matplotlib_rc` channel can be achieved by adding `conda-forge/label/matplotlib_rc` to your channels with: ``` -conda config --add channels conda-forge +conda config --add channels conda-forge/label/matplotlib_rc conda config --set channel_priority strict ``` -Once the `conda-forge` channel has been enabled, `matplotlib, matplotlib-base` can be installed with `conda`: +Once the `conda-forge/label/matplotlib_rc` channel has been enabled, `matplotlib, matplotlib-base` can be installed with `conda`: ``` conda install matplotlib matplotlib-base @@ -316,26 +323,26 @@ mamba install matplotlib matplotlib-base It is possible to list all of the versions of `matplotlib` available on your platform with `conda`: ``` -conda search matplotlib --channel conda-forge +conda search matplotlib --channel conda-forge/label/matplotlib_rc ``` or with `mamba`: ``` -mamba search matplotlib --channel conda-forge +mamba search matplotlib --channel conda-forge/label/matplotlib_rc ``` Alternatively, `mamba repoquery` may provide more information: ``` # Search all versions available on your platform: -mamba repoquery search matplotlib --channel conda-forge +mamba repoquery search matplotlib --channel conda-forge/label/matplotlib_rc # List packages depending on `matplotlib`: -mamba repoquery whoneeds matplotlib --channel conda-forge +mamba repoquery whoneeds matplotlib --channel conda-forge/label/matplotlib_rc # List dependencies of `matplotlib`: -mamba repoquery depends matplotlib --channel conda-forge +mamba repoquery depends matplotlib --channel conda-forge/label/matplotlib_rc ``` @@ -357,7 +364,7 @@ available continuous integration services. Thanks to the awesome service provide [CircleCI](https://circleci.com/), [AppVeyor](https://www.appveyor.com/), [Drone](https://cloud.drone.io/welcome), and [TravisCI](https://travis-ci.com/) it is possible to build and upload installable packages to the -[conda-forge](https://anaconda.org/conda-forge) [Anaconda-Cloud](https://anaconda.org/) +[conda-forge](https://anaconda.org/conda-forge) [anaconda.org](https://anaconda.org/) channel for Linux, Windows and OSX respectively. To manage the continuous integration and simplify feedstock maintenance diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 6b346f50..e5306da9 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -4,5 +4,5 @@ jobs: - template: ./.azure-pipelines/azure-pipelines-linux.yml - - template: ./.azure-pipelines/azure-pipelines-win.yml - - template: ./.azure-pipelines/azure-pipelines-osx.yml \ No newline at end of file + - template: ./.azure-pipelines/azure-pipelines-osx.yml + - template: ./.azure-pipelines/azure-pipelines-win.yml \ No newline at end of file diff --git a/build-locally.py b/build-locally.py index 3f4b7a79..e0d408d0 100755 --- a/build-locally.py +++ b/build-locally.py @@ -64,8 +64,9 @@ def verify_config(ns): elif ns.config.startswith("osx"): if "OSX_SDK_DIR" not in os.environ: raise RuntimeError( - "Need OSX_SDK_DIR env variable set. Run 'export OSX_SDK_DIR=SDKs' " - "to download the SDK automatically to 'SDKs/MacOSX.sdk'. " + "Need OSX_SDK_DIR env variable set. Run 'export OSX_SDK_DIR=$PWD/SDKs' " + "to download the SDK automatically to '$PWD/SDKs/MacOSX.sdk'. " + "Note: OSX_SDK_DIR must be set to an absolute path. " "Setting this variable implies agreement to the licensing terms of the SDK by Apple." ) From 9bd1f6c993d8ff5e87b566bf1169d8f2e7f2ea77 Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Fri, 28 Jun 2024 12:53:50 +0000 Subject: [PATCH 90/95] Rebuild for PyPy3.9 --- .ci_support/migrations/pypy38.yaml | 67 +++++++++++++++--------------- conda-forge.yml | 4 +- recipe/meta.yaml | 2 +- 3 files changed, 36 insertions(+), 37 deletions(-) diff --git a/.ci_support/migrations/pypy38.yaml b/.ci_support/migrations/pypy38.yaml index 741fc1eb..29fb4514 100644 --- a/.ci_support/migrations/pypy38.yaml +++ b/.ci_support/migrations/pypy38.yaml @@ -1,43 +1,42 @@ migrator_ts: 1647123563 __migrator: - migration_number: 1 - operation: key_add - primary_key: python - ordering: - python: - - 3.6.* *_cpython - - 3.7.* *_cpython - - 3.8.* *_cpython - - 3.9.* *_cpython - - 3.10.* *_cpython - - 3.6.* *_73_pypy - - 3.7.* *_73_pypy - - 3.8.* *_73_pypy - - 3.9.* *_73_pypy - paused: False - longterm: True - use_local: False - check_solvable: True - exclude_pinned_pkgs: False - pr_limit: 10 - bump_number: 1 - commit_message: "Rebuild for PyPy3.8 and PyPy3.9" - exclude: - # this shouldn't attempt to modify the python feedstocks - - python - - pypy3.6 - - pypy-meta - ignored_deps_per_node: - matplotlib: - - pyqt + migration_number: 1 + operation: key_add + primary_key: python + ordering: + python: + - 3.6.* *_cpython + - 3.7.* *_cpython + - 3.8.* *_cpython + - 3.9.* *_cpython + - 3.10.* *_cpython + - 3.11.* *_cpython + - 3.12.* *_cpython + - 3.6.* *_73_pypy + - 3.7.* *_73_pypy + - 3.8.* *_73_pypy + - 3.9.* *_73_pypy + paused: False + longterm: True + use_local: False + check_solvable: True + exclude_pinned_pkgs: False + pr_limit: 5 + bump_number: 1 + commit_message: "Rebuild for PyPy3.9" + exclude: + # this shouldn't attempt to modify the python feedstocks + - python + - pypy3.6 + - pypy-meta + ignored_deps_per_node: + matplotlib: + - pyqt python: - - 3.8.* *_73_pypy # [not (osx and arm64)] - 3.9.* *_73_pypy # [not (osx and arm64)] numpy: # part of a zip_keys: python, python_impl, numpy - - 1.19 # [not (osx and arm64)] - - 1.19 # [not (osx and arm64)] + - 1.22 # [not (osx and arm64)] python_impl: - pypy # [not (osx and arm64)] - - pypy # [not (osx and arm64)] diff --git a/conda-forge.yml b/conda-forge.yml index 1a735061..58154bb6 100644 --- a/conda-forge.yml +++ b/conda-forge.yml @@ -5,6 +5,8 @@ build_platform: linux_aarch64: linux_64 linux_ppc64le: linux_64 osx_arm64: osx_64 +conda_build: + pkg_format: '2' conda_forge_output_validation: true github: branch_name: main @@ -15,6 +17,4 @@ provider: linux_ppc64le: default osx: azure win: azure -conda_build: - pkg_format: '2' test: native_and_emulated diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 967e6a84..74fd402e 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -12,7 +12,7 @@ source: sha256: f97316cbd46b5d28699254e3520e295e30b3deb6ec43b7a1aac62bffa2d9f497 build: - number: 0 + number: 1 outputs: - name: matplotlib-base From edcac60223ff1a59e5eae66a8f45f524a73d353f Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Fri, 28 Jun 2024 12:56:16 +0000 Subject: [PATCH 91/95] MNT: Re-rendered with conda-build 24.5.1, conda-smithy 3.36.2, and conda-forge-pinning 2024.06.28.09.32.10 --- .azure-pipelines/azure-pipelines-linux.yml | 68 ++++---- .azure-pipelines/azure-pipelines-osx.yml | 43 ++--- .azure-pipelines/azure-pipelines-win.yml | 81 +++------- ...nux_64_numpy1.21python3.8.____73_pypy.yaml | 40 ----- ...x_64_numpy1.22python3.10.____cpython.yaml} | 4 +- ...ux_64_numpy1.22python3.8.____cpython.yaml} | 4 +- ...ux_64_numpy1.22python3.9.____73_pypy.yaml} | 4 +- ...ux_64_numpy1.22python3.9.____cpython.yaml} | 4 +- ...ux_64_numpy1.23python3.11.____cpython.yaml | 2 +- ...ux_64_numpy1.26python3.12.____cpython.yaml | 40 +++++ ...arch64_numpy1.21python3.8.____73_pypy.yaml | 44 ------ ...ch64_numpy1.22python3.10.____cpython.yaml} | 4 +- ...rch64_numpy1.22python3.8.____cpython.yaml} | 4 +- ...rch64_numpy1.22python3.9.____73_pypy.yaml} | 4 +- ...rch64_numpy1.22python3.9.____cpython.yaml} | 4 +- ...rch64_numpy1.23python3.11.____cpython.yaml | 2 +- ...rch64_numpy1.26python3.12.____cpython.yaml | 44 ++++++ ...pc64le_numpy1.21python3.8.____73_pypy.yaml | 38 ----- ...64le_numpy1.22python3.10.____cpython.yaml} | 4 +- ...c64le_numpy1.22python3.8.____cpython.yaml} | 4 +- ...c64le_numpy1.22python3.9.____73_pypy.yaml} | 4 +- ...c64le_numpy1.22python3.9.____cpython.yaml} | 4 +- ...c64le_numpy1.23python3.11.____cpython.yaml | 2 +- ...c64le_numpy1.26python3.12.____cpython.yaml | 38 +++++ .ci_support/migrations/python311.yaml | 37 ----- ...osx_64_numpy1.21python3.8.____73_pypy.yaml | 40 ----- ...x_64_numpy1.22python3.10.____cpython.yaml} | 12 +- ...sx_64_numpy1.22python3.8.____cpython.yaml} | 12 +- ...sx_64_numpy1.22python3.9.____73_pypy.yaml} | 12 +- ...sx_64_numpy1.22python3.9.____cpython.yaml} | 12 +- ...sx_64_numpy1.23python3.11.____cpython.yaml | 10 +- ...sx_64_numpy1.26python3.12.____cpython.yaml | 40 +++++ ...rm64_numpy1.22python3.10.____cpython.yaml} | 10 +- ...arm64_numpy1.22python3.8.____cpython.yaml} | 10 +- ...arm64_numpy1.22python3.9.____cpython.yaml} | 10 +- ...arm64_numpy1.23python3.11.____cpython.yaml | 8 +- ...arm64_numpy1.26python3.12.____cpython.yaml | 40 +++++ ...n_64_numpy1.22python3.10.____cpython.yaml} | 4 +- ...in_64_numpy1.22python3.8.____cpython.yaml} | 4 +- ...in_64_numpy1.22python3.9.____73_pypy.yaml} | 4 +- ...in_64_numpy1.22python3.9.____cpython.yaml} | 4 +- ...in_64_numpy1.23python3.11.____cpython.yaml | 2 +- ...n_64_numpy1.26python3.12.____cpython.yaml} | 8 +- .gitattributes | 4 +- .gitignore | 25 ++- .scripts/build_steps.sh | 23 ++- .scripts/logging_utils.sh | 4 +- .scripts/run_docker_build.sh | 9 ++ .scripts/run_osx_build.sh | 26 +++- .scripts/run_win_build.bat | 130 ++++++++++++++++ README.md | 147 +++++++++--------- azure-pipelines.yml | 4 +- build-locally.py | 5 +- 53 files changed, 661 insertions(+), 485 deletions(-) delete mode 100644 .ci_support/linux_64_numpy1.21python3.8.____73_pypy.yaml rename .ci_support/{linux_64_numpy1.21python3.10.____cpython.yaml => linux_64_numpy1.22python3.10.____cpython.yaml} (96%) rename .ci_support/{linux_64_numpy1.21python3.8.____cpython.yaml => linux_64_numpy1.22python3.8.____cpython.yaml} (96%) rename .ci_support/{linux_64_numpy1.21python3.9.____73_pypy.yaml => linux_64_numpy1.22python3.9.____73_pypy.yaml} (96%) rename .ci_support/{linux_64_numpy1.21python3.9.____cpython.yaml => linux_64_numpy1.22python3.9.____cpython.yaml} (96%) create mode 100644 .ci_support/linux_64_numpy1.26python3.12.____cpython.yaml delete mode 100644 .ci_support/linux_aarch64_numpy1.21python3.8.____73_pypy.yaml rename .ci_support/{linux_aarch64_numpy1.21python3.10.____cpython.yaml => linux_aarch64_numpy1.22python3.10.____cpython.yaml} (97%) rename .ci_support/{linux_aarch64_numpy1.21python3.8.____cpython.yaml => linux_aarch64_numpy1.22python3.8.____cpython.yaml} (97%) rename .ci_support/{linux_aarch64_numpy1.21python3.9.____73_pypy.yaml => linux_aarch64_numpy1.22python3.9.____73_pypy.yaml} (97%) rename .ci_support/{linux_aarch64_numpy1.21python3.9.____cpython.yaml => linux_aarch64_numpy1.22python3.9.____cpython.yaml} (97%) create mode 100644 .ci_support/linux_aarch64_numpy1.26python3.12.____cpython.yaml delete mode 100644 .ci_support/linux_ppc64le_numpy1.21python3.8.____73_pypy.yaml rename .ci_support/{linux_ppc64le_numpy1.21python3.10.____cpython.yaml => linux_ppc64le_numpy1.22python3.10.____cpython.yaml} (96%) rename .ci_support/{linux_ppc64le_numpy1.21python3.8.____cpython.yaml => linux_ppc64le_numpy1.22python3.8.____cpython.yaml} (96%) rename .ci_support/{linux_ppc64le_numpy1.21python3.9.____73_pypy.yaml => linux_ppc64le_numpy1.22python3.9.____73_pypy.yaml} (96%) rename .ci_support/{linux_ppc64le_numpy1.21python3.9.____cpython.yaml => linux_ppc64le_numpy1.22python3.9.____cpython.yaml} (96%) create mode 100644 .ci_support/linux_ppc64le_numpy1.26python3.12.____cpython.yaml delete mode 100644 .ci_support/migrations/python311.yaml delete mode 100644 .ci_support/osx_64_numpy1.21python3.8.____73_pypy.yaml rename .ci_support/{osx_64_numpy1.21python3.10.____cpython.yaml => osx_64_numpy1.22python3.10.____cpython.yaml} (90%) rename .ci_support/{osx_64_numpy1.21python3.8.____cpython.yaml => osx_64_numpy1.22python3.8.____cpython.yaml} (90%) rename .ci_support/{osx_64_numpy1.21python3.9.____73_pypy.yaml => osx_64_numpy1.22python3.9.____73_pypy.yaml} (90%) rename .ci_support/{osx_64_numpy1.21python3.9.____cpython.yaml => osx_64_numpy1.22python3.9.____cpython.yaml} (90%) create mode 100644 .ci_support/osx_64_numpy1.26python3.12.____cpython.yaml rename .ci_support/{osx_arm64_numpy1.21python3.10.____cpython.yaml => osx_arm64_numpy1.22python3.10.____cpython.yaml} (89%) rename .ci_support/{osx_arm64_numpy1.21python3.8.____cpython.yaml => osx_arm64_numpy1.22python3.8.____cpython.yaml} (89%) rename .ci_support/{osx_arm64_numpy1.21python3.9.____cpython.yaml => osx_arm64_numpy1.22python3.9.____cpython.yaml} (89%) create mode 100644 .ci_support/osx_arm64_numpy1.26python3.12.____cpython.yaml rename .ci_support/{win_64_numpy1.21python3.10.____cpython.yaml => win_64_numpy1.22python3.10.____cpython.yaml} (95%) rename .ci_support/{win_64_numpy1.21python3.8.____cpython.yaml => win_64_numpy1.22python3.8.____cpython.yaml} (95%) rename .ci_support/{win_64_numpy1.21python3.9.____73_pypy.yaml => win_64_numpy1.22python3.9.____73_pypy.yaml} (95%) rename .ci_support/{win_64_numpy1.21python3.9.____cpython.yaml => win_64_numpy1.22python3.9.____cpython.yaml} (95%) rename .ci_support/{win_64_numpy1.21python3.8.____73_pypy.yaml => win_64_numpy1.26python3.12.____cpython.yaml} (87%) create mode 100755 .scripts/run_win_build.bat diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml index d42ff128..229a62a6 100755 --- a/.azure-pipelines/azure-pipelines-linux.yml +++ b/.azure-pipelines/azure-pipelines-linux.yml @@ -8,79 +8,80 @@ jobs: vmImage: ubuntu-latest strategy: matrix: - linux_64_numpy1.21python3.10.____cpython: - CONFIG: linux_64_numpy1.21python3.10.____cpython + linux_64_numpy1.22python3.10.____cpython: + CONFIG: linux_64_numpy1.22python3.10.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_64_numpy1.21python3.8.____73_pypy: - CONFIG: linux_64_numpy1.21python3.8.____73_pypy + linux_64_numpy1.22python3.8.____cpython: + CONFIG: linux_64_numpy1.22python3.8.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_64_numpy1.21python3.8.____cpython: - CONFIG: linux_64_numpy1.21python3.8.____cpython + linux_64_numpy1.22python3.9.____73_pypy: + CONFIG: linux_64_numpy1.22python3.9.____73_pypy UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_64_numpy1.21python3.9.____73_pypy: - CONFIG: linux_64_numpy1.21python3.9.____73_pypy - UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_64_numpy1.21python3.9.____cpython: - CONFIG: linux_64_numpy1.21python3.9.____cpython + linux_64_numpy1.22python3.9.____cpython: + CONFIG: linux_64_numpy1.22python3.9.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 linux_64_numpy1.23python3.11.____cpython: CONFIG: linux_64_numpy1.23python3.11.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_aarch64_numpy1.21python3.10.____cpython: - CONFIG: linux_aarch64_numpy1.21python3.10.____cpython + linux_64_numpy1.26python3.12.____cpython: + CONFIG: linux_64_numpy1.26python3.12.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_aarch64_numpy1.21python3.8.____73_pypy: - CONFIG: linux_aarch64_numpy1.21python3.8.____73_pypy + linux_aarch64_numpy1.22python3.10.____cpython: + CONFIG: linux_aarch64_numpy1.22python3.10.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_aarch64_numpy1.21python3.8.____cpython: - CONFIG: linux_aarch64_numpy1.21python3.8.____cpython + linux_aarch64_numpy1.22python3.8.____cpython: + CONFIG: linux_aarch64_numpy1.22python3.8.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_aarch64_numpy1.21python3.9.____73_pypy: - CONFIG: linux_aarch64_numpy1.21python3.9.____73_pypy + linux_aarch64_numpy1.22python3.9.____73_pypy: + CONFIG: linux_aarch64_numpy1.22python3.9.____73_pypy UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_aarch64_numpy1.21python3.9.____cpython: - CONFIG: linux_aarch64_numpy1.21python3.9.____cpython + linux_aarch64_numpy1.22python3.9.____cpython: + CONFIG: linux_aarch64_numpy1.22python3.9.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 linux_aarch64_numpy1.23python3.11.____cpython: CONFIG: linux_aarch64_numpy1.23python3.11.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_ppc64le_numpy1.21python3.10.____cpython: - CONFIG: linux_ppc64le_numpy1.21python3.10.____cpython + linux_aarch64_numpy1.26python3.12.____cpython: + CONFIG: linux_aarch64_numpy1.26python3.12.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_ppc64le_numpy1.21python3.8.____73_pypy: - CONFIG: linux_ppc64le_numpy1.21python3.8.____73_pypy + linux_ppc64le_numpy1.22python3.10.____cpython: + CONFIG: linux_ppc64le_numpy1.22python3.10.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_ppc64le_numpy1.21python3.8.____cpython: - CONFIG: linux_ppc64le_numpy1.21python3.8.____cpython + linux_ppc64le_numpy1.22python3.8.____cpython: + CONFIG: linux_ppc64le_numpy1.22python3.8.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_ppc64le_numpy1.21python3.9.____73_pypy: - CONFIG: linux_ppc64le_numpy1.21python3.9.____73_pypy + linux_ppc64le_numpy1.22python3.9.____73_pypy: + CONFIG: linux_ppc64le_numpy1.22python3.9.____73_pypy UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_ppc64le_numpy1.21python3.9.____cpython: - CONFIG: linux_ppc64le_numpy1.21python3.9.____cpython + linux_ppc64le_numpy1.22python3.9.____cpython: + CONFIG: linux_ppc64le_numpy1.22python3.9.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 linux_ppc64le_numpy1.23python3.11.____cpython: CONFIG: linux_ppc64le_numpy1.23python3.11.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 + linux_ppc64le_numpy1.26python3.12.____cpython: + CONFIG: linux_ppc64le_numpy1.26python3.12.____cpython + UPLOAD_PACKAGES: 'True' + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 timeoutInMinutes: 360 + variables: {} steps: # configure qemu binfmt-misc running. This allows us to run docker containers @@ -93,6 +94,9 @@ jobs: - script: | export CI=azure + export flow_run_id=azure_$(Build.BuildNumber).$(System.JobAttempt) + export remote_url=$(Build.Repository.Uri) + export sha=$(Build.SourceVersion) export GIT_BRANCH=$BUILD_SOURCEBRANCHNAME export FEEDSTOCK_NAME=$(basename ${BUILD_REPOSITORY_NAME}) if [[ "${BUILD_REASON:-}" == "PullRequest" ]]; then diff --git a/.azure-pipelines/azure-pipelines-osx.yml b/.azure-pipelines/azure-pipelines-osx.yml index e3774bfd..27ddd14f 100755 --- a/.azure-pipelines/azure-pipelines-osx.yml +++ b/.azure-pipelines/azure-pipelines-osx.yml @@ -5,45 +5,52 @@ jobs: - job: osx pool: - vmImage: macOS-11 + vmImage: macOS-12 strategy: matrix: - osx_64_numpy1.21python3.10.____cpython: - CONFIG: osx_64_numpy1.21python3.10.____cpython + osx_64_numpy1.22python3.10.____cpython: + CONFIG: osx_64_numpy1.22python3.10.____cpython UPLOAD_PACKAGES: 'True' - osx_64_numpy1.21python3.8.____73_pypy: - CONFIG: osx_64_numpy1.21python3.8.____73_pypy + osx_64_numpy1.22python3.8.____cpython: + CONFIG: osx_64_numpy1.22python3.8.____cpython UPLOAD_PACKAGES: 'True' - osx_64_numpy1.21python3.8.____cpython: - CONFIG: osx_64_numpy1.21python3.8.____cpython + osx_64_numpy1.22python3.9.____73_pypy: + CONFIG: osx_64_numpy1.22python3.9.____73_pypy UPLOAD_PACKAGES: 'True' - osx_64_numpy1.21python3.9.____73_pypy: - CONFIG: osx_64_numpy1.21python3.9.____73_pypy - UPLOAD_PACKAGES: 'True' - osx_64_numpy1.21python3.9.____cpython: - CONFIG: osx_64_numpy1.21python3.9.____cpython + osx_64_numpy1.22python3.9.____cpython: + CONFIG: osx_64_numpy1.22python3.9.____cpython UPLOAD_PACKAGES: 'True' osx_64_numpy1.23python3.11.____cpython: CONFIG: osx_64_numpy1.23python3.11.____cpython UPLOAD_PACKAGES: 'True' - osx_arm64_numpy1.21python3.10.____cpython: - CONFIG: osx_arm64_numpy1.21python3.10.____cpython + osx_64_numpy1.26python3.12.____cpython: + CONFIG: osx_64_numpy1.26python3.12.____cpython + UPLOAD_PACKAGES: 'True' + osx_arm64_numpy1.22python3.10.____cpython: + CONFIG: osx_arm64_numpy1.22python3.10.____cpython UPLOAD_PACKAGES: 'True' - osx_arm64_numpy1.21python3.8.____cpython: - CONFIG: osx_arm64_numpy1.21python3.8.____cpython + osx_arm64_numpy1.22python3.8.____cpython: + CONFIG: osx_arm64_numpy1.22python3.8.____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 UPLOAD_PACKAGES: 'True' + osx_arm64_numpy1.26python3.12.____cpython: + CONFIG: osx_arm64_numpy1.26python3.12.____cpython + UPLOAD_PACKAGES: 'True' timeoutInMinutes: 360 + variables: {} steps: # TODO: Fast finish on azure pipelines? - script: | export CI=azure + export flow_run_id=azure_$(Build.BuildNumber).$(System.JobAttempt) + export remote_url=$(Build.Repository.Uri) + export sha=$(Build.SourceVersion) export OSX_FORCE_SDK_DOWNLOAD="1" export GIT_BRANCH=$BUILD_SOURCEBRANCHNAME export FEEDSTOCK_NAME=$(basename ${BUILD_REPOSITORY_NAME}) diff --git a/.azure-pipelines/azure-pipelines-win.yml b/.azure-pipelines/azure-pipelines-win.yml index 7f5ab156..9f5a7811 100755 --- a/.azure-pipelines/azure-pipelines-win.yml +++ b/.azure-pipelines/azure-pipelines-win.yml @@ -8,30 +8,31 @@ jobs: vmImage: windows-2022 strategy: matrix: - win_64_numpy1.21python3.10.____cpython: - CONFIG: win_64_numpy1.21python3.10.____cpython + win_64_numpy1.22python3.10.____cpython: + CONFIG: win_64_numpy1.22python3.10.____cpython UPLOAD_PACKAGES: 'True' - win_64_numpy1.21python3.8.____73_pypy: - CONFIG: win_64_numpy1.21python3.8.____73_pypy + win_64_numpy1.22python3.8.____cpython: + CONFIG: win_64_numpy1.22python3.8.____cpython UPLOAD_PACKAGES: 'True' - win_64_numpy1.21python3.8.____cpython: - CONFIG: win_64_numpy1.21python3.8.____cpython + win_64_numpy1.22python3.9.____73_pypy: + CONFIG: win_64_numpy1.22python3.9.____73_pypy UPLOAD_PACKAGES: 'True' - win_64_numpy1.21python3.9.____73_pypy: - CONFIG: win_64_numpy1.21python3.9.____73_pypy - UPLOAD_PACKAGES: 'True' - win_64_numpy1.21python3.9.____cpython: - CONFIG: win_64_numpy1.21python3.9.____cpython + win_64_numpy1.22python3.9.____cpython: + CONFIG: win_64_numpy1.22python3.9.____cpython UPLOAD_PACKAGES: 'True' win_64_numpy1.23python3.11.____cpython: CONFIG: win_64_numpy1.23python3.11.____cpython UPLOAD_PACKAGES: 'True' + win_64_numpy1.26python3.12.____cpython: + CONFIG: win_64_numpy1.26python3.12.____cpython + UPLOAD_PACKAGES: 'True' timeoutInMinutes: 360 variables: CONDA_BLD_PATH: D:\\bld\\ UPLOAD_TEMP: D:\\tmp steps: + - task: PythonScript@0 displayName: 'Download Miniforge' inputs: @@ -50,55 +51,17 @@ jobs: displayName: Add conda to PATH - script: | - call activate base - mamba.exe install "python=3.10" conda-build conda pip boa conda-forge-ci-setup=3 -c conda-forge --strict-channel-priority --yes - displayName: Install conda-build - - - script: set PYTHONUNBUFFERED=1 - displayName: Set PYTHONUNBUFFERED - - # Configure the VM - - script: | - call activate base - setup_conda_rc .\ ".\recipe" .\.ci_support\%CONFIG%.yaml - displayName: conda-forge CI setup - - # Configure the VM. - - script: | - set "CI=azure" - call activate base - run_conda_forge_build_setup - displayName: conda-forge build setup - - - script: | - call activate base - if EXIST LICENSE.txt ( - copy LICENSE.txt "recipe\\recipe-scripts-license.txt" - ) - if NOT [%HOST_PLATFORM%] == [%BUILD_PLATFORM%] ( - set "EXTRA_CB_OPTIONS=%EXTRA_CB_OPTIONS% --no-test" - ) - conda.exe mambabuild "recipe" -m .ci_support\%CONFIG%.yaml --suppress-variables %EXTRA_CB_OPTIONS% - displayName: Build recipe + call ".scripts\run_win_build.bat" + displayName: Run Windows build env: PYTHONUNBUFFERED: 1 - - script: | - set "FEEDSTOCK_NAME=%BUILD_REPOSITORY_NAME:*/=%" - call activate base - validate_recipe_outputs "%FEEDSTOCK_NAME%" - displayName: Validate Recipe Outputs - - - script: | - set "GIT_BRANCH=%BUILD_SOURCEBRANCHNAME%" - set "FEEDSTOCK_NAME=%BUILD_REPOSITORY_NAME:*/=%" - set "TEMP=$(UPLOAD_TEMP)" - if not exist "%TEMP%\" md "%TEMP%" - set "TMP=%TEMP%" - call activate base - upload_package --validate --feedstock-name="%FEEDSTOCK_NAME%" .\ ".\recipe" .ci_support\%CONFIG%.yaml - displayName: Upload package - env: + CONFIG: $(CONFIG) + CI: azure + flow_run_id: azure_$(Build.BuildNumber).$(System.JobAttempt) + remote_url: $(Build.Repository.Uri) + sha: $(Build.SourceVersion) + UPLOAD_PACKAGES: $(UPLOAD_PACKAGES) + UPLOAD_TEMP: $(UPLOAD_TEMP) BINSTAR_TOKEN: $(BINSTAR_TOKEN) FEEDSTOCK_TOKEN: $(FEEDSTOCK_TOKEN) - STAGING_BINSTAR_TOKEN: $(STAGING_BINSTAR_TOKEN) - condition: and(succeeded(), not(eq(variables['UPLOAD_PACKAGES'], 'False')), not(eq(variables['Build.Reason'], 'PullRequest'))) \ No newline at end of file + STAGING_BINSTAR_TOKEN: $(STAGING_BINSTAR_TOKEN) \ No newline at end of file diff --git a/.ci_support/linux_64_numpy1.21python3.8.____73_pypy.yaml b/.ci_support/linux_64_numpy1.21python3.8.____73_pypy.yaml deleted file mode 100644 index b541d9a6..00000000 --- a/.ci_support/linux_64_numpy1.21python3.8.____73_pypy.yaml +++ /dev/null @@ -1,40 +0,0 @@ -c_compiler: -- gcc -c_compiler_version: -- '12' -cdt_name: -- cos6 -channel_sources: -- conda-forge -channel_targets: -- conda-forge matplotlib_rc -cxx_compiler: -- gxx -cxx_compiler_version: -- '12' -docker_image: -- quay.io/condaforge/linux-anvil-cos7-x86_64 -freetype: -- '2' -numpy: -- '1.21' -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -python: -- 3.8.* *_73_pypy -python_impl: -- pypy -target_platform: -- linux-64 -tk: -- '8.6' -zip_keys: -- - c_compiler_version - - cxx_compiler_version -- - python - - numpy - - python_impl -zlib: -- '1.2' diff --git a/.ci_support/linux_64_numpy1.21python3.10.____cpython.yaml b/.ci_support/linux_64_numpy1.22python3.10.____cpython.yaml similarity index 96% rename from .ci_support/linux_64_numpy1.21python3.10.____cpython.yaml rename to .ci_support/linux_64_numpy1.22python3.10.____cpython.yaml index 79e954eb..711a1834 100644 --- a/.ci_support/linux_64_numpy1.21python3.10.____cpython.yaml +++ b/.ci_support/linux_64_numpy1.22python3.10.____cpython.yaml @@ -17,7 +17,7 @@ docker_image: freetype: - '2' numpy: -- '1.21' +- '1.22' pin_run_as_build: python: min_pin: x.x @@ -37,4 +37,4 @@ zip_keys: - numpy - python_impl zlib: -- '1.2' +- '1' diff --git a/.ci_support/linux_64_numpy1.21python3.8.____cpython.yaml b/.ci_support/linux_64_numpy1.22python3.8.____cpython.yaml similarity index 96% rename from .ci_support/linux_64_numpy1.21python3.8.____cpython.yaml rename to .ci_support/linux_64_numpy1.22python3.8.____cpython.yaml index 597557ab..84dab33d 100644 --- a/.ci_support/linux_64_numpy1.21python3.8.____cpython.yaml +++ b/.ci_support/linux_64_numpy1.22python3.8.____cpython.yaml @@ -17,7 +17,7 @@ docker_image: freetype: - '2' numpy: -- '1.21' +- '1.22' pin_run_as_build: python: min_pin: x.x @@ -37,4 +37,4 @@ zip_keys: - numpy - python_impl zlib: -- '1.2' +- '1' diff --git a/.ci_support/linux_64_numpy1.21python3.9.____73_pypy.yaml b/.ci_support/linux_64_numpy1.22python3.9.____73_pypy.yaml similarity index 96% rename from .ci_support/linux_64_numpy1.21python3.9.____73_pypy.yaml rename to .ci_support/linux_64_numpy1.22python3.9.____73_pypy.yaml index d7bb831c..7544eb38 100644 --- a/.ci_support/linux_64_numpy1.21python3.9.____73_pypy.yaml +++ b/.ci_support/linux_64_numpy1.22python3.9.____73_pypy.yaml @@ -17,7 +17,7 @@ docker_image: freetype: - '2' numpy: -- '1.21' +- '1.22' pin_run_as_build: python: min_pin: x.x @@ -37,4 +37,4 @@ zip_keys: - numpy - python_impl zlib: -- '1.2' +- '1' diff --git a/.ci_support/linux_64_numpy1.21python3.9.____cpython.yaml b/.ci_support/linux_64_numpy1.22python3.9.____cpython.yaml similarity index 96% rename from .ci_support/linux_64_numpy1.21python3.9.____cpython.yaml rename to .ci_support/linux_64_numpy1.22python3.9.____cpython.yaml index e8fe600d..daa126db 100644 --- a/.ci_support/linux_64_numpy1.21python3.9.____cpython.yaml +++ b/.ci_support/linux_64_numpy1.22python3.9.____cpython.yaml @@ -17,7 +17,7 @@ docker_image: freetype: - '2' numpy: -- '1.21' +- '1.22' pin_run_as_build: python: min_pin: x.x @@ -37,4 +37,4 @@ zip_keys: - numpy - python_impl zlib: -- '1.2' +- '1' diff --git a/.ci_support/linux_64_numpy1.23python3.11.____cpython.yaml b/.ci_support/linux_64_numpy1.23python3.11.____cpython.yaml index 918e96ea..f04f3e00 100644 --- a/.ci_support/linux_64_numpy1.23python3.11.____cpython.yaml +++ b/.ci_support/linux_64_numpy1.23python3.11.____cpython.yaml @@ -37,4 +37,4 @@ zip_keys: - numpy - python_impl zlib: -- '1.2' +- '1' diff --git a/.ci_support/linux_64_numpy1.26python3.12.____cpython.yaml b/.ci_support/linux_64_numpy1.26python3.12.____cpython.yaml new file mode 100644 index 00000000..924eec41 --- /dev/null +++ b/.ci_support/linux_64_numpy1.26python3.12.____cpython.yaml @@ -0,0 +1,40 @@ +c_compiler: +- gcc +c_compiler_version: +- '12' +cdt_name: +- cos6 +channel_sources: +- conda-forge +channel_targets: +- conda-forge matplotlib_rc +cxx_compiler: +- gxx +cxx_compiler_version: +- '12' +docker_image: +- quay.io/condaforge/linux-anvil-cos7-x86_64 +freetype: +- '2' +numpy: +- '1.26' +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +python: +- 3.12.* *_cpython +python_impl: +- cpython +target_platform: +- linux-64 +tk: +- '8.6' +zip_keys: +- - c_compiler_version + - cxx_compiler_version +- - python + - numpy + - python_impl +zlib: +- '1' diff --git a/.ci_support/linux_aarch64_numpy1.21python3.8.____73_pypy.yaml b/.ci_support/linux_aarch64_numpy1.21python3.8.____73_pypy.yaml deleted file mode 100644 index 9f217c11..00000000 --- a/.ci_support/linux_aarch64_numpy1.21python3.8.____73_pypy.yaml +++ /dev/null @@ -1,44 +0,0 @@ -BUILD: -- aarch64-conda_cos7-linux-gnu -c_compiler: -- gcc -c_compiler_version: -- '12' -cdt_arch: -- aarch64 -cdt_name: -- cos7 -channel_sources: -- conda-forge -channel_targets: -- conda-forge matplotlib_rc -cxx_compiler: -- gxx -cxx_compiler_version: -- '12' -docker_image: -- quay.io/condaforge/linux-anvil-cos7-x86_64 -freetype: -- '2' -numpy: -- '1.21' -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -python: -- 3.8.* *_73_pypy -python_impl: -- pypy -target_platform: -- linux-aarch64 -tk: -- '8.6' -zip_keys: -- - c_compiler_version - - cxx_compiler_version -- - python - - numpy - - python_impl -zlib: -- '1.2' diff --git a/.ci_support/linux_aarch64_numpy1.21python3.10.____cpython.yaml b/.ci_support/linux_aarch64_numpy1.22python3.10.____cpython.yaml similarity index 97% rename from .ci_support/linux_aarch64_numpy1.21python3.10.____cpython.yaml rename to .ci_support/linux_aarch64_numpy1.22python3.10.____cpython.yaml index b5881ca1..0d7d0fcb 100644 --- a/.ci_support/linux_aarch64_numpy1.21python3.10.____cpython.yaml +++ b/.ci_support/linux_aarch64_numpy1.22python3.10.____cpython.yaml @@ -21,7 +21,7 @@ docker_image: freetype: - '2' numpy: -- '1.21' +- '1.22' pin_run_as_build: python: min_pin: x.x @@ -41,4 +41,4 @@ zip_keys: - numpy - python_impl zlib: -- '1.2' +- '1' diff --git a/.ci_support/linux_aarch64_numpy1.21python3.8.____cpython.yaml b/.ci_support/linux_aarch64_numpy1.22python3.8.____cpython.yaml similarity index 97% rename from .ci_support/linux_aarch64_numpy1.21python3.8.____cpython.yaml rename to .ci_support/linux_aarch64_numpy1.22python3.8.____cpython.yaml index 07edc4c2..739a3343 100644 --- a/.ci_support/linux_aarch64_numpy1.21python3.8.____cpython.yaml +++ b/.ci_support/linux_aarch64_numpy1.22python3.8.____cpython.yaml @@ -21,7 +21,7 @@ docker_image: freetype: - '2' numpy: -- '1.21' +- '1.22' pin_run_as_build: python: min_pin: x.x @@ -41,4 +41,4 @@ zip_keys: - numpy - python_impl zlib: -- '1.2' +- '1' diff --git a/.ci_support/linux_aarch64_numpy1.21python3.9.____73_pypy.yaml b/.ci_support/linux_aarch64_numpy1.22python3.9.____73_pypy.yaml similarity index 97% rename from .ci_support/linux_aarch64_numpy1.21python3.9.____73_pypy.yaml rename to .ci_support/linux_aarch64_numpy1.22python3.9.____73_pypy.yaml index 19862c32..68b93569 100644 --- a/.ci_support/linux_aarch64_numpy1.21python3.9.____73_pypy.yaml +++ b/.ci_support/linux_aarch64_numpy1.22python3.9.____73_pypy.yaml @@ -21,7 +21,7 @@ docker_image: freetype: - '2' numpy: -- '1.21' +- '1.22' pin_run_as_build: python: min_pin: x.x @@ -41,4 +41,4 @@ zip_keys: - numpy - python_impl zlib: -- '1.2' +- '1' diff --git a/.ci_support/linux_aarch64_numpy1.21python3.9.____cpython.yaml b/.ci_support/linux_aarch64_numpy1.22python3.9.____cpython.yaml similarity index 97% rename from .ci_support/linux_aarch64_numpy1.21python3.9.____cpython.yaml rename to .ci_support/linux_aarch64_numpy1.22python3.9.____cpython.yaml index 47c1c822..63c4b20c 100644 --- a/.ci_support/linux_aarch64_numpy1.21python3.9.____cpython.yaml +++ b/.ci_support/linux_aarch64_numpy1.22python3.9.____cpython.yaml @@ -21,7 +21,7 @@ docker_image: freetype: - '2' numpy: -- '1.21' +- '1.22' pin_run_as_build: python: min_pin: x.x @@ -41,4 +41,4 @@ zip_keys: - numpy - python_impl zlib: -- '1.2' +- '1' diff --git a/.ci_support/linux_aarch64_numpy1.23python3.11.____cpython.yaml b/.ci_support/linux_aarch64_numpy1.23python3.11.____cpython.yaml index 48aac766..c9efd406 100644 --- a/.ci_support/linux_aarch64_numpy1.23python3.11.____cpython.yaml +++ b/.ci_support/linux_aarch64_numpy1.23python3.11.____cpython.yaml @@ -41,4 +41,4 @@ zip_keys: - numpy - python_impl zlib: -- '1.2' +- '1' diff --git a/.ci_support/linux_aarch64_numpy1.26python3.12.____cpython.yaml b/.ci_support/linux_aarch64_numpy1.26python3.12.____cpython.yaml new file mode 100644 index 00000000..23a02890 --- /dev/null +++ b/.ci_support/linux_aarch64_numpy1.26python3.12.____cpython.yaml @@ -0,0 +1,44 @@ +BUILD: +- aarch64-conda_cos7-linux-gnu +c_compiler: +- gcc +c_compiler_version: +- '12' +cdt_arch: +- aarch64 +cdt_name: +- cos7 +channel_sources: +- conda-forge +channel_targets: +- conda-forge matplotlib_rc +cxx_compiler: +- gxx +cxx_compiler_version: +- '12' +docker_image: +- quay.io/condaforge/linux-anvil-cos7-x86_64 +freetype: +- '2' +numpy: +- '1.26' +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +python: +- 3.12.* *_cpython +python_impl: +- cpython +target_platform: +- linux-aarch64 +tk: +- '8.6' +zip_keys: +- - c_compiler_version + - cxx_compiler_version +- - python + - numpy + - python_impl +zlib: +- '1' diff --git a/.ci_support/linux_ppc64le_numpy1.21python3.8.____73_pypy.yaml b/.ci_support/linux_ppc64le_numpy1.21python3.8.____73_pypy.yaml deleted file mode 100644 index 06fc0016..00000000 --- a/.ci_support/linux_ppc64le_numpy1.21python3.8.____73_pypy.yaml +++ /dev/null @@ -1,38 +0,0 @@ -c_compiler: -- gcc -c_compiler_version: -- '12' -cdt_name: -- cos7 -channel_sources: -- conda-forge -channel_targets: -- conda-forge matplotlib_rc -cxx_compiler: -- gxx -cxx_compiler_version: -- '12' -docker_image: -- quay.io/condaforge/linux-anvil-cos7-x86_64 -freetype: -- '2' -numpy: -- '1.21' -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -python: -- 3.8.* *_73_pypy -python_impl: -- pypy -target_platform: -- linux-ppc64le -zip_keys: -- - c_compiler_version - - cxx_compiler_version -- - python - - numpy - - python_impl -zlib: -- '1.2' diff --git a/.ci_support/linux_ppc64le_numpy1.21python3.10.____cpython.yaml b/.ci_support/linux_ppc64le_numpy1.22python3.10.____cpython.yaml similarity index 96% rename from .ci_support/linux_ppc64le_numpy1.21python3.10.____cpython.yaml rename to .ci_support/linux_ppc64le_numpy1.22python3.10.____cpython.yaml index 61235591..ae29958b 100644 --- a/.ci_support/linux_ppc64le_numpy1.21python3.10.____cpython.yaml +++ b/.ci_support/linux_ppc64le_numpy1.22python3.10.____cpython.yaml @@ -17,7 +17,7 @@ docker_image: freetype: - '2' numpy: -- '1.21' +- '1.22' pin_run_as_build: python: min_pin: x.x @@ -35,4 +35,4 @@ zip_keys: - numpy - python_impl zlib: -- '1.2' +- '1' diff --git a/.ci_support/linux_ppc64le_numpy1.21python3.8.____cpython.yaml b/.ci_support/linux_ppc64le_numpy1.22python3.8.____cpython.yaml similarity index 96% rename from .ci_support/linux_ppc64le_numpy1.21python3.8.____cpython.yaml rename to .ci_support/linux_ppc64le_numpy1.22python3.8.____cpython.yaml index 89ac1234..7afc4d88 100644 --- a/.ci_support/linux_ppc64le_numpy1.21python3.8.____cpython.yaml +++ b/.ci_support/linux_ppc64le_numpy1.22python3.8.____cpython.yaml @@ -17,7 +17,7 @@ docker_image: freetype: - '2' numpy: -- '1.21' +- '1.22' pin_run_as_build: python: min_pin: x.x @@ -35,4 +35,4 @@ zip_keys: - numpy - python_impl zlib: -- '1.2' +- '1' diff --git a/.ci_support/linux_ppc64le_numpy1.21python3.9.____73_pypy.yaml b/.ci_support/linux_ppc64le_numpy1.22python3.9.____73_pypy.yaml similarity index 96% rename from .ci_support/linux_ppc64le_numpy1.21python3.9.____73_pypy.yaml rename to .ci_support/linux_ppc64le_numpy1.22python3.9.____73_pypy.yaml index 22f3aa7b..a666e430 100644 --- a/.ci_support/linux_ppc64le_numpy1.21python3.9.____73_pypy.yaml +++ b/.ci_support/linux_ppc64le_numpy1.22python3.9.____73_pypy.yaml @@ -17,7 +17,7 @@ docker_image: freetype: - '2' numpy: -- '1.21' +- '1.22' pin_run_as_build: python: min_pin: x.x @@ -35,4 +35,4 @@ zip_keys: - numpy - python_impl zlib: -- '1.2' +- '1' diff --git a/.ci_support/linux_ppc64le_numpy1.21python3.9.____cpython.yaml b/.ci_support/linux_ppc64le_numpy1.22python3.9.____cpython.yaml similarity index 96% rename from .ci_support/linux_ppc64le_numpy1.21python3.9.____cpython.yaml rename to .ci_support/linux_ppc64le_numpy1.22python3.9.____cpython.yaml index 295f54ec..4b8bcfcb 100644 --- a/.ci_support/linux_ppc64le_numpy1.21python3.9.____cpython.yaml +++ b/.ci_support/linux_ppc64le_numpy1.22python3.9.____cpython.yaml @@ -17,7 +17,7 @@ docker_image: freetype: - '2' numpy: -- '1.21' +- '1.22' pin_run_as_build: python: min_pin: x.x @@ -35,4 +35,4 @@ zip_keys: - numpy - python_impl zlib: -- '1.2' +- '1' diff --git a/.ci_support/linux_ppc64le_numpy1.23python3.11.____cpython.yaml b/.ci_support/linux_ppc64le_numpy1.23python3.11.____cpython.yaml index bb4e5c7c..31751566 100644 --- a/.ci_support/linux_ppc64le_numpy1.23python3.11.____cpython.yaml +++ b/.ci_support/linux_ppc64le_numpy1.23python3.11.____cpython.yaml @@ -35,4 +35,4 @@ zip_keys: - numpy - python_impl zlib: -- '1.2' +- '1' diff --git a/.ci_support/linux_ppc64le_numpy1.26python3.12.____cpython.yaml b/.ci_support/linux_ppc64le_numpy1.26python3.12.____cpython.yaml new file mode 100644 index 00000000..7a563726 --- /dev/null +++ b/.ci_support/linux_ppc64le_numpy1.26python3.12.____cpython.yaml @@ -0,0 +1,38 @@ +c_compiler: +- gcc +c_compiler_version: +- '12' +cdt_name: +- cos7 +channel_sources: +- conda-forge +channel_targets: +- conda-forge matplotlib_rc +cxx_compiler: +- gxx +cxx_compiler_version: +- '12' +docker_image: +- quay.io/condaforge/linux-anvil-cos7-x86_64 +freetype: +- '2' +numpy: +- '1.26' +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +python: +- 3.12.* *_cpython +python_impl: +- cpython +target_platform: +- linux-ppc64le +zip_keys: +- - c_compiler_version + - cxx_compiler_version +- - python + - numpy + - python_impl +zlib: +- '1' diff --git a/.ci_support/migrations/python311.yaml b/.ci_support/migrations/python311.yaml deleted file mode 100644 index d23a0fd2..00000000 --- a/.ci_support/migrations/python311.yaml +++ /dev/null @@ -1,37 +0,0 @@ -migrator_ts: 1666686085 -__migrator: - migration_number: 1 - operation: key_add - primary_key: python - ordering: - python: - - 3.6.* *_cpython - - 3.7.* *_cpython - - 3.8.* *_cpython - - 3.9.* *_cpython - - 3.10.* *_cpython - - 3.11.* *_cpython # new entry - - 3.6.* *_73_pypy - - 3.7.* *_73_pypy - - 3.8.* *_73_pypy - - 3.9.* *_73_pypy - paused: false - longterm: True - pr_limit: 10 - max_solver_attempts: 10 # this will make the bot retry "not solvable" stuff 10 times - exclude: - # this shouldn't attempt to modify the python feedstocks - - python - - pypy3.6 - - pypy-meta - - cross-python - - python_abi - exclude_pinned_pkgs: false - -python: - - 3.11.* *_cpython -# additional entries to add for zip_keys -numpy: - - 1.23 -python_impl: - - cpython diff --git a/.ci_support/osx_64_numpy1.21python3.8.____73_pypy.yaml b/.ci_support/osx_64_numpy1.21python3.8.____73_pypy.yaml deleted file mode 100644 index fb93d678..00000000 --- a/.ci_support/osx_64_numpy1.21python3.8.____73_pypy.yaml +++ /dev/null @@ -1,40 +0,0 @@ -MACOSX_DEPLOYMENT_TARGET: -- '10.12' -MACOSX_SDK_VERSION: -- '10.12' -c_compiler: -- clang -c_compiler_version: -- '15' -channel_sources: -- conda-forge -channel_targets: -- conda-forge matplotlib_rc -cxx_compiler: -- clangxx -cxx_compiler_version: -- '15' -freetype: -- '2' -macos_machine: -- x86_64-apple-darwin13.4.0 -numpy: -- '1.21' -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -python: -- 3.8.* *_73_pypy -python_impl: -- pypy -target_platform: -- osx-64 -zip_keys: -- - c_compiler_version - - cxx_compiler_version -- - python - - numpy - - python_impl -zlib: -- '1.2' diff --git a/.ci_support/osx_64_numpy1.21python3.10.____cpython.yaml b/.ci_support/osx_64_numpy1.22python3.10.____cpython.yaml similarity index 90% rename from .ci_support/osx_64_numpy1.21python3.10.____cpython.yaml rename to .ci_support/osx_64_numpy1.22python3.10.____cpython.yaml index 4ea79216..8118166e 100644 --- a/.ci_support/osx_64_numpy1.21python3.10.____cpython.yaml +++ b/.ci_support/osx_64_numpy1.22python3.10.____cpython.yaml @@ -1,11 +1,11 @@ MACOSX_DEPLOYMENT_TARGET: -- '10.12' +- '10.13' MACOSX_SDK_VERSION: -- '10.12' +- '10.13' c_compiler: - clang c_compiler_version: -- '15' +- '16' channel_sources: - conda-forge channel_targets: @@ -13,13 +13,13 @@ channel_targets: cxx_compiler: - clangxx cxx_compiler_version: -- '15' +- '16' freetype: - '2' macos_machine: - x86_64-apple-darwin13.4.0 numpy: -- '1.21' +- '1.22' pin_run_as_build: python: min_pin: x.x @@ -37,4 +37,4 @@ zip_keys: - numpy - python_impl zlib: -- '1.2' +- '1' diff --git a/.ci_support/osx_64_numpy1.21python3.8.____cpython.yaml b/.ci_support/osx_64_numpy1.22python3.8.____cpython.yaml similarity index 90% rename from .ci_support/osx_64_numpy1.21python3.8.____cpython.yaml rename to .ci_support/osx_64_numpy1.22python3.8.____cpython.yaml index c24278ca..02742abe 100644 --- a/.ci_support/osx_64_numpy1.21python3.8.____cpython.yaml +++ b/.ci_support/osx_64_numpy1.22python3.8.____cpython.yaml @@ -1,11 +1,11 @@ MACOSX_DEPLOYMENT_TARGET: -- '10.12' +- '10.13' MACOSX_SDK_VERSION: -- '10.12' +- '10.13' c_compiler: - clang c_compiler_version: -- '15' +- '16' channel_sources: - conda-forge channel_targets: @@ -13,13 +13,13 @@ channel_targets: cxx_compiler: - clangxx cxx_compiler_version: -- '15' +- '16' freetype: - '2' macos_machine: - x86_64-apple-darwin13.4.0 numpy: -- '1.21' +- '1.22' pin_run_as_build: python: min_pin: x.x @@ -37,4 +37,4 @@ zip_keys: - numpy - python_impl zlib: -- '1.2' +- '1' diff --git a/.ci_support/osx_64_numpy1.21python3.9.____73_pypy.yaml b/.ci_support/osx_64_numpy1.22python3.9.____73_pypy.yaml similarity index 90% rename from .ci_support/osx_64_numpy1.21python3.9.____73_pypy.yaml rename to .ci_support/osx_64_numpy1.22python3.9.____73_pypy.yaml index caa451f1..7f579c67 100644 --- a/.ci_support/osx_64_numpy1.21python3.9.____73_pypy.yaml +++ b/.ci_support/osx_64_numpy1.22python3.9.____73_pypy.yaml @@ -1,11 +1,11 @@ MACOSX_DEPLOYMENT_TARGET: -- '10.12' +- '10.13' MACOSX_SDK_VERSION: -- '10.12' +- '10.13' c_compiler: - clang c_compiler_version: -- '15' +- '16' channel_sources: - conda-forge channel_targets: @@ -13,13 +13,13 @@ channel_targets: cxx_compiler: - clangxx cxx_compiler_version: -- '15' +- '16' freetype: - '2' macos_machine: - x86_64-apple-darwin13.4.0 numpy: -- '1.21' +- '1.22' pin_run_as_build: python: min_pin: x.x @@ -37,4 +37,4 @@ zip_keys: - numpy - python_impl zlib: -- '1.2' +- '1' diff --git a/.ci_support/osx_64_numpy1.21python3.9.____cpython.yaml b/.ci_support/osx_64_numpy1.22python3.9.____cpython.yaml similarity index 90% rename from .ci_support/osx_64_numpy1.21python3.9.____cpython.yaml rename to .ci_support/osx_64_numpy1.22python3.9.____cpython.yaml index 343432f7..3e6a5c3b 100644 --- a/.ci_support/osx_64_numpy1.21python3.9.____cpython.yaml +++ b/.ci_support/osx_64_numpy1.22python3.9.____cpython.yaml @@ -1,11 +1,11 @@ MACOSX_DEPLOYMENT_TARGET: -- '10.12' +- '10.13' MACOSX_SDK_VERSION: -- '10.12' +- '10.13' c_compiler: - clang c_compiler_version: -- '15' +- '16' channel_sources: - conda-forge channel_targets: @@ -13,13 +13,13 @@ channel_targets: cxx_compiler: - clangxx cxx_compiler_version: -- '15' +- '16' freetype: - '2' macos_machine: - x86_64-apple-darwin13.4.0 numpy: -- '1.21' +- '1.22' pin_run_as_build: python: min_pin: x.x @@ -37,4 +37,4 @@ zip_keys: - numpy - python_impl zlib: -- '1.2' +- '1' diff --git a/.ci_support/osx_64_numpy1.23python3.11.____cpython.yaml b/.ci_support/osx_64_numpy1.23python3.11.____cpython.yaml index 1e07c6dc..00d79245 100644 --- a/.ci_support/osx_64_numpy1.23python3.11.____cpython.yaml +++ b/.ci_support/osx_64_numpy1.23python3.11.____cpython.yaml @@ -1,11 +1,11 @@ MACOSX_DEPLOYMENT_TARGET: -- '10.12' +- '10.13' MACOSX_SDK_VERSION: -- '10.12' +- '10.13' c_compiler: - clang c_compiler_version: -- '15' +- '16' channel_sources: - conda-forge channel_targets: @@ -13,7 +13,7 @@ channel_targets: cxx_compiler: - clangxx cxx_compiler_version: -- '15' +- '16' freetype: - '2' macos_machine: @@ -37,4 +37,4 @@ zip_keys: - numpy - python_impl zlib: -- '1.2' +- '1' diff --git a/.ci_support/osx_64_numpy1.26python3.12.____cpython.yaml b/.ci_support/osx_64_numpy1.26python3.12.____cpython.yaml new file mode 100644 index 00000000..91e80545 --- /dev/null +++ b/.ci_support/osx_64_numpy1.26python3.12.____cpython.yaml @@ -0,0 +1,40 @@ +MACOSX_DEPLOYMENT_TARGET: +- '10.13' +MACOSX_SDK_VERSION: +- '10.13' +c_compiler: +- clang +c_compiler_version: +- '16' +channel_sources: +- conda-forge +channel_targets: +- conda-forge matplotlib_rc +cxx_compiler: +- clangxx +cxx_compiler_version: +- '16' +freetype: +- '2' +macos_machine: +- x86_64-apple-darwin13.4.0 +numpy: +- '1.26' +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +python: +- 3.12.* *_cpython +python_impl: +- cpython +target_platform: +- osx-64 +zip_keys: +- - c_compiler_version + - cxx_compiler_version +- - python + - numpy + - python_impl +zlib: +- '1' diff --git a/.ci_support/osx_arm64_numpy1.21python3.10.____cpython.yaml b/.ci_support/osx_arm64_numpy1.22python3.10.____cpython.yaml similarity index 89% rename from .ci_support/osx_arm64_numpy1.21python3.10.____cpython.yaml rename to .ci_support/osx_arm64_numpy1.22python3.10.____cpython.yaml index 0ea2a16e..b74ac1b7 100644 --- a/.ci_support/osx_arm64_numpy1.21python3.10.____cpython.yaml +++ b/.ci_support/osx_arm64_numpy1.22python3.10.____cpython.yaml @@ -1,9 +1,11 @@ MACOSX_DEPLOYMENT_TARGET: - '11.0' +MACOSX_SDK_VERSION: +- '11.0' c_compiler: - clang c_compiler_version: -- '15' +- '16' channel_sources: - conda-forge channel_targets: @@ -11,13 +13,13 @@ channel_targets: cxx_compiler: - clangxx cxx_compiler_version: -- '15' +- '16' freetype: - '2' macos_machine: - arm64-apple-darwin20.0.0 numpy: -- '1.21' +- '1.22' pin_run_as_build: python: min_pin: x.x @@ -35,4 +37,4 @@ zip_keys: - numpy - python_impl zlib: -- '1.2' +- '1' diff --git a/.ci_support/osx_arm64_numpy1.21python3.8.____cpython.yaml b/.ci_support/osx_arm64_numpy1.22python3.8.____cpython.yaml similarity index 89% rename from .ci_support/osx_arm64_numpy1.21python3.8.____cpython.yaml rename to .ci_support/osx_arm64_numpy1.22python3.8.____cpython.yaml index 90d92057..a4786603 100644 --- a/.ci_support/osx_arm64_numpy1.21python3.8.____cpython.yaml +++ b/.ci_support/osx_arm64_numpy1.22python3.8.____cpython.yaml @@ -1,9 +1,11 @@ MACOSX_DEPLOYMENT_TARGET: - '11.0' +MACOSX_SDK_VERSION: +- '11.0' c_compiler: - clang c_compiler_version: -- '15' +- '16' channel_sources: - conda-forge channel_targets: @@ -11,13 +13,13 @@ channel_targets: cxx_compiler: - clangxx cxx_compiler_version: -- '15' +- '16' freetype: - '2' macos_machine: - arm64-apple-darwin20.0.0 numpy: -- '1.21' +- '1.22' pin_run_as_build: python: min_pin: x.x @@ -35,4 +37,4 @@ zip_keys: - numpy - python_impl zlib: -- '1.2' +- '1' diff --git a/.ci_support/osx_arm64_numpy1.21python3.9.____cpython.yaml b/.ci_support/osx_arm64_numpy1.22python3.9.____cpython.yaml similarity index 89% rename from .ci_support/osx_arm64_numpy1.21python3.9.____cpython.yaml rename to .ci_support/osx_arm64_numpy1.22python3.9.____cpython.yaml index f65aaa70..afc04ccf 100644 --- a/.ci_support/osx_arm64_numpy1.21python3.9.____cpython.yaml +++ b/.ci_support/osx_arm64_numpy1.22python3.9.____cpython.yaml @@ -1,9 +1,11 @@ MACOSX_DEPLOYMENT_TARGET: - '11.0' +MACOSX_SDK_VERSION: +- '11.0' c_compiler: - clang c_compiler_version: -- '15' +- '16' channel_sources: - conda-forge channel_targets: @@ -11,13 +13,13 @@ channel_targets: cxx_compiler: - clangxx cxx_compiler_version: -- '15' +- '16' freetype: - '2' macos_machine: - arm64-apple-darwin20.0.0 numpy: -- '1.21' +- '1.22' pin_run_as_build: python: min_pin: x.x @@ -35,4 +37,4 @@ zip_keys: - numpy - python_impl zlib: -- '1.2' +- '1' diff --git a/.ci_support/osx_arm64_numpy1.23python3.11.____cpython.yaml b/.ci_support/osx_arm64_numpy1.23python3.11.____cpython.yaml index c28d327f..36388ae7 100644 --- a/.ci_support/osx_arm64_numpy1.23python3.11.____cpython.yaml +++ b/.ci_support/osx_arm64_numpy1.23python3.11.____cpython.yaml @@ -1,9 +1,11 @@ MACOSX_DEPLOYMENT_TARGET: - '11.0' +MACOSX_SDK_VERSION: +- '11.0' c_compiler: - clang c_compiler_version: -- '15' +- '16' channel_sources: - conda-forge channel_targets: @@ -11,7 +13,7 @@ channel_targets: cxx_compiler: - clangxx cxx_compiler_version: -- '15' +- '16' freetype: - '2' macos_machine: @@ -35,4 +37,4 @@ zip_keys: - numpy - python_impl zlib: -- '1.2' +- '1' diff --git a/.ci_support/osx_arm64_numpy1.26python3.12.____cpython.yaml b/.ci_support/osx_arm64_numpy1.26python3.12.____cpython.yaml new file mode 100644 index 00000000..5f045123 --- /dev/null +++ b/.ci_support/osx_arm64_numpy1.26python3.12.____cpython.yaml @@ -0,0 +1,40 @@ +MACOSX_DEPLOYMENT_TARGET: +- '11.0' +MACOSX_SDK_VERSION: +- '11.0' +c_compiler: +- clang +c_compiler_version: +- '16' +channel_sources: +- conda-forge +channel_targets: +- conda-forge matplotlib_rc +cxx_compiler: +- clangxx +cxx_compiler_version: +- '16' +freetype: +- '2' +macos_machine: +- arm64-apple-darwin20.0.0 +numpy: +- '1.26' +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +python: +- 3.12.* *_cpython +python_impl: +- cpython +target_platform: +- osx-arm64 +zip_keys: +- - c_compiler_version + - cxx_compiler_version +- - python + - numpy + - python_impl +zlib: +- '1' diff --git a/.ci_support/win_64_numpy1.21python3.10.____cpython.yaml b/.ci_support/win_64_numpy1.22python3.10.____cpython.yaml similarity index 95% rename from .ci_support/win_64_numpy1.21python3.10.____cpython.yaml rename to .ci_support/win_64_numpy1.22python3.10.____cpython.yaml index d0c2292c..203091da 100644 --- a/.ci_support/win_64_numpy1.21python3.10.____cpython.yaml +++ b/.ci_support/win_64_numpy1.22python3.10.____cpython.yaml @@ -9,7 +9,7 @@ cxx_compiler: freetype: - '2' numpy: -- '1.21' +- '1.22' pin_run_as_build: python: min_pin: x.x @@ -25,4 +25,4 @@ zip_keys: - numpy - python_impl zlib: -- '1.2' +- '1' diff --git a/.ci_support/win_64_numpy1.21python3.8.____cpython.yaml b/.ci_support/win_64_numpy1.22python3.8.____cpython.yaml similarity index 95% rename from .ci_support/win_64_numpy1.21python3.8.____cpython.yaml rename to .ci_support/win_64_numpy1.22python3.8.____cpython.yaml index 45b7e8f4..956ca2d7 100644 --- a/.ci_support/win_64_numpy1.21python3.8.____cpython.yaml +++ b/.ci_support/win_64_numpy1.22python3.8.____cpython.yaml @@ -9,7 +9,7 @@ cxx_compiler: freetype: - '2' numpy: -- '1.21' +- '1.22' pin_run_as_build: python: min_pin: x.x @@ -25,4 +25,4 @@ zip_keys: - numpy - python_impl zlib: -- '1.2' +- '1' diff --git a/.ci_support/win_64_numpy1.21python3.9.____73_pypy.yaml b/.ci_support/win_64_numpy1.22python3.9.____73_pypy.yaml similarity index 95% rename from .ci_support/win_64_numpy1.21python3.9.____73_pypy.yaml rename to .ci_support/win_64_numpy1.22python3.9.____73_pypy.yaml index 14d84d27..40c86ac4 100644 --- a/.ci_support/win_64_numpy1.21python3.9.____73_pypy.yaml +++ b/.ci_support/win_64_numpy1.22python3.9.____73_pypy.yaml @@ -9,7 +9,7 @@ cxx_compiler: freetype: - '2' numpy: -- '1.21' +- '1.22' pin_run_as_build: python: min_pin: x.x @@ -25,4 +25,4 @@ zip_keys: - numpy - python_impl zlib: -- '1.2' +- '1' diff --git a/.ci_support/win_64_numpy1.21python3.9.____cpython.yaml b/.ci_support/win_64_numpy1.22python3.9.____cpython.yaml similarity index 95% rename from .ci_support/win_64_numpy1.21python3.9.____cpython.yaml rename to .ci_support/win_64_numpy1.22python3.9.____cpython.yaml index 72e65a6a..78b2c77e 100644 --- a/.ci_support/win_64_numpy1.21python3.9.____cpython.yaml +++ b/.ci_support/win_64_numpy1.22python3.9.____cpython.yaml @@ -9,7 +9,7 @@ cxx_compiler: freetype: - '2' numpy: -- '1.21' +- '1.22' pin_run_as_build: python: min_pin: x.x @@ -25,4 +25,4 @@ zip_keys: - numpy - python_impl zlib: -- '1.2' +- '1' diff --git a/.ci_support/win_64_numpy1.23python3.11.____cpython.yaml b/.ci_support/win_64_numpy1.23python3.11.____cpython.yaml index 22caa20a..76fe5467 100644 --- a/.ci_support/win_64_numpy1.23python3.11.____cpython.yaml +++ b/.ci_support/win_64_numpy1.23python3.11.____cpython.yaml @@ -25,4 +25,4 @@ zip_keys: - numpy - python_impl zlib: -- '1.2' +- '1' diff --git a/.ci_support/win_64_numpy1.21python3.8.____73_pypy.yaml b/.ci_support/win_64_numpy1.26python3.12.____cpython.yaml similarity index 87% rename from .ci_support/win_64_numpy1.21python3.8.____73_pypy.yaml rename to .ci_support/win_64_numpy1.26python3.12.____cpython.yaml index fedd13d1..d42aba05 100644 --- a/.ci_support/win_64_numpy1.21python3.8.____73_pypy.yaml +++ b/.ci_support/win_64_numpy1.26python3.12.____cpython.yaml @@ -9,15 +9,15 @@ cxx_compiler: freetype: - '2' numpy: -- '1.21' +- '1.26' pin_run_as_build: python: min_pin: x.x max_pin: x.x python: -- 3.8.* *_73_pypy +- 3.12.* *_cpython python_impl: -- pypy +- cpython target_platform: - win-64 zip_keys: @@ -25,4 +25,4 @@ zip_keys: - numpy - python_impl zlib: -- '1.2' +- '1' diff --git a/.gitattributes b/.gitattributes index 7f327638..18f114a1 100644 --- a/.gitattributes +++ b/.gitattributes @@ -20,8 +20,8 @@ bld.bat text eol=crlf .travis.yml linguist-generated=true .scripts/* linguist-generated=true .woodpecker.yml linguist-generated=true -LICENSE.txt linguist-generated=true -README.md linguist-generated=true +/LICENSE.txt linguist-generated=true +/README.md linguist-generated=true azure-pipelines.yml linguist-generated=true build-locally.py linguist-generated=true shippable.yml linguist-generated=true diff --git a/.gitignore b/.gitignore index c89ecb7d..179afe55 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,24 @@ -*.pyc +# User content belongs under recipe/. +# Feedstock configuration goes in `conda-forge.yml` +# Everything else is managed by the conda-smithy rerender process. +# Please do not modify + +# Ignore all files and folders in root +* +!/conda-forge.yml + +# Don't ignore any files/folders if the parent folder is 'un-ignored' +# This also avoids warnings when adding an already-checked file with an ignored parent. +!/**/ +# Don't ignore any files/folders recursively in the following folders +!/recipe/** +!/.ci_support/** -build_artifacts +# Since we ignore files/folders recursively, any folders inside +# build_artifacts gets ignored which trips some build systems. +# To avoid that we 'un-ignore' all files/folders recursively +# and only ignore the root build_artifacts folder. +!/build_artifacts/** +/build_artifacts + +*.pyc diff --git a/.scripts/build_steps.sh b/.scripts/build_steps.sh index 1682b66b..a147fa70 100755 --- a/.scripts/build_steps.sh +++ b/.scripts/build_steps.sh @@ -28,14 +28,15 @@ conda-build: pkgs_dirs: - ${FEEDSTOCK_ROOT}/build_artifacts/pkg_cache - /opt/conda/pkgs +solver: libmamba CONDARC +export CONDA_LIBMAMBA_SOLVER_NO_CHANNELS_FROM_INSTALLED=1 - -mamba install --update-specs --yes --quiet --channel conda-forge \ - conda-build pip boa conda-forge-ci-setup=3 -mamba update --update-specs --yes --quiet --channel conda-forge \ - conda-build pip boa conda-forge-ci-setup=3 +mamba install --update-specs --yes --quiet --channel conda-forge --strict-channel-priority \ + pip mamba conda-build conda-forge-ci-setup=4 "conda-build>=24.1" +mamba update --update-specs --yes --quiet --channel conda-forge --strict-channel-priority \ + pip mamba conda-build conda-forge-ci-setup=4 "conda-build>=24.1" # set up the condarc setup_conda_rc "${FEEDSTOCK_ROOT}" "${RECIPE_ROOT}" "${CONFIG_FILE}" @@ -75,9 +76,17 @@ if [[ "${BUILD_WITH_CONDA_DEBUG:-0}" == 1 ]]; then # Drop into an interactive shell /bin/bash else - conda mambabuild "${RECIPE_ROOT}" -m "${CI_SUPPORT}/${CONFIG}.yaml" \ + conda-build "${RECIPE_ROOT}" -m "${CI_SUPPORT}/${CONFIG}.yaml" \ --suppress-variables ${EXTRA_CB_OPTIONS:-} \ - --clobber-file "${CI_SUPPORT}/clobber_${CONFIG}.yaml" + --clobber-file "${CI_SUPPORT}/clobber_${CONFIG}.yaml" \ + --extra-meta flow_run_id="${flow_run_id:-}" remote_url="${remote_url:-}" sha="${sha:-}" + + ( startgroup "Inspecting artifacts" ) 2> /dev/null + + # inspect_artifacts was only added in conda-forge-ci-setup 4.6.0 + command -v inspect_artifacts >/dev/null 2>&1 && inspect_artifacts || echo "inspect_artifacts needs conda-forge-ci-setup >=4.6.0" + + ( endgroup "Inspecting artifacts" ) 2> /dev/null ( startgroup "Validating outputs" ) 2> /dev/null validate_recipe_outputs "${FEEDSTOCK_NAME}" diff --git a/.scripts/logging_utils.sh b/.scripts/logging_utils.sh index 57bc95c2..aff009f0 100644 --- a/.scripts/logging_utils.sh +++ b/.scripts/logging_utils.sh @@ -12,7 +12,7 @@ function startgroup { echo "##[group]$1";; travis ) echo "$1" - echo -en 'travis_fold:start:'"${1// /}"'\\r';; + echo -en 'travis_fold:start:'"${1// /}"'\r';; github_actions ) echo "::group::$1";; * ) @@ -28,7 +28,7 @@ function endgroup { azure ) echo "##[endgroup]";; travis ) - echo -en 'travis_fold:end:'"${1// /}"'\\r';; + echo -en 'travis_fold:end:'"${1// /}"'\r';; github_actions ) echo "::endgroup::";; esac diff --git a/.scripts/run_docker_build.sh b/.scripts/run_docker_build.sh index 92362398..00f377a8 100755 --- a/.scripts/run_docker_build.sh +++ b/.scripts/run_docker_build.sh @@ -21,6 +21,12 @@ if [ -z ${FEEDSTOCK_NAME} ]; then export FEEDSTOCK_NAME=$(basename ${FEEDSTOCK_ROOT}) fi +if [[ "${sha:-}" == "" ]]; then + pushd "${FEEDSTOCK_ROOT}" + sha=$(git rev-parse HEAD) + popd +fi + docker info # In order for the conda-build process in the container to write to the mounted @@ -91,6 +97,9 @@ docker run ${DOCKER_RUN_ARGS} \ -e CPU_COUNT \ -e BUILD_WITH_CONDA_DEBUG \ -e BUILD_OUTPUT_ID \ + -e flow_run_id \ + -e remote_url \ + -e sha \ -e BINSTAR_TOKEN \ -e FEEDSTOCK_TOKEN \ -e STAGING_BINSTAR_TOKEN \ diff --git a/.scripts/run_osx_build.sh b/.scripts/run_osx_build.sh index 3969edf3..ba0c8791 100755 --- a/.scripts/run_osx_build.sh +++ b/.scripts/run_osx_build.sh @@ -22,11 +22,13 @@ bash $MINIFORGE_FILE -b -p ${MINIFORGE_HOME} source ${MINIFORGE_HOME}/etc/profile.d/conda.sh conda activate base +export CONDA_SOLVER="libmamba" +export CONDA_LIBMAMBA_SOLVER_NO_CHANNELS_FROM_INSTALLED=1 -mamba install --update-specs --quiet --yes --channel conda-forge \ - conda-build pip boa conda-forge-ci-setup=3 -mamba update --update-specs --yes --quiet --channel conda-forge \ - conda-build pip boa conda-forge-ci-setup=3 +mamba install --update-specs --quiet --yes --channel conda-forge --strict-channel-priority \ + pip mamba conda-build conda-forge-ci-setup=4 "conda-build>=24.1" +mamba update --update-specs --yes --quiet --channel conda-forge --strict-channel-priority \ + pip mamba conda-build conda-forge-ci-setup=4 "conda-build>=24.1" @@ -45,6 +47,10 @@ else echo -e "\n\nNot mangling homebrew as we are not running in CI" fi +if [[ "${sha:-}" == "" ]]; then + sha=$(git rev-parse HEAD) +fi + echo -e "\n\nRunning the build setup script." source run_conda_forge_build_setup @@ -75,9 +81,17 @@ else EXTRA_CB_OPTIONS="${EXTRA_CB_OPTIONS:-} --no-test" fi - conda mambabuild ./recipe -m ./.ci_support/${CONFIG}.yaml \ + conda-build ./recipe -m ./.ci_support/${CONFIG}.yaml \ --suppress-variables ${EXTRA_CB_OPTIONS:-} \ - --clobber-file ./.ci_support/clobber_${CONFIG}.yaml + --clobber-file ./.ci_support/clobber_${CONFIG}.yaml \ + --extra-meta flow_run_id="$flow_run_id" remote_url="$remote_url" sha="$sha" + + ( startgroup "Inspecting artifacts" ) 2> /dev/null + + # inspect_artifacts was only added in conda-forge-ci-setup 4.6.0 + command -v inspect_artifacts >/dev/null 2>&1 && inspect_artifacts || echo "inspect_artifacts needs conda-forge-ci-setup >=4.6.0" + + ( endgroup "Inspecting artifacts" ) 2> /dev/null ( startgroup "Validating outputs" ) 2> /dev/null validate_recipe_outputs "${FEEDSTOCK_NAME}" diff --git a/.scripts/run_win_build.bat b/.scripts/run_win_build.bat new file mode 100755 index 00000000..65650bf2 --- /dev/null +++ b/.scripts/run_win_build.bat @@ -0,0 +1,130 @@ +:: PLEASE NOTE: This script has been automatically generated by conda-smithy. Any changes here +:: will be lost next time ``conda smithy rerender`` is run. If you would like to make permanent +:: changes to this script, consider a proposal to conda-smithy so that other feedstocks can also +:: benefit from the improvement. + +:: Note: we assume a Miniforge installation is available + +:: INPUTS (required environment variables) +:: CONFIG: name of the .ci_support/*.yaml file for this job +:: CI: azure, github_actions, or unset +:: UPLOAD_PACKAGES: true or false +:: UPLOAD_ON_BRANCH: true or false + +setlocal enableextensions enabledelayedexpansion + +call :start_group "Configuring conda" + +:: Activate the base conda environment +call activate base +:: Configure the solver +set "CONDA_SOLVER=libmamba" +if !errorlevel! neq 0 exit /b !errorlevel! +set "CONDA_LIBMAMBA_SOLVER_NO_CHANNELS_FROM_INSTALLED=1" + +:: Provision the necessary dependencies to build the recipe later +echo Installing dependencies +mamba.exe install "python=3.10" pip mamba conda-build conda-forge-ci-setup=4 "conda-build>=24.1" -c conda-forge --strict-channel-priority --yes +if !errorlevel! neq 0 exit /b !errorlevel! + +:: Set basic configuration +echo Setting up configuration +setup_conda_rc .\ ".\recipe" .\.ci_support\%CONFIG%.yaml +if !errorlevel! neq 0 exit /b !errorlevel! +echo Running build setup +CALL run_conda_forge_build_setup + + +if !errorlevel! neq 0 exit /b !errorlevel! + +if EXIST LICENSE.txt ( + echo Copying feedstock license + copy LICENSE.txt "recipe\\recipe-scripts-license.txt" +) +if NOT [%HOST_PLATFORM%] == [%BUILD_PLATFORM%] ( + if [%CROSSCOMPILING_EMULATOR%] == [] ( + set "EXTRA_CB_OPTIONS=%EXTRA_CB_OPTIONS% --no-test" + ) +) + +if NOT [%flow_run_id%] == [] ( + set "EXTRA_CB_OPTIONS=%EXTRA_CB_OPTIONS% --extra-meta flow_run_id=%flow_run_id% remote_url=%remote_url% sha=%sha%" +) + +call :end_group + +:: Build the recipe +echo Building recipe +conda-build.exe "recipe" -m .ci_support\%CONFIG%.yaml --suppress-variables %EXTRA_CB_OPTIONS% +if !errorlevel! neq 0 exit /b !errorlevel! + +call :start_group "Inspecting artifacts" +:: inspect_artifacts was only added in conda-forge-ci-setup 4.6.0 +WHERE inspect_artifacts >nul 2>nul && inspect_artifacts || echo "inspect_artifacts needs conda-forge-ci-setup >=4.6.0" +call :end_group + +:: Prepare some environment variables for the upload step +if /i "%CI%" == "github_actions" ( + set "FEEDSTOCK_NAME=%GITHUB_REPOSITORY:*/=%" + set "GIT_BRANCH=%GITHUB_REF:refs/heads/=%" + if /i "%GITHUB_EVENT_NAME%" == "pull_request" ( + set "IS_PR_BUILD=True" + ) else ( + set "IS_PR_BUILD=False" + ) + set "TEMP=%RUNNER_TEMP%" +) +if /i "%CI%" == "azure" ( + set "FEEDSTOCK_NAME=%BUILD_REPOSITORY_NAME:*/=%" + set "GIT_BRANCH=%BUILD_SOURCEBRANCHNAME%" + if /i "%BUILD_REASON%" == "PullRequest" ( + set "IS_PR_BUILD=True" + ) else ( + set "IS_PR_BUILD=False" + ) + set "TEMP=%UPLOAD_TEMP%" +) + +:: Validate +call :start_group "Validating outputs" +validate_recipe_outputs "%FEEDSTOCK_NAME%" +if !errorlevel! neq 0 exit /b !errorlevel! +call :end_group + +if /i "%UPLOAD_PACKAGES%" == "true" ( + if /i "%IS_PR_BUILD%" == "false" ( + call :start_group "Uploading packages" + if not exist "%TEMP%\" md "%TEMP%" + set "TMP=%TEMP%" + upload_package --validate --feedstock-name="%FEEDSTOCK_NAME%" .\ ".\recipe" .ci_support\%CONFIG%.yaml + if !errorlevel! neq 0 exit /b !errorlevel! + call :end_group + ) +) + +exit + +:: Logging subroutines + +:start_group +if /i "%CI%" == "github_actions" ( + echo ::group::%~1 + exit /b +) +if /i "%CI%" == "azure" ( + echo ##[group]%~1 + exit /b +) +echo %~1 +exit /b + +:end_group +if /i "%CI%" == "github_actions" ( + echo ::endgroup:: + exit /b +) +if /i "%CI%" == "azure" ( + echo ##[endgroup] + exit /b +) +exit /b \ No newline at end of file diff --git a/README.md b/README.md index 5517ad38..0c479bf7 100644 --- a/README.md +++ b/README.md @@ -38,38 +38,31 @@ Current build status - + - + - + - + - - - @@ -80,38 +73,38 @@ Current build status - + - + - + - + - + @@ -122,38 +115,38 @@ Current build status - + - + - + - + - + @@ -164,38 +157,38 @@ Current build status - + - + - + - + - + @@ -206,24 +199,31 @@ Current build status - + - + - + + + + @@ -234,38 +234,38 @@ Current build status - + - + - + - + - + @@ -275,6 +275,13 @@ Current build status variant + + +
VariantStatus
linux_64_numpy1.21python3.10.____cpythonlinux_64_numpy1.22python3.10.____cpython - variant + variant
linux_64_numpy1.21python3.8.____73_pypylinux_64_numpy1.22python3.8.____cpython - variant + variant
linux_64_numpy1.21python3.8.____cpythonlinux_64_numpy1.22python3.9.____73_pypy - variant + variant
linux_64_numpy1.21python3.9.____73_pypylinux_64_numpy1.22python3.9.____cpython - variant - -
linux_64_numpy1.21python3.9.____cpython - - variant + variant
linux_aarch64_numpy1.21python3.10.____cpythonlinux_64_numpy1.26python3.12.____cpython - variant + variant
linux_aarch64_numpy1.21python3.8.____73_pypylinux_aarch64_numpy1.22python3.10.____cpython - variant + variant
linux_aarch64_numpy1.21python3.8.____cpythonlinux_aarch64_numpy1.22python3.8.____cpython - variant + variant
linux_aarch64_numpy1.21python3.9.____73_pypylinux_aarch64_numpy1.22python3.9.____73_pypy - variant + variant
linux_aarch64_numpy1.21python3.9.____cpythonlinux_aarch64_numpy1.22python3.9.____cpython - variant + variant
linux_ppc64le_numpy1.21python3.10.____cpythonlinux_aarch64_numpy1.26python3.12.____cpython - variant + variant
linux_ppc64le_numpy1.21python3.8.____73_pypylinux_ppc64le_numpy1.22python3.10.____cpython - variant + variant
linux_ppc64le_numpy1.21python3.8.____cpythonlinux_ppc64le_numpy1.22python3.8.____cpython - variant + variant
linux_ppc64le_numpy1.21python3.9.____73_pypylinux_ppc64le_numpy1.22python3.9.____73_pypy - variant + variant
linux_ppc64le_numpy1.21python3.9.____cpythonlinux_ppc64le_numpy1.22python3.9.____cpython - variant + variant
osx_64_numpy1.21python3.10.____cpythonlinux_ppc64le_numpy1.26python3.12.____cpython - variant + variant
osx_64_numpy1.21python3.8.____73_pypyosx_64_numpy1.22python3.10.____cpython - variant + variant
osx_64_numpy1.21python3.8.____cpythonosx_64_numpy1.22python3.8.____cpython - variant + variant
osx_64_numpy1.21python3.9.____73_pypyosx_64_numpy1.22python3.9.____73_pypy - variant + variant
osx_64_numpy1.21python3.9.____cpythonosx_64_numpy1.22python3.9.____cpython - variant + variant
osx_arm64_numpy1.21python3.10.____cpythonosx_64_numpy1.26python3.12.____cpython - variant + variant
osx_arm64_numpy1.21python3.8.____cpythonosx_arm64_numpy1.22python3.10.____cpython - variant + variant
osx_arm64_numpy1.21python3.9.____cpythonosx_arm64_numpy1.22python3.8.____cpython - variant + variant + +
osx_arm64_numpy1.22python3.9.____cpython + + variant
win_64_numpy1.21python3.10.____cpythonosx_arm64_numpy1.26python3.12.____cpython - variant + variant
win_64_numpy1.21python3.8.____73_pypywin_64_numpy1.22python3.10.____cpython - variant + variant
win_64_numpy1.21python3.8.____cpythonwin_64_numpy1.22python3.8.____cpython - variant + variant
win_64_numpy1.21python3.9.____73_pypywin_64_numpy1.22python3.9.____73_pypy - variant + variant
win_64_numpy1.21python3.9.____cpythonwin_64_numpy1.22python3.9.____cpython - variant + variant
win_64_numpy1.26python3.12.____cpython + + variant + +
@@ -294,14 +301,14 @@ Current release info Installing matplotlib-suite =========================== -Installing `matplotlib-suite` from the `conda-forge` channel can be achieved by adding `conda-forge` to your channels with: +Installing `matplotlib-suite` from the `conda-forge/label/matplotlib_rc` channel can be achieved by adding `conda-forge/label/matplotlib_rc` to your channels with: ``` -conda config --add channels conda-forge +conda config --add channels conda-forge/label/matplotlib_rc conda config --set channel_priority strict ``` -Once the `conda-forge` channel has been enabled, `matplotlib, matplotlib-base` can be installed with `conda`: +Once the `conda-forge/label/matplotlib_rc` channel has been enabled, `matplotlib, matplotlib-base` can be installed with `conda`: ``` conda install matplotlib matplotlib-base @@ -316,26 +323,26 @@ mamba install matplotlib matplotlib-base It is possible to list all of the versions of `matplotlib` available on your platform with `conda`: ``` -conda search matplotlib --channel conda-forge +conda search matplotlib --channel conda-forge/label/matplotlib_rc ``` or with `mamba`: ``` -mamba search matplotlib --channel conda-forge +mamba search matplotlib --channel conda-forge/label/matplotlib_rc ``` Alternatively, `mamba repoquery` may provide more information: ``` # Search all versions available on your platform: -mamba repoquery search matplotlib --channel conda-forge +mamba repoquery search matplotlib --channel conda-forge/label/matplotlib_rc # List packages depending on `matplotlib`: -mamba repoquery whoneeds matplotlib --channel conda-forge +mamba repoquery whoneeds matplotlib --channel conda-forge/label/matplotlib_rc # List dependencies of `matplotlib`: -mamba repoquery depends matplotlib --channel conda-forge +mamba repoquery depends matplotlib --channel conda-forge/label/matplotlib_rc ``` @@ -357,7 +364,7 @@ available continuous integration services. Thanks to the awesome service provide [CircleCI](https://circleci.com/), [AppVeyor](https://www.appveyor.com/), [Drone](https://cloud.drone.io/welcome), and [TravisCI](https://travis-ci.com/) it is possible to build and upload installable packages to the -[conda-forge](https://anaconda.org/conda-forge) [Anaconda-Cloud](https://anaconda.org/) +[conda-forge](https://anaconda.org/conda-forge) [anaconda.org](https://anaconda.org/) channel for Linux, Windows and OSX respectively. To manage the continuous integration and simplify feedstock maintenance diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 6b346f50..e5306da9 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -4,5 +4,5 @@ jobs: - template: ./.azure-pipelines/azure-pipelines-linux.yml - - template: ./.azure-pipelines/azure-pipelines-win.yml - - template: ./.azure-pipelines/azure-pipelines-osx.yml \ No newline at end of file + - template: ./.azure-pipelines/azure-pipelines-osx.yml + - template: ./.azure-pipelines/azure-pipelines-win.yml \ No newline at end of file diff --git a/build-locally.py b/build-locally.py index 3f4b7a79..e0d408d0 100755 --- a/build-locally.py +++ b/build-locally.py @@ -64,8 +64,9 @@ def verify_config(ns): elif ns.config.startswith("osx"): if "OSX_SDK_DIR" not in os.environ: raise RuntimeError( - "Need OSX_SDK_DIR env variable set. Run 'export OSX_SDK_DIR=SDKs' " - "to download the SDK automatically to 'SDKs/MacOSX.sdk'. " + "Need OSX_SDK_DIR env variable set. Run 'export OSX_SDK_DIR=$PWD/SDKs' " + "to download the SDK automatically to '$PWD/SDKs/MacOSX.sdk'. " + "Note: OSX_SDK_DIR must be set to an absolute path. " "Setting this variable implies agreement to the licensing terms of the SDK by Apple." ) From 19d64de7da466a22bbd64dc4d52f557e9bce2d34 Mon Sep 17 00:00:00 2001 From: jakirkham Date: Fri, 28 Jun 2024 23:40:54 -0700 Subject: [PATCH 92/95] Refresh Windows cleanup logic --- recipe/build_base.bat | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/recipe/build_base.bat b/recipe/build_base.bat index a1190d0d..095f7c50 100644 --- a/recipe/build_base.bat +++ b/recipe/build_base.bat @@ -4,16 +4,19 @@ set "MESON_ARGS=%MESON_ARGS% --buildtype=release --prefix=%LIBRARY_PREFIX% --pkg if "%CI%" == "azure" ( :: Hack to try removing problematic Python from Azure CI image - set "CLEANUP_DIRS=C:\hostedtoolcache\windows\Python;" + :: Replace with conda-smithy solution when available + :: xref: https://github.com/conda-forge/conda-smithy/pull/1966 + set CLEANUP_DIRS=^ + C:\hostedtoolcache\windows\Python;^ + ; + mkdir C:\empty for %%f in (%CLEANUP_DIRS:;= %) do ( - echo Removing %%f - robocopy /mir /ns /nc /nfl /ndl /np /njh /njs %%f > nul 2>&1 - rmdir /q %%f - if errorlevel 1 ( - echo Failed to remove - rmdir /q C:\empty - exit /b 1 + if not [%%f] == [] ( + echo Removing %%f + dir %%f + robocopy /purge /r:0 /w:0 /mt /ns /nc /np /nfl /ndl /njh /njs C:\empty %%f > nul 2>&1 + rmdir /q %%f ) ) rmdir /q C:\empty From 032ac089454c1d10ee6aa191276ce0b19071a2f8 Mon Sep 17 00:00:00 2001 From: jakirkham Date: Sat, 29 Jun 2024 01:17:39 -0700 Subject: [PATCH 93/95] Simplify Azure Python cleanup --- recipe/build_base.bat | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/recipe/build_base.bat b/recipe/build_base.bat index 095f7c50..6737f63f 100644 --- a/recipe/build_base.bat +++ b/recipe/build_base.bat @@ -6,19 +6,9 @@ if "%CI%" == "azure" ( :: Hack to try removing problematic Python from Azure CI image :: Replace with conda-smithy solution when available :: xref: https://github.com/conda-forge/conda-smithy/pull/1966 - set CLEANUP_DIRS=^ - C:\hostedtoolcache\windows\Python;^ - ; - mkdir C:\empty - for %%f in (%CLEANUP_DIRS:;= %) do ( - if not [%%f] == [] ( - echo Removing %%f - dir %%f - robocopy /purge /r:0 /w:0 /mt /ns /nc /np /nfl /ndl /njh /njs C:\empty %%f > nul 2>&1 - rmdir /q %%f - ) - ) + robocopy /purge /r:0 /w:0 /mt /ns /nc /np /nfl /ndl /njh /njs C:\empty C:\hostedtoolcache\windows\Python > nul 2>&1 + rmdir /q C:\hostedtoolcache\windows\Python rmdir /q C:\empty ) From 1f684b5a348b26ef3f9d0ef7cd4db5e9e0a34a32 Mon Sep 17 00:00:00 2001 From: "conda-forge-webservices[bot]" <91080706+conda-forge-webservices[bot]@users.noreply.github.com> Date: Mon, 1 Jul 2024 14:17:32 +0000 Subject: [PATCH 94/95] MNT: Re-rendered with conda-build 24.5.1, conda-smithy 3.36.2, and conda-forge-pinning 2024.07.01.14.08.36 --- .ci_support/linux_64_numpy1.22python3.8.____cpython.yaml | 2 +- .ci_support/linux_64_numpy1.22python3.9.____73_pypy.yaml | 2 +- .ci_support/linux_64_numpy2.0python3.10.____cpython.yaml | 2 +- .ci_support/linux_64_numpy2.0python3.11.____cpython.yaml | 2 +- .ci_support/linux_64_numpy2.0python3.12.____cpython.yaml | 2 +- .ci_support/linux_64_numpy2.0python3.9.____cpython.yaml | 2 +- .ci_support/linux_aarch64_numpy1.22python3.8.____cpython.yaml | 2 +- .ci_support/linux_aarch64_numpy1.22python3.9.____73_pypy.yaml | 2 +- .ci_support/linux_aarch64_numpy2.0python3.10.____cpython.yaml | 2 +- .ci_support/linux_aarch64_numpy2.0python3.11.____cpython.yaml | 2 +- .ci_support/linux_aarch64_numpy2.0python3.12.____cpython.yaml | 2 +- .ci_support/linux_aarch64_numpy2.0python3.9.____cpython.yaml | 2 +- .ci_support/linux_ppc64le_numpy1.22python3.8.____cpython.yaml | 2 +- .ci_support/linux_ppc64le_numpy1.22python3.9.____73_pypy.yaml | 2 +- .ci_support/linux_ppc64le_numpy2.0python3.10.____cpython.yaml | 2 +- .ci_support/linux_ppc64le_numpy2.0python3.11.____cpython.yaml | 2 +- .ci_support/linux_ppc64le_numpy2.0python3.12.____cpython.yaml | 2 +- .ci_support/linux_ppc64le_numpy2.0python3.9.____cpython.yaml | 2 +- .ci_support/osx_64_numpy1.22python3.8.____cpython.yaml | 2 +- .ci_support/osx_64_numpy1.22python3.9.____73_pypy.yaml | 2 +- .ci_support/osx_64_numpy2.0python3.10.____cpython.yaml | 2 +- .ci_support/osx_64_numpy2.0python3.11.____cpython.yaml | 2 +- .ci_support/osx_64_numpy2.0python3.12.____cpython.yaml | 2 +- .ci_support/osx_64_numpy2.0python3.9.____cpython.yaml | 2 +- .ci_support/osx_arm64_numpy1.22python3.8.____cpython.yaml | 2 +- .ci_support/osx_arm64_numpy2.0python3.10.____cpython.yaml | 2 +- .ci_support/osx_arm64_numpy2.0python3.11.____cpython.yaml | 2 +- .ci_support/osx_arm64_numpy2.0python3.12.____cpython.yaml | 2 +- .ci_support/osx_arm64_numpy2.0python3.9.____cpython.yaml | 2 +- .ci_support/win_64_numpy1.22python3.8.____cpython.yaml | 2 +- .ci_support/win_64_numpy1.22python3.9.____73_pypy.yaml | 2 +- .ci_support/win_64_numpy2.0python3.10.____cpython.yaml | 2 +- .ci_support/win_64_numpy2.0python3.11.____cpython.yaml | 2 +- .ci_support/win_64_numpy2.0python3.12.____cpython.yaml | 2 +- .ci_support/win_64_numpy2.0python3.9.____cpython.yaml | 2 +- 35 files changed, 35 insertions(+), 35 deletions(-) diff --git a/.ci_support/linux_64_numpy1.22python3.8.____cpython.yaml b/.ci_support/linux_64_numpy1.22python3.8.____cpython.yaml index 7cbeddca..b8daebf1 100644 --- a/.ci_support/linux_64_numpy1.22python3.8.____cpython.yaml +++ b/.ci_support/linux_64_numpy1.22python3.8.____cpython.yaml @@ -9,7 +9,7 @@ c_stdlib_version: cdt_name: - cos6 channel_sources: -- conda-forge/label/numpy_rc,conda-forge +- conda-forge channel_targets: - conda-forge main cxx_compiler: diff --git a/.ci_support/linux_64_numpy1.22python3.9.____73_pypy.yaml b/.ci_support/linux_64_numpy1.22python3.9.____73_pypy.yaml index d0b42850..f388627e 100644 --- a/.ci_support/linux_64_numpy1.22python3.9.____73_pypy.yaml +++ b/.ci_support/linux_64_numpy1.22python3.9.____73_pypy.yaml @@ -9,7 +9,7 @@ c_stdlib_version: cdt_name: - cos6 channel_sources: -- conda-forge/label/numpy_rc,conda-forge +- conda-forge channel_targets: - conda-forge main cxx_compiler: diff --git a/.ci_support/linux_64_numpy2.0python3.10.____cpython.yaml b/.ci_support/linux_64_numpy2.0python3.10.____cpython.yaml index 60753ae2..05641802 100644 --- a/.ci_support/linux_64_numpy2.0python3.10.____cpython.yaml +++ b/.ci_support/linux_64_numpy2.0python3.10.____cpython.yaml @@ -9,7 +9,7 @@ c_stdlib_version: cdt_name: - cos6 channel_sources: -- conda-forge/label/numpy_rc,conda-forge +- conda-forge channel_targets: - conda-forge main cxx_compiler: diff --git a/.ci_support/linux_64_numpy2.0python3.11.____cpython.yaml b/.ci_support/linux_64_numpy2.0python3.11.____cpython.yaml index 72a54782..7af28a28 100644 --- a/.ci_support/linux_64_numpy2.0python3.11.____cpython.yaml +++ b/.ci_support/linux_64_numpy2.0python3.11.____cpython.yaml @@ -9,7 +9,7 @@ c_stdlib_version: cdt_name: - cos6 channel_sources: -- conda-forge/label/numpy_rc,conda-forge +- conda-forge channel_targets: - conda-forge main cxx_compiler: diff --git a/.ci_support/linux_64_numpy2.0python3.12.____cpython.yaml b/.ci_support/linux_64_numpy2.0python3.12.____cpython.yaml index 9c3d8b57..1d4a371c 100644 --- a/.ci_support/linux_64_numpy2.0python3.12.____cpython.yaml +++ b/.ci_support/linux_64_numpy2.0python3.12.____cpython.yaml @@ -9,7 +9,7 @@ c_stdlib_version: cdt_name: - cos6 channel_sources: -- conda-forge/label/numpy_rc,conda-forge +- conda-forge channel_targets: - conda-forge main cxx_compiler: diff --git a/.ci_support/linux_64_numpy2.0python3.9.____cpython.yaml b/.ci_support/linux_64_numpy2.0python3.9.____cpython.yaml index 945bdf18..8bd91636 100644 --- a/.ci_support/linux_64_numpy2.0python3.9.____cpython.yaml +++ b/.ci_support/linux_64_numpy2.0python3.9.____cpython.yaml @@ -9,7 +9,7 @@ c_stdlib_version: cdt_name: - cos6 channel_sources: -- conda-forge/label/numpy_rc,conda-forge +- conda-forge channel_targets: - conda-forge main cxx_compiler: diff --git a/.ci_support/linux_aarch64_numpy1.22python3.8.____cpython.yaml b/.ci_support/linux_aarch64_numpy1.22python3.8.____cpython.yaml index 7f40a449..cef37ec8 100644 --- a/.ci_support/linux_aarch64_numpy1.22python3.8.____cpython.yaml +++ b/.ci_support/linux_aarch64_numpy1.22python3.8.____cpython.yaml @@ -13,7 +13,7 @@ cdt_arch: cdt_name: - cos7 channel_sources: -- conda-forge/label/numpy_rc,conda-forge +- conda-forge channel_targets: - conda-forge main cxx_compiler: diff --git a/.ci_support/linux_aarch64_numpy1.22python3.9.____73_pypy.yaml b/.ci_support/linux_aarch64_numpy1.22python3.9.____73_pypy.yaml index 0a9c5532..77b6980a 100644 --- a/.ci_support/linux_aarch64_numpy1.22python3.9.____73_pypy.yaml +++ b/.ci_support/linux_aarch64_numpy1.22python3.9.____73_pypy.yaml @@ -13,7 +13,7 @@ cdt_arch: cdt_name: - cos7 channel_sources: -- conda-forge/label/numpy_rc,conda-forge +- conda-forge channel_targets: - conda-forge main cxx_compiler: diff --git a/.ci_support/linux_aarch64_numpy2.0python3.10.____cpython.yaml b/.ci_support/linux_aarch64_numpy2.0python3.10.____cpython.yaml index 3f91327f..32d8f8be 100644 --- a/.ci_support/linux_aarch64_numpy2.0python3.10.____cpython.yaml +++ b/.ci_support/linux_aarch64_numpy2.0python3.10.____cpython.yaml @@ -13,7 +13,7 @@ cdt_arch: cdt_name: - cos7 channel_sources: -- conda-forge/label/numpy_rc,conda-forge +- conda-forge channel_targets: - conda-forge main cxx_compiler: diff --git a/.ci_support/linux_aarch64_numpy2.0python3.11.____cpython.yaml b/.ci_support/linux_aarch64_numpy2.0python3.11.____cpython.yaml index 5005466a..90f4f57d 100644 --- a/.ci_support/linux_aarch64_numpy2.0python3.11.____cpython.yaml +++ b/.ci_support/linux_aarch64_numpy2.0python3.11.____cpython.yaml @@ -13,7 +13,7 @@ cdt_arch: cdt_name: - cos7 channel_sources: -- conda-forge/label/numpy_rc,conda-forge +- conda-forge channel_targets: - conda-forge main cxx_compiler: diff --git a/.ci_support/linux_aarch64_numpy2.0python3.12.____cpython.yaml b/.ci_support/linux_aarch64_numpy2.0python3.12.____cpython.yaml index ad5ee5ac..283a8faf 100644 --- a/.ci_support/linux_aarch64_numpy2.0python3.12.____cpython.yaml +++ b/.ci_support/linux_aarch64_numpy2.0python3.12.____cpython.yaml @@ -13,7 +13,7 @@ cdt_arch: cdt_name: - cos7 channel_sources: -- conda-forge/label/numpy_rc,conda-forge +- conda-forge channel_targets: - conda-forge main cxx_compiler: diff --git a/.ci_support/linux_aarch64_numpy2.0python3.9.____cpython.yaml b/.ci_support/linux_aarch64_numpy2.0python3.9.____cpython.yaml index 4e182529..543d2d75 100644 --- a/.ci_support/linux_aarch64_numpy2.0python3.9.____cpython.yaml +++ b/.ci_support/linux_aarch64_numpy2.0python3.9.____cpython.yaml @@ -13,7 +13,7 @@ cdt_arch: cdt_name: - cos7 channel_sources: -- conda-forge/label/numpy_rc,conda-forge +- conda-forge channel_targets: - conda-forge main cxx_compiler: diff --git a/.ci_support/linux_ppc64le_numpy1.22python3.8.____cpython.yaml b/.ci_support/linux_ppc64le_numpy1.22python3.8.____cpython.yaml index 3a6d1e3a..9abb1ed2 100644 --- a/.ci_support/linux_ppc64le_numpy1.22python3.8.____cpython.yaml +++ b/.ci_support/linux_ppc64le_numpy1.22python3.8.____cpython.yaml @@ -9,7 +9,7 @@ c_stdlib_version: cdt_name: - cos7 channel_sources: -- conda-forge/label/numpy_rc,conda-forge +- conda-forge channel_targets: - conda-forge main cxx_compiler: diff --git a/.ci_support/linux_ppc64le_numpy1.22python3.9.____73_pypy.yaml b/.ci_support/linux_ppc64le_numpy1.22python3.9.____73_pypy.yaml index b56a9203..9a6bb269 100644 --- a/.ci_support/linux_ppc64le_numpy1.22python3.9.____73_pypy.yaml +++ b/.ci_support/linux_ppc64le_numpy1.22python3.9.____73_pypy.yaml @@ -9,7 +9,7 @@ c_stdlib_version: cdt_name: - cos7 channel_sources: -- conda-forge/label/numpy_rc,conda-forge +- conda-forge channel_targets: - conda-forge main cxx_compiler: diff --git a/.ci_support/linux_ppc64le_numpy2.0python3.10.____cpython.yaml b/.ci_support/linux_ppc64le_numpy2.0python3.10.____cpython.yaml index 4736f5d7..502ba847 100644 --- a/.ci_support/linux_ppc64le_numpy2.0python3.10.____cpython.yaml +++ b/.ci_support/linux_ppc64le_numpy2.0python3.10.____cpython.yaml @@ -9,7 +9,7 @@ c_stdlib_version: cdt_name: - cos7 channel_sources: -- conda-forge/label/numpy_rc,conda-forge +- conda-forge channel_targets: - conda-forge main cxx_compiler: diff --git a/.ci_support/linux_ppc64le_numpy2.0python3.11.____cpython.yaml b/.ci_support/linux_ppc64le_numpy2.0python3.11.____cpython.yaml index a7d2bfb4..8082b25b 100644 --- a/.ci_support/linux_ppc64le_numpy2.0python3.11.____cpython.yaml +++ b/.ci_support/linux_ppc64le_numpy2.0python3.11.____cpython.yaml @@ -9,7 +9,7 @@ c_stdlib_version: cdt_name: - cos7 channel_sources: -- conda-forge/label/numpy_rc,conda-forge +- conda-forge channel_targets: - conda-forge main cxx_compiler: diff --git a/.ci_support/linux_ppc64le_numpy2.0python3.12.____cpython.yaml b/.ci_support/linux_ppc64le_numpy2.0python3.12.____cpython.yaml index 5b924f4e..eca6816f 100644 --- a/.ci_support/linux_ppc64le_numpy2.0python3.12.____cpython.yaml +++ b/.ci_support/linux_ppc64le_numpy2.0python3.12.____cpython.yaml @@ -9,7 +9,7 @@ c_stdlib_version: cdt_name: - cos7 channel_sources: -- conda-forge/label/numpy_rc,conda-forge +- conda-forge channel_targets: - conda-forge main cxx_compiler: diff --git a/.ci_support/linux_ppc64le_numpy2.0python3.9.____cpython.yaml b/.ci_support/linux_ppc64le_numpy2.0python3.9.____cpython.yaml index 2354cfaf..e05cf813 100644 --- a/.ci_support/linux_ppc64le_numpy2.0python3.9.____cpython.yaml +++ b/.ci_support/linux_ppc64le_numpy2.0python3.9.____cpython.yaml @@ -9,7 +9,7 @@ c_stdlib_version: cdt_name: - cos7 channel_sources: -- conda-forge/label/numpy_rc,conda-forge +- conda-forge channel_targets: - conda-forge main cxx_compiler: diff --git a/.ci_support/osx_64_numpy1.22python3.8.____cpython.yaml b/.ci_support/osx_64_numpy1.22python3.8.____cpython.yaml index f46e0833..1951701e 100644 --- a/.ci_support/osx_64_numpy1.22python3.8.____cpython.yaml +++ b/.ci_support/osx_64_numpy1.22python3.8.____cpython.yaml @@ -11,7 +11,7 @@ c_stdlib: c_stdlib_version: - '10.13' channel_sources: -- conda-forge/label/numpy_rc,conda-forge +- conda-forge channel_targets: - conda-forge main cxx_compiler: diff --git a/.ci_support/osx_64_numpy1.22python3.9.____73_pypy.yaml b/.ci_support/osx_64_numpy1.22python3.9.____73_pypy.yaml index 6f2f27de..b58f5cad 100644 --- a/.ci_support/osx_64_numpy1.22python3.9.____73_pypy.yaml +++ b/.ci_support/osx_64_numpy1.22python3.9.____73_pypy.yaml @@ -11,7 +11,7 @@ c_stdlib: c_stdlib_version: - '10.13' channel_sources: -- conda-forge/label/numpy_rc,conda-forge +- conda-forge channel_targets: - conda-forge main cxx_compiler: diff --git a/.ci_support/osx_64_numpy2.0python3.10.____cpython.yaml b/.ci_support/osx_64_numpy2.0python3.10.____cpython.yaml index 929abcd5..9849babc 100644 --- a/.ci_support/osx_64_numpy2.0python3.10.____cpython.yaml +++ b/.ci_support/osx_64_numpy2.0python3.10.____cpython.yaml @@ -11,7 +11,7 @@ c_stdlib: c_stdlib_version: - '10.13' channel_sources: -- conda-forge/label/numpy_rc,conda-forge +- conda-forge channel_targets: - conda-forge main cxx_compiler: diff --git a/.ci_support/osx_64_numpy2.0python3.11.____cpython.yaml b/.ci_support/osx_64_numpy2.0python3.11.____cpython.yaml index 7614e36c..8bece27e 100644 --- a/.ci_support/osx_64_numpy2.0python3.11.____cpython.yaml +++ b/.ci_support/osx_64_numpy2.0python3.11.____cpython.yaml @@ -11,7 +11,7 @@ c_stdlib: c_stdlib_version: - '10.13' channel_sources: -- conda-forge/label/numpy_rc,conda-forge +- conda-forge channel_targets: - conda-forge main cxx_compiler: diff --git a/.ci_support/osx_64_numpy2.0python3.12.____cpython.yaml b/.ci_support/osx_64_numpy2.0python3.12.____cpython.yaml index f68af38f..27153b17 100644 --- a/.ci_support/osx_64_numpy2.0python3.12.____cpython.yaml +++ b/.ci_support/osx_64_numpy2.0python3.12.____cpython.yaml @@ -11,7 +11,7 @@ c_stdlib: c_stdlib_version: - '10.13' channel_sources: -- conda-forge/label/numpy_rc,conda-forge +- conda-forge channel_targets: - conda-forge main cxx_compiler: diff --git a/.ci_support/osx_64_numpy2.0python3.9.____cpython.yaml b/.ci_support/osx_64_numpy2.0python3.9.____cpython.yaml index 7e815c03..b09af5bc 100644 --- a/.ci_support/osx_64_numpy2.0python3.9.____cpython.yaml +++ b/.ci_support/osx_64_numpy2.0python3.9.____cpython.yaml @@ -11,7 +11,7 @@ c_stdlib: c_stdlib_version: - '10.13' channel_sources: -- conda-forge/label/numpy_rc,conda-forge +- conda-forge channel_targets: - conda-forge main cxx_compiler: diff --git a/.ci_support/osx_arm64_numpy1.22python3.8.____cpython.yaml b/.ci_support/osx_arm64_numpy1.22python3.8.____cpython.yaml index 9d36c436..3a0cd289 100644 --- a/.ci_support/osx_arm64_numpy1.22python3.8.____cpython.yaml +++ b/.ci_support/osx_arm64_numpy1.22python3.8.____cpython.yaml @@ -11,7 +11,7 @@ c_stdlib: c_stdlib_version: - '11.0' channel_sources: -- conda-forge/label/numpy_rc,conda-forge +- conda-forge channel_targets: - conda-forge main cxx_compiler: diff --git a/.ci_support/osx_arm64_numpy2.0python3.10.____cpython.yaml b/.ci_support/osx_arm64_numpy2.0python3.10.____cpython.yaml index d25d3eda..ba568df0 100644 --- a/.ci_support/osx_arm64_numpy2.0python3.10.____cpython.yaml +++ b/.ci_support/osx_arm64_numpy2.0python3.10.____cpython.yaml @@ -11,7 +11,7 @@ c_stdlib: c_stdlib_version: - '11.0' channel_sources: -- conda-forge/label/numpy_rc,conda-forge +- conda-forge channel_targets: - conda-forge main cxx_compiler: diff --git a/.ci_support/osx_arm64_numpy2.0python3.11.____cpython.yaml b/.ci_support/osx_arm64_numpy2.0python3.11.____cpython.yaml index 04c229c6..a0abbd47 100644 --- a/.ci_support/osx_arm64_numpy2.0python3.11.____cpython.yaml +++ b/.ci_support/osx_arm64_numpy2.0python3.11.____cpython.yaml @@ -11,7 +11,7 @@ c_stdlib: c_stdlib_version: - '11.0' channel_sources: -- conda-forge/label/numpy_rc,conda-forge +- conda-forge channel_targets: - conda-forge main cxx_compiler: diff --git a/.ci_support/osx_arm64_numpy2.0python3.12.____cpython.yaml b/.ci_support/osx_arm64_numpy2.0python3.12.____cpython.yaml index 772b9278..b4f058db 100644 --- a/.ci_support/osx_arm64_numpy2.0python3.12.____cpython.yaml +++ b/.ci_support/osx_arm64_numpy2.0python3.12.____cpython.yaml @@ -11,7 +11,7 @@ c_stdlib: c_stdlib_version: - '11.0' channel_sources: -- conda-forge/label/numpy_rc,conda-forge +- conda-forge channel_targets: - conda-forge main cxx_compiler: diff --git a/.ci_support/osx_arm64_numpy2.0python3.9.____cpython.yaml b/.ci_support/osx_arm64_numpy2.0python3.9.____cpython.yaml index 886e25ea..b16e8d27 100644 --- a/.ci_support/osx_arm64_numpy2.0python3.9.____cpython.yaml +++ b/.ci_support/osx_arm64_numpy2.0python3.9.____cpython.yaml @@ -11,7 +11,7 @@ c_stdlib: c_stdlib_version: - '11.0' channel_sources: -- conda-forge/label/numpy_rc,conda-forge +- conda-forge channel_targets: - conda-forge main cxx_compiler: diff --git a/.ci_support/win_64_numpy1.22python3.8.____cpython.yaml b/.ci_support/win_64_numpy1.22python3.8.____cpython.yaml index a6906a7b..161eb641 100644 --- a/.ci_support/win_64_numpy1.22python3.8.____cpython.yaml +++ b/.ci_support/win_64_numpy1.22python3.8.____cpython.yaml @@ -3,7 +3,7 @@ c_compiler: c_stdlib: - vs channel_sources: -- conda-forge/label/numpy_rc,conda-forge +- conda-forge channel_targets: - conda-forge main cxx_compiler: diff --git a/.ci_support/win_64_numpy1.22python3.9.____73_pypy.yaml b/.ci_support/win_64_numpy1.22python3.9.____73_pypy.yaml index 58acd58f..ae3ff9b6 100644 --- a/.ci_support/win_64_numpy1.22python3.9.____73_pypy.yaml +++ b/.ci_support/win_64_numpy1.22python3.9.____73_pypy.yaml @@ -3,7 +3,7 @@ c_compiler: c_stdlib: - vs channel_sources: -- conda-forge/label/numpy_rc,conda-forge +- conda-forge channel_targets: - conda-forge main cxx_compiler: diff --git a/.ci_support/win_64_numpy2.0python3.10.____cpython.yaml b/.ci_support/win_64_numpy2.0python3.10.____cpython.yaml index 32909a98..707bef84 100644 --- a/.ci_support/win_64_numpy2.0python3.10.____cpython.yaml +++ b/.ci_support/win_64_numpy2.0python3.10.____cpython.yaml @@ -3,7 +3,7 @@ c_compiler: c_stdlib: - vs channel_sources: -- conda-forge/label/numpy_rc,conda-forge +- conda-forge channel_targets: - conda-forge main cxx_compiler: diff --git a/.ci_support/win_64_numpy2.0python3.11.____cpython.yaml b/.ci_support/win_64_numpy2.0python3.11.____cpython.yaml index ab1421fb..b59b3abc 100644 --- a/.ci_support/win_64_numpy2.0python3.11.____cpython.yaml +++ b/.ci_support/win_64_numpy2.0python3.11.____cpython.yaml @@ -3,7 +3,7 @@ c_compiler: c_stdlib: - vs channel_sources: -- conda-forge/label/numpy_rc,conda-forge +- conda-forge channel_targets: - conda-forge main cxx_compiler: diff --git a/.ci_support/win_64_numpy2.0python3.12.____cpython.yaml b/.ci_support/win_64_numpy2.0python3.12.____cpython.yaml index d9ae96b1..88e7a2c9 100644 --- a/.ci_support/win_64_numpy2.0python3.12.____cpython.yaml +++ b/.ci_support/win_64_numpy2.0python3.12.____cpython.yaml @@ -3,7 +3,7 @@ c_compiler: c_stdlib: - vs channel_sources: -- conda-forge/label/numpy_rc,conda-forge +- conda-forge channel_targets: - conda-forge main cxx_compiler: diff --git a/.ci_support/win_64_numpy2.0python3.9.____cpython.yaml b/.ci_support/win_64_numpy2.0python3.9.____cpython.yaml index 85cb979b..2a73589e 100644 --- a/.ci_support/win_64_numpy2.0python3.9.____cpython.yaml +++ b/.ci_support/win_64_numpy2.0python3.9.____cpython.yaml @@ -3,7 +3,7 @@ c_compiler: c_stdlib: - vs channel_sources: -- conda-forge/label/numpy_rc,conda-forge +- conda-forge channel_targets: - conda-forge main cxx_compiler: From a4df2de40d84888c4a5671548afa418886953566 Mon Sep 17 00:00:00 2001 From: Thomas A Caswell Date: Fri, 5 Jul 2024 09:55:26 -0400 Subject: [PATCH 95/95] REL: bump to 3.9.1 --- recipe/meta.yaml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 4db61cf4..5d41afae 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,7 +1,7 @@ # Full credit goes to https://github.com/conda/conda-recipes for providing this recipe. # It has been subsequently adapted for automated building with conda-forge. -{% set version = "3.9.0" %} +{% set version = "3.9.1" %} package: name: matplotlib-suite @@ -9,10 +9,9 @@ package: source: url: https://github.com/matplotlib/matplotlib/archive/v{{ version }}.tar.gz - sha256: 89877b314fe950b7abc118c1e518b0cc82fa9bb6e1228d26560e82be96ac009a - + sha256: 4fdf46dc325fdf4cbc61f7fa66de7b48287df0a71b3442b63ff0784041cae2e7 build: - number: 2 + number: 0 outputs: - name: matplotlib-base