From 0f20e86189199890c7dcba90a7a0836e05c33abd Mon Sep 17 00:00:00 2001 From: "conda-forge-webservices[bot]" <121827174+conda-forge-webservices[bot]@users.noreply.github.com> Date: Wed, 3 Jul 2024 12:41:51 +0000 Subject: [PATCH 1/7] dummy commit for rerendering --- README.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/README.md b/README.md index a7a780d..4c0da6c 100644 --- a/README.md +++ b/README.md @@ -341,3 +341,6 @@ Feedstock Maintainers * [@jhkennedy](https://github.com/jhkennedy/) * [@xylar](https://github.com/xylar/) + + + From 089b915557454073ce36cf441bb8baa068fbe8c4 Mon Sep 17 00:00:00 2001 From: "conda-forge-webservices[bot]" <91080706+conda-forge-webservices[bot]@users.noreply.github.com> Date: Wed, 3 Jul 2024 12:42:49 +0000 Subject: [PATCH 2/7] ENH updated version to 0.34.0 --- recipe/meta.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index d7aa7db..c7aaec7 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,5 +1,5 @@ {% set name = "mpas_tools" %} -{% set version = "0.33.0" %} +{% set version = "0.34.0" %} package: name: {{ name|lower }} @@ -7,7 +7,7 @@ package: source: url: https://github.com/MPAS-Dev/MPAS-Tools/archive/{{ version }}.tar.gz - sha256: 5aa9eaa544a290b62ed0e9c2dd8e755c1de7856d629088a0eed6c7e167b6dccf + sha256: 519dd591abb5e956dffe882fa7168e96bf1a39056679198b0231ffd75ed2aab1 build: number: 0 From cf5c1348d8c102203134b9c5592ab004c38cc8f2 Mon Sep 17 00:00:00 2001 From: "conda-forge-webservices[bot]" <91080706+conda-forge-webservices[bot]@users.noreply.github.com> Date: Wed, 3 Jul 2024 12:43:29 +0000 Subject: [PATCH 3/7] MNT: Re-rendered with conda-build 24.5.1, conda-smithy 3.36.2, and conda-forge-pinning 2024.07.02.20.04.05 --- .azure-pipelines/azure-pipelines-osx.yml | 2 +- .ci_support/linux_64_python3.10.____cpython.yaml | 8 +------- .ci_support/linux_64_python3.11.____cpython.yaml | 8 +------- .ci_support/linux_64_python3.12.____cpython.yaml | 8 +------- .ci_support/linux_64_python3.8.____cpython.yaml | 8 +------- .ci_support/linux_64_python3.9.____cpython.yaml | 8 +------- .ci_support/linux_aarch64_python3.10.____cpython.yaml | 6 ------ .ci_support/linux_aarch64_python3.11.____cpython.yaml | 6 ------ .ci_support/linux_aarch64_python3.12.____cpython.yaml | 6 ------ .ci_support/linux_aarch64_python3.8.____cpython.yaml | 6 ------ .ci_support/linux_aarch64_python3.9.____cpython.yaml | 6 ------ .ci_support/linux_ppc64le_python3.10.____cpython.yaml | 6 ------ .ci_support/linux_ppc64le_python3.11.____cpython.yaml | 6 ------ .ci_support/linux_ppc64le_python3.12.____cpython.yaml | 6 ------ .ci_support/linux_ppc64le_python3.8.____cpython.yaml | 6 ------ .ci_support/linux_ppc64le_python3.9.____cpython.yaml | 6 ------ .ci_support/osx_64_python3.10.____cpython.yaml | 10 +++------- .ci_support/osx_64_python3.11.____cpython.yaml | 10 +++------- .ci_support/osx_64_python3.12.____cpython.yaml | 10 +++------- .ci_support/osx_64_python3.8.____cpython.yaml | 10 +++------- .ci_support/osx_64_python3.9.____cpython.yaml | 10 +++------- .ci_support/osx_arm64_python3.10.____cpython.yaml | 6 +----- .ci_support/osx_arm64_python3.11.____cpython.yaml | 6 +----- .ci_support/osx_arm64_python3.12.____cpython.yaml | 6 +----- .ci_support/osx_arm64_python3.8.____cpython.yaml | 6 +----- .ci_support/osx_arm64_python3.9.____cpython.yaml | 6 +----- .gitattributes | 4 ++-- .scripts/build_steps.sh | 7 +++++++ .scripts/run_osx_build.sh | 7 +++++++ README.md | 3 --- 30 files changed, 42 insertions(+), 161 deletions(-) diff --git a/.azure-pipelines/azure-pipelines-osx.yml b/.azure-pipelines/azure-pipelines-osx.yml index 5d8853c..79030d5 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_python3.10.____cpython: diff --git a/.ci_support/linux_64_python3.10.____cpython.yaml b/.ci_support/linux_64_python3.10.____cpython.yaml index 5c0fbf3..552e774 100644 --- a/.ci_support/linux_64_python3.10.____cpython.yaml +++ b/.ci_support/linux_64_python3.10.____cpython.yaml @@ -1,9 +1,5 @@ -c_stdlib: -- sysroot -c_stdlib_version: -- '2.12' cdt_name: -- cos6 +- cos7 channel_sources: - conda-forge channel_targets: @@ -33,7 +29,5 @@ python: target_platform: - linux-64 zip_keys: -- - c_stdlib_version - - cdt_name - - cxx_compiler_version - fortran_compiler_version diff --git a/.ci_support/linux_64_python3.11.____cpython.yaml b/.ci_support/linux_64_python3.11.____cpython.yaml index e5bd4ee..760be00 100644 --- a/.ci_support/linux_64_python3.11.____cpython.yaml +++ b/.ci_support/linux_64_python3.11.____cpython.yaml @@ -1,9 +1,5 @@ -c_stdlib: -- sysroot -c_stdlib_version: -- '2.12' cdt_name: -- cos6 +- cos7 channel_sources: - conda-forge channel_targets: @@ -33,7 +29,5 @@ python: target_platform: - linux-64 zip_keys: -- - c_stdlib_version - - cdt_name - - cxx_compiler_version - fortran_compiler_version diff --git a/.ci_support/linux_64_python3.12.____cpython.yaml b/.ci_support/linux_64_python3.12.____cpython.yaml index e3d59f4..c5d0bc0 100644 --- a/.ci_support/linux_64_python3.12.____cpython.yaml +++ b/.ci_support/linux_64_python3.12.____cpython.yaml @@ -1,9 +1,5 @@ -c_stdlib: -- sysroot -c_stdlib_version: -- '2.12' cdt_name: -- cos6 +- cos7 channel_sources: - conda-forge channel_targets: @@ -33,7 +29,5 @@ python: target_platform: - linux-64 zip_keys: -- - c_stdlib_version - - cdt_name - - cxx_compiler_version - fortran_compiler_version diff --git a/.ci_support/linux_64_python3.8.____cpython.yaml b/.ci_support/linux_64_python3.8.____cpython.yaml index 0f547e5..d5afeb4 100644 --- a/.ci_support/linux_64_python3.8.____cpython.yaml +++ b/.ci_support/linux_64_python3.8.____cpython.yaml @@ -1,9 +1,5 @@ -c_stdlib: -- sysroot -c_stdlib_version: -- '2.12' cdt_name: -- cos6 +- cos7 channel_sources: - conda-forge channel_targets: @@ -33,7 +29,5 @@ python: target_platform: - linux-64 zip_keys: -- - c_stdlib_version - - cdt_name - - cxx_compiler_version - fortran_compiler_version diff --git a/.ci_support/linux_64_python3.9.____cpython.yaml b/.ci_support/linux_64_python3.9.____cpython.yaml index 43da42e..bcb561b 100644 --- a/.ci_support/linux_64_python3.9.____cpython.yaml +++ b/.ci_support/linux_64_python3.9.____cpython.yaml @@ -1,9 +1,5 @@ -c_stdlib: -- sysroot -c_stdlib_version: -- '2.12' cdt_name: -- cos6 +- cos7 channel_sources: - conda-forge channel_targets: @@ -33,7 +29,5 @@ python: target_platform: - linux-64 zip_keys: -- - c_stdlib_version - - cdt_name - - cxx_compiler_version - fortran_compiler_version diff --git a/.ci_support/linux_aarch64_python3.10.____cpython.yaml b/.ci_support/linux_aarch64_python3.10.____cpython.yaml index 98be934..d7202cf 100644 --- a/.ci_support/linux_aarch64_python3.10.____cpython.yaml +++ b/.ci_support/linux_aarch64_python3.10.____cpython.yaml @@ -1,9 +1,5 @@ BUILD: - aarch64-conda_cos7-linux-gnu -c_stdlib: -- sysroot -c_stdlib_version: -- '2.17' cdt_arch: - aarch64 cdt_name: @@ -37,7 +33,5 @@ python: target_platform: - linux-aarch64 zip_keys: -- - c_stdlib_version - - cdt_name - - cxx_compiler_version - fortran_compiler_version diff --git a/.ci_support/linux_aarch64_python3.11.____cpython.yaml b/.ci_support/linux_aarch64_python3.11.____cpython.yaml index c2ced8f..940a82d 100644 --- a/.ci_support/linux_aarch64_python3.11.____cpython.yaml +++ b/.ci_support/linux_aarch64_python3.11.____cpython.yaml @@ -1,9 +1,5 @@ BUILD: - aarch64-conda_cos7-linux-gnu -c_stdlib: -- sysroot -c_stdlib_version: -- '2.17' cdt_arch: - aarch64 cdt_name: @@ -37,7 +33,5 @@ python: target_platform: - linux-aarch64 zip_keys: -- - c_stdlib_version - - cdt_name - - cxx_compiler_version - fortran_compiler_version diff --git a/.ci_support/linux_aarch64_python3.12.____cpython.yaml b/.ci_support/linux_aarch64_python3.12.____cpython.yaml index a21d74c..d2f3346 100644 --- a/.ci_support/linux_aarch64_python3.12.____cpython.yaml +++ b/.ci_support/linux_aarch64_python3.12.____cpython.yaml @@ -1,9 +1,5 @@ BUILD: - aarch64-conda_cos7-linux-gnu -c_stdlib: -- sysroot -c_stdlib_version: -- '2.17' cdt_arch: - aarch64 cdt_name: @@ -37,7 +33,5 @@ python: target_platform: - linux-aarch64 zip_keys: -- - c_stdlib_version - - cdt_name - - cxx_compiler_version - fortran_compiler_version diff --git a/.ci_support/linux_aarch64_python3.8.____cpython.yaml b/.ci_support/linux_aarch64_python3.8.____cpython.yaml index 1b41005..f0b4b20 100644 --- a/.ci_support/linux_aarch64_python3.8.____cpython.yaml +++ b/.ci_support/linux_aarch64_python3.8.____cpython.yaml @@ -1,9 +1,5 @@ BUILD: - aarch64-conda_cos7-linux-gnu -c_stdlib: -- sysroot -c_stdlib_version: -- '2.17' cdt_arch: - aarch64 cdt_name: @@ -37,7 +33,5 @@ python: target_platform: - linux-aarch64 zip_keys: -- - c_stdlib_version - - cdt_name - - cxx_compiler_version - fortran_compiler_version diff --git a/.ci_support/linux_aarch64_python3.9.____cpython.yaml b/.ci_support/linux_aarch64_python3.9.____cpython.yaml index 2ca3f5c..de4d534 100644 --- a/.ci_support/linux_aarch64_python3.9.____cpython.yaml +++ b/.ci_support/linux_aarch64_python3.9.____cpython.yaml @@ -1,9 +1,5 @@ BUILD: - aarch64-conda_cos7-linux-gnu -c_stdlib: -- sysroot -c_stdlib_version: -- '2.17' cdt_arch: - aarch64 cdt_name: @@ -37,7 +33,5 @@ python: target_platform: - linux-aarch64 zip_keys: -- - c_stdlib_version - - cdt_name - - cxx_compiler_version - fortran_compiler_version diff --git a/.ci_support/linux_ppc64le_python3.10.____cpython.yaml b/.ci_support/linux_ppc64le_python3.10.____cpython.yaml index 2d9381b..e8022e9 100644 --- a/.ci_support/linux_ppc64le_python3.10.____cpython.yaml +++ b/.ci_support/linux_ppc64le_python3.10.____cpython.yaml @@ -1,7 +1,3 @@ -c_stdlib: -- sysroot -c_stdlib_version: -- '2.17' cdt_name: - cos7 channel_sources: @@ -33,7 +29,5 @@ python: target_platform: - linux-ppc64le zip_keys: -- - c_stdlib_version - - cdt_name - - cxx_compiler_version - fortran_compiler_version diff --git a/.ci_support/linux_ppc64le_python3.11.____cpython.yaml b/.ci_support/linux_ppc64le_python3.11.____cpython.yaml index 51478cd..d083bd7 100644 --- a/.ci_support/linux_ppc64le_python3.11.____cpython.yaml +++ b/.ci_support/linux_ppc64le_python3.11.____cpython.yaml @@ -1,7 +1,3 @@ -c_stdlib: -- sysroot -c_stdlib_version: -- '2.17' cdt_name: - cos7 channel_sources: @@ -33,7 +29,5 @@ python: target_platform: - linux-ppc64le zip_keys: -- - c_stdlib_version - - cdt_name - - cxx_compiler_version - fortran_compiler_version diff --git a/.ci_support/linux_ppc64le_python3.12.____cpython.yaml b/.ci_support/linux_ppc64le_python3.12.____cpython.yaml index 3ca1638..d23d094 100644 --- a/.ci_support/linux_ppc64le_python3.12.____cpython.yaml +++ b/.ci_support/linux_ppc64le_python3.12.____cpython.yaml @@ -1,7 +1,3 @@ -c_stdlib: -- sysroot -c_stdlib_version: -- '2.17' cdt_name: - cos7 channel_sources: @@ -33,7 +29,5 @@ python: target_platform: - linux-ppc64le zip_keys: -- - c_stdlib_version - - cdt_name - - cxx_compiler_version - fortran_compiler_version diff --git a/.ci_support/linux_ppc64le_python3.8.____cpython.yaml b/.ci_support/linux_ppc64le_python3.8.____cpython.yaml index 69568fb..dfa4014 100644 --- a/.ci_support/linux_ppc64le_python3.8.____cpython.yaml +++ b/.ci_support/linux_ppc64le_python3.8.____cpython.yaml @@ -1,7 +1,3 @@ -c_stdlib: -- sysroot -c_stdlib_version: -- '2.17' cdt_name: - cos7 channel_sources: @@ -33,7 +29,5 @@ python: target_platform: - linux-ppc64le zip_keys: -- - c_stdlib_version - - cdt_name - - cxx_compiler_version - fortran_compiler_version diff --git a/.ci_support/linux_ppc64le_python3.9.____cpython.yaml b/.ci_support/linux_ppc64le_python3.9.____cpython.yaml index 0e4e04c..616055e 100644 --- a/.ci_support/linux_ppc64le_python3.9.____cpython.yaml +++ b/.ci_support/linux_ppc64le_python3.9.____cpython.yaml @@ -1,7 +1,3 @@ -c_stdlib: -- sysroot -c_stdlib_version: -- '2.17' cdt_name: - cos7 channel_sources: @@ -33,7 +29,5 @@ python: target_platform: - linux-ppc64le zip_keys: -- - c_stdlib_version - - cdt_name - - cxx_compiler_version - fortran_compiler_version diff --git a/.ci_support/osx_64_python3.10.____cpython.yaml b/.ci_support/osx_64_python3.10.____cpython.yaml index 7e32de6..0d9e85c 100644 --- a/.ci_support/osx_64_python3.10.____cpython.yaml +++ b/.ci_support/osx_64_python3.10.____cpython.yaml @@ -1,9 +1,7 @@ MACOSX_DEPLOYMENT_TARGET: -- '10.9' -c_stdlib: -- macosx_deployment_target -c_stdlib_version: -- '10.9' +- '10.13' +MACOSX_SDK_VERSION: +- '10.13' channel_sources: - conda-forge channel_targets: @@ -35,7 +33,5 @@ python: target_platform: - osx-64 zip_keys: -- - c_stdlib_version - - MACOSX_DEPLOYMENT_TARGET - - cxx_compiler_version - fortran_compiler_version diff --git a/.ci_support/osx_64_python3.11.____cpython.yaml b/.ci_support/osx_64_python3.11.____cpython.yaml index 9d46c48..5ee45d9 100644 --- a/.ci_support/osx_64_python3.11.____cpython.yaml +++ b/.ci_support/osx_64_python3.11.____cpython.yaml @@ -1,9 +1,7 @@ MACOSX_DEPLOYMENT_TARGET: -- '10.9' -c_stdlib: -- macosx_deployment_target -c_stdlib_version: -- '10.9' +- '10.13' +MACOSX_SDK_VERSION: +- '10.13' channel_sources: - conda-forge channel_targets: @@ -35,7 +33,5 @@ python: target_platform: - osx-64 zip_keys: -- - c_stdlib_version - - MACOSX_DEPLOYMENT_TARGET - - cxx_compiler_version - fortran_compiler_version diff --git a/.ci_support/osx_64_python3.12.____cpython.yaml b/.ci_support/osx_64_python3.12.____cpython.yaml index 4af03f5..d1a8ae2 100644 --- a/.ci_support/osx_64_python3.12.____cpython.yaml +++ b/.ci_support/osx_64_python3.12.____cpython.yaml @@ -1,9 +1,7 @@ MACOSX_DEPLOYMENT_TARGET: -- '10.9' -c_stdlib: -- macosx_deployment_target -c_stdlib_version: -- '10.9' +- '10.13' +MACOSX_SDK_VERSION: +- '10.13' channel_sources: - conda-forge channel_targets: @@ -35,7 +33,5 @@ python: target_platform: - osx-64 zip_keys: -- - c_stdlib_version - - MACOSX_DEPLOYMENT_TARGET - - cxx_compiler_version - fortran_compiler_version diff --git a/.ci_support/osx_64_python3.8.____cpython.yaml b/.ci_support/osx_64_python3.8.____cpython.yaml index 1135272..42726fc 100644 --- a/.ci_support/osx_64_python3.8.____cpython.yaml +++ b/.ci_support/osx_64_python3.8.____cpython.yaml @@ -1,9 +1,7 @@ MACOSX_DEPLOYMENT_TARGET: -- '10.9' -c_stdlib: -- macosx_deployment_target -c_stdlib_version: -- '10.9' +- '10.13' +MACOSX_SDK_VERSION: +- '10.13' channel_sources: - conda-forge channel_targets: @@ -35,7 +33,5 @@ python: target_platform: - osx-64 zip_keys: -- - c_stdlib_version - - MACOSX_DEPLOYMENT_TARGET - - cxx_compiler_version - fortran_compiler_version diff --git a/.ci_support/osx_64_python3.9.____cpython.yaml b/.ci_support/osx_64_python3.9.____cpython.yaml index 1296af8..033c544 100644 --- a/.ci_support/osx_64_python3.9.____cpython.yaml +++ b/.ci_support/osx_64_python3.9.____cpython.yaml @@ -1,9 +1,7 @@ MACOSX_DEPLOYMENT_TARGET: -- '10.9' -c_stdlib: -- macosx_deployment_target -c_stdlib_version: -- '10.9' +- '10.13' +MACOSX_SDK_VERSION: +- '10.13' channel_sources: - conda-forge channel_targets: @@ -35,7 +33,5 @@ python: target_platform: - osx-64 zip_keys: -- - c_stdlib_version - - MACOSX_DEPLOYMENT_TARGET - - cxx_compiler_version - fortran_compiler_version diff --git a/.ci_support/osx_arm64_python3.10.____cpython.yaml b/.ci_support/osx_arm64_python3.10.____cpython.yaml index e823d74..44b5dcb 100644 --- a/.ci_support/osx_arm64_python3.10.____cpython.yaml +++ b/.ci_support/osx_arm64_python3.10.____cpython.yaml @@ -1,8 +1,6 @@ MACOSX_DEPLOYMENT_TARGET: - '11.0' -c_stdlib: -- macosx_deployment_target -c_stdlib_version: +MACOSX_SDK_VERSION: - '11.0' channel_sources: - conda-forge @@ -35,7 +33,5 @@ python: target_platform: - osx-arm64 zip_keys: -- - c_stdlib_version - - MACOSX_DEPLOYMENT_TARGET - - cxx_compiler_version - fortran_compiler_version diff --git a/.ci_support/osx_arm64_python3.11.____cpython.yaml b/.ci_support/osx_arm64_python3.11.____cpython.yaml index 9fca9c3..fcdd09b 100644 --- a/.ci_support/osx_arm64_python3.11.____cpython.yaml +++ b/.ci_support/osx_arm64_python3.11.____cpython.yaml @@ -1,8 +1,6 @@ MACOSX_DEPLOYMENT_TARGET: - '11.0' -c_stdlib: -- macosx_deployment_target -c_stdlib_version: +MACOSX_SDK_VERSION: - '11.0' channel_sources: - conda-forge @@ -35,7 +33,5 @@ python: target_platform: - osx-arm64 zip_keys: -- - c_stdlib_version - - MACOSX_DEPLOYMENT_TARGET - - cxx_compiler_version - fortran_compiler_version diff --git a/.ci_support/osx_arm64_python3.12.____cpython.yaml b/.ci_support/osx_arm64_python3.12.____cpython.yaml index 0415317..19bb3ad 100644 --- a/.ci_support/osx_arm64_python3.12.____cpython.yaml +++ b/.ci_support/osx_arm64_python3.12.____cpython.yaml @@ -1,8 +1,6 @@ MACOSX_DEPLOYMENT_TARGET: - '11.0' -c_stdlib: -- macosx_deployment_target -c_stdlib_version: +MACOSX_SDK_VERSION: - '11.0' channel_sources: - conda-forge @@ -35,7 +33,5 @@ python: target_platform: - osx-arm64 zip_keys: -- - c_stdlib_version - - MACOSX_DEPLOYMENT_TARGET - - cxx_compiler_version - fortran_compiler_version diff --git a/.ci_support/osx_arm64_python3.8.____cpython.yaml b/.ci_support/osx_arm64_python3.8.____cpython.yaml index 6f10f8a..9ba3539 100644 --- a/.ci_support/osx_arm64_python3.8.____cpython.yaml +++ b/.ci_support/osx_arm64_python3.8.____cpython.yaml @@ -1,8 +1,6 @@ MACOSX_DEPLOYMENT_TARGET: - '11.0' -c_stdlib: -- macosx_deployment_target -c_stdlib_version: +MACOSX_SDK_VERSION: - '11.0' channel_sources: - conda-forge @@ -35,7 +33,5 @@ python: target_platform: - osx-arm64 zip_keys: -- - c_stdlib_version - - MACOSX_DEPLOYMENT_TARGET - - cxx_compiler_version - fortran_compiler_version diff --git a/.ci_support/osx_arm64_python3.9.____cpython.yaml b/.ci_support/osx_arm64_python3.9.____cpython.yaml index b06c75f..b55c3fe 100644 --- a/.ci_support/osx_arm64_python3.9.____cpython.yaml +++ b/.ci_support/osx_arm64_python3.9.____cpython.yaml @@ -1,8 +1,6 @@ MACOSX_DEPLOYMENT_TARGET: - '11.0' -c_stdlib: -- macosx_deployment_target -c_stdlib_version: +MACOSX_SDK_VERSION: - '11.0' channel_sources: - conda-forge @@ -35,7 +33,5 @@ python: target_platform: - osx-arm64 zip_keys: -- - c_stdlib_version - - MACOSX_DEPLOYMENT_TARGET - - cxx_compiler_version - fortran_compiler_version diff --git a/.gitattributes b/.gitattributes index 7f32763..18f114a 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 899ba03..a5836e8 100755 --- a/.scripts/build_steps.sh +++ b/.scripts/build_steps.sh @@ -72,6 +72,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 07dff21..ba0c879 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/README.md b/README.md index 4c0da6c..a7a780d 100644 --- a/README.md +++ b/README.md @@ -341,6 +341,3 @@ Feedstock Maintainers * [@jhkennedy](https://github.com/jhkennedy/) * [@xylar](https://github.com/xylar/) - - - From 95d76b6d3c207fcc2f772f16a4797c20b0f816e3 Mon Sep 17 00:00:00 2001 From: Xylar Asay-Davis Date: Fri, 28 Jun 2024 15:26:23 +0200 Subject: [PATCH 4/7] Add stdlib-c --- recipe/meta.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index c7aaec7..bf55015 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -43,6 +43,7 @@ requirements: - cross-python_{{ target_platform }} # [build_platform != target_platform] - {{ compiler('cxx') }} - {{ compiler('fortran') }} + - {{ stdlib('c') }} - cmake - make - pkgconfig From 3fe4410775a26e5a4edcf398e3d3de753aa138e9 Mon Sep 17 00:00:00 2001 From: Xylar Asay-Davis Date: Sat, 29 Jun 2024 12:08:30 +0200 Subject: [PATCH 5/7] Skip python 3.8 and ppc64le The latest pyamg is not available for python 3.8. The latest proj and pyproj are not available for ppc64le. --- recipe/meta.yaml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index bf55015..7d01b9e 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -11,7 +11,7 @@ source: build: number: 0 - skip: true # [win] + skip: true # [win or ppc64le or py<39] entry_points: - planar_hex = mpas_tools.planar_hex:main - translate_planar_grid = mpas_tools.translate:main @@ -65,7 +65,6 @@ requirements: - cmocean - dask - geometric_features >=1.0.1,<2.0.0 - - importlib_resources # [py<=38] - inpoly - jigsaw >=0.9.12 - jigsawpy >=0.2.1 From 6692443c85483114d7813ae6b7403d927fe4cccd Mon Sep 17 00:00:00 2001 From: "conda-forge-webservices[bot]" <91080706+conda-forge-webservices[bot]@users.noreply.github.com> Date: Wed, 3 Jul 2024 12:47:48 +0000 Subject: [PATCH 6/7] MNT: Re-rendered with conda-build 24.5.1, conda-smithy 3.36.2, and conda-forge-pinning 2024.07.02.20.04.05 --- .azure-pipelines/azure-pipelines-linux.yml | 28 --------- .azure-pipelines/azure-pipelines-osx.yml | 6 -- .../linux_64_python3.10.____cpython.yaml | 6 ++ .../linux_64_python3.11.____cpython.yaml | 6 ++ .../linux_64_python3.12.____cpython.yaml | 6 ++ .../linux_64_python3.8.____cpython.yaml | 33 ---------- .../linux_64_python3.9.____cpython.yaml | 6 ++ .../linux_aarch64_python3.10.____cpython.yaml | 6 ++ .../linux_aarch64_python3.11.____cpython.yaml | 6 ++ .../linux_aarch64_python3.12.____cpython.yaml | 6 ++ .../linux_aarch64_python3.8.____cpython.yaml | 37 ----------- .../linux_aarch64_python3.9.____cpython.yaml | 6 ++ .../linux_ppc64le_python3.10.____cpython.yaml | 33 ---------- .../linux_ppc64le_python3.11.____cpython.yaml | 33 ---------- .../linux_ppc64le_python3.12.____cpython.yaml | 33 ---------- .../linux_ppc64le_python3.8.____cpython.yaml | 33 ---------- .../linux_ppc64le_python3.9.____cpython.yaml | 33 ---------- .../osx_64_python3.10.____cpython.yaml | 4 ++ .../osx_64_python3.11.____cpython.yaml | 4 ++ .../osx_64_python3.12.____cpython.yaml | 4 ++ .ci_support/osx_64_python3.8.____cpython.yaml | 37 ----------- .ci_support/osx_64_python3.9.____cpython.yaml | 4 ++ .../osx_arm64_python3.10.____cpython.yaml | 4 ++ .../osx_arm64_python3.11.____cpython.yaml | 4 ++ .../osx_arm64_python3.12.____cpython.yaml | 4 ++ .../osx_arm64_python3.8.____cpython.yaml | 37 ----------- .../osx_arm64_python3.9.____cpython.yaml | 4 ++ README.md | 63 ------------------- 28 files changed, 80 insertions(+), 406 deletions(-) delete mode 100644 .ci_support/linux_64_python3.8.____cpython.yaml delete mode 100644 .ci_support/linux_aarch64_python3.8.____cpython.yaml delete mode 100644 .ci_support/linux_ppc64le_python3.10.____cpython.yaml delete mode 100644 .ci_support/linux_ppc64le_python3.11.____cpython.yaml delete mode 100644 .ci_support/linux_ppc64le_python3.12.____cpython.yaml delete mode 100644 .ci_support/linux_ppc64le_python3.8.____cpython.yaml delete mode 100644 .ci_support/linux_ppc64le_python3.9.____cpython.yaml delete mode 100644 .ci_support/osx_64_python3.8.____cpython.yaml delete mode 100644 .ci_support/osx_arm64_python3.8.____cpython.yaml diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml index 9ea7b4f..f58b7d6 100755 --- a/.azure-pipelines/azure-pipelines-linux.yml +++ b/.azure-pipelines/azure-pipelines-linux.yml @@ -20,10 +20,6 @@ jobs: CONFIG: linux_64_python3.12.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_64_python3.8.____cpython: - CONFIG: linux_64_python3.8.____cpython - UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 linux_64_python3.9.____cpython: CONFIG: linux_64_python3.9.____cpython UPLOAD_PACKAGES: 'True' @@ -40,34 +36,10 @@ jobs: CONFIG: linux_aarch64_python3.12.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_aarch64_python3.8.____cpython: - CONFIG: linux_aarch64_python3.8.____cpython - UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 linux_aarch64_python3.9.____cpython: CONFIG: linux_aarch64_python3.9.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_ppc64le_python3.10.____cpython: - CONFIG: linux_ppc64le_python3.10.____cpython - UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_ppc64le_python3.11.____cpython: - CONFIG: linux_ppc64le_python3.11.____cpython - UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_ppc64le_python3.12.____cpython: - CONFIG: linux_ppc64le_python3.12.____cpython - UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_ppc64le_python3.8.____cpython: - CONFIG: linux_ppc64le_python3.8.____cpython - UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_ppc64le_python3.9.____cpython: - CONFIG: linux_ppc64le_python3.9.____cpython - UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 timeoutInMinutes: 360 variables: {} diff --git a/.azure-pipelines/azure-pipelines-osx.yml b/.azure-pipelines/azure-pipelines-osx.yml index 79030d5..49fe09a 100755 --- a/.azure-pipelines/azure-pipelines-osx.yml +++ b/.azure-pipelines/azure-pipelines-osx.yml @@ -17,9 +17,6 @@ jobs: osx_64_python3.12.____cpython: CONFIG: osx_64_python3.12.____cpython UPLOAD_PACKAGES: 'True' - osx_64_python3.8.____cpython: - CONFIG: osx_64_python3.8.____cpython - UPLOAD_PACKAGES: 'True' osx_64_python3.9.____cpython: CONFIG: osx_64_python3.9.____cpython UPLOAD_PACKAGES: 'True' @@ -32,9 +29,6 @@ jobs: osx_arm64_python3.12.____cpython: CONFIG: osx_arm64_python3.12.____cpython UPLOAD_PACKAGES: 'True' - osx_arm64_python3.8.____cpython: - CONFIG: osx_arm64_python3.8.____cpython - UPLOAD_PACKAGES: 'True' osx_arm64_python3.9.____cpython: CONFIG: osx_arm64_python3.9.____cpython UPLOAD_PACKAGES: 'True' diff --git a/.ci_support/linux_64_python3.10.____cpython.yaml b/.ci_support/linux_64_python3.10.____cpython.yaml index 552e774..dc00e5f 100644 --- a/.ci_support/linux_64_python3.10.____cpython.yaml +++ b/.ci_support/linux_64_python3.10.____cpython.yaml @@ -1,3 +1,7 @@ +c_stdlib: +- sysroot +c_stdlib_version: +- '2.17' cdt_name: - cos7 channel_sources: @@ -29,5 +33,7 @@ python: target_platform: - linux-64 zip_keys: +- - c_stdlib_version + - cdt_name - - cxx_compiler_version - fortran_compiler_version diff --git a/.ci_support/linux_64_python3.11.____cpython.yaml b/.ci_support/linux_64_python3.11.____cpython.yaml index 760be00..d3d9152 100644 --- a/.ci_support/linux_64_python3.11.____cpython.yaml +++ b/.ci_support/linux_64_python3.11.____cpython.yaml @@ -1,3 +1,7 @@ +c_stdlib: +- sysroot +c_stdlib_version: +- '2.17' cdt_name: - cos7 channel_sources: @@ -29,5 +33,7 @@ python: target_platform: - linux-64 zip_keys: +- - c_stdlib_version + - cdt_name - - cxx_compiler_version - fortran_compiler_version diff --git a/.ci_support/linux_64_python3.12.____cpython.yaml b/.ci_support/linux_64_python3.12.____cpython.yaml index c5d0bc0..8cabd07 100644 --- a/.ci_support/linux_64_python3.12.____cpython.yaml +++ b/.ci_support/linux_64_python3.12.____cpython.yaml @@ -1,3 +1,7 @@ +c_stdlib: +- sysroot +c_stdlib_version: +- '2.17' cdt_name: - cos7 channel_sources: @@ -29,5 +33,7 @@ python: target_platform: - linux-64 zip_keys: +- - c_stdlib_version + - cdt_name - - cxx_compiler_version - fortran_compiler_version diff --git a/.ci_support/linux_64_python3.8.____cpython.yaml b/.ci_support/linux_64_python3.8.____cpython.yaml deleted file mode 100644 index d5afeb4..0000000 --- a/.ci_support/linux_64_python3.8.____cpython.yaml +++ /dev/null @@ -1,33 +0,0 @@ -cdt_name: -- cos7 -channel_sources: -- conda-forge -channel_targets: -- conda-forge main -cxx_compiler: -- gxx -cxx_compiler_version: -- '12' -docker_image: -- quay.io/condaforge/linux-anvil-cos7-x86_64 -fortran_compiler: -- gfortran -fortran_compiler_version: -- '12' -hdf5: -- 1.14.3 -libnetcdf: -- 4.9.2 -netcdf_fortran: -- '4.6' -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -python: -- 3.8.* *_cpython -target_platform: -- linux-64 -zip_keys: -- - cxx_compiler_version - - fortran_compiler_version diff --git a/.ci_support/linux_64_python3.9.____cpython.yaml b/.ci_support/linux_64_python3.9.____cpython.yaml index bcb561b..e4d8a81 100644 --- a/.ci_support/linux_64_python3.9.____cpython.yaml +++ b/.ci_support/linux_64_python3.9.____cpython.yaml @@ -1,3 +1,7 @@ +c_stdlib: +- sysroot +c_stdlib_version: +- '2.17' cdt_name: - cos7 channel_sources: @@ -29,5 +33,7 @@ python: target_platform: - linux-64 zip_keys: +- - c_stdlib_version + - cdt_name - - cxx_compiler_version - fortran_compiler_version diff --git a/.ci_support/linux_aarch64_python3.10.____cpython.yaml b/.ci_support/linux_aarch64_python3.10.____cpython.yaml index d7202cf..98be934 100644 --- a/.ci_support/linux_aarch64_python3.10.____cpython.yaml +++ b/.ci_support/linux_aarch64_python3.10.____cpython.yaml @@ -1,5 +1,9 @@ BUILD: - aarch64-conda_cos7-linux-gnu +c_stdlib: +- sysroot +c_stdlib_version: +- '2.17' cdt_arch: - aarch64 cdt_name: @@ -33,5 +37,7 @@ python: target_platform: - linux-aarch64 zip_keys: +- - c_stdlib_version + - cdt_name - - cxx_compiler_version - fortran_compiler_version diff --git a/.ci_support/linux_aarch64_python3.11.____cpython.yaml b/.ci_support/linux_aarch64_python3.11.____cpython.yaml index 940a82d..c2ced8f 100644 --- a/.ci_support/linux_aarch64_python3.11.____cpython.yaml +++ b/.ci_support/linux_aarch64_python3.11.____cpython.yaml @@ -1,5 +1,9 @@ BUILD: - aarch64-conda_cos7-linux-gnu +c_stdlib: +- sysroot +c_stdlib_version: +- '2.17' cdt_arch: - aarch64 cdt_name: @@ -33,5 +37,7 @@ python: target_platform: - linux-aarch64 zip_keys: +- - c_stdlib_version + - cdt_name - - cxx_compiler_version - fortran_compiler_version diff --git a/.ci_support/linux_aarch64_python3.12.____cpython.yaml b/.ci_support/linux_aarch64_python3.12.____cpython.yaml index d2f3346..a21d74c 100644 --- a/.ci_support/linux_aarch64_python3.12.____cpython.yaml +++ b/.ci_support/linux_aarch64_python3.12.____cpython.yaml @@ -1,5 +1,9 @@ BUILD: - aarch64-conda_cos7-linux-gnu +c_stdlib: +- sysroot +c_stdlib_version: +- '2.17' cdt_arch: - aarch64 cdt_name: @@ -33,5 +37,7 @@ python: target_platform: - linux-aarch64 zip_keys: +- - c_stdlib_version + - cdt_name - - cxx_compiler_version - fortran_compiler_version diff --git a/.ci_support/linux_aarch64_python3.8.____cpython.yaml b/.ci_support/linux_aarch64_python3.8.____cpython.yaml deleted file mode 100644 index f0b4b20..0000000 --- a/.ci_support/linux_aarch64_python3.8.____cpython.yaml +++ /dev/null @@ -1,37 +0,0 @@ -BUILD: -- aarch64-conda_cos7-linux-gnu -cdt_arch: -- aarch64 -cdt_name: -- cos7 -channel_sources: -- conda-forge -channel_targets: -- conda-forge main -cxx_compiler: -- gxx -cxx_compiler_version: -- '12' -docker_image: -- quay.io/condaforge/linux-anvil-cos7-x86_64 -fortran_compiler: -- gfortran -fortran_compiler_version: -- '12' -hdf5: -- 1.14.3 -libnetcdf: -- 4.9.2 -netcdf_fortran: -- '4.6' -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -python: -- 3.8.* *_cpython -target_platform: -- linux-aarch64 -zip_keys: -- - cxx_compiler_version - - fortran_compiler_version diff --git a/.ci_support/linux_aarch64_python3.9.____cpython.yaml b/.ci_support/linux_aarch64_python3.9.____cpython.yaml index de4d534..2ca3f5c 100644 --- a/.ci_support/linux_aarch64_python3.9.____cpython.yaml +++ b/.ci_support/linux_aarch64_python3.9.____cpython.yaml @@ -1,5 +1,9 @@ BUILD: - aarch64-conda_cos7-linux-gnu +c_stdlib: +- sysroot +c_stdlib_version: +- '2.17' cdt_arch: - aarch64 cdt_name: @@ -33,5 +37,7 @@ python: target_platform: - linux-aarch64 zip_keys: +- - c_stdlib_version + - cdt_name - - cxx_compiler_version - fortran_compiler_version diff --git a/.ci_support/linux_ppc64le_python3.10.____cpython.yaml b/.ci_support/linux_ppc64le_python3.10.____cpython.yaml deleted file mode 100644 index e8022e9..0000000 --- a/.ci_support/linux_ppc64le_python3.10.____cpython.yaml +++ /dev/null @@ -1,33 +0,0 @@ -cdt_name: -- cos7 -channel_sources: -- conda-forge -channel_targets: -- conda-forge main -cxx_compiler: -- gxx -cxx_compiler_version: -- '12' -docker_image: -- quay.io/condaforge/linux-anvil-cos7-x86_64 -fortran_compiler: -- gfortran -fortran_compiler_version: -- '12' -hdf5: -- 1.14.3 -libnetcdf: -- 4.9.2 -netcdf_fortran: -- '4.6' -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -python: -- 3.10.* *_cpython -target_platform: -- linux-ppc64le -zip_keys: -- - cxx_compiler_version - - fortran_compiler_version diff --git a/.ci_support/linux_ppc64le_python3.11.____cpython.yaml b/.ci_support/linux_ppc64le_python3.11.____cpython.yaml deleted file mode 100644 index d083bd7..0000000 --- a/.ci_support/linux_ppc64le_python3.11.____cpython.yaml +++ /dev/null @@ -1,33 +0,0 @@ -cdt_name: -- cos7 -channel_sources: -- conda-forge -channel_targets: -- conda-forge main -cxx_compiler: -- gxx -cxx_compiler_version: -- '12' -docker_image: -- quay.io/condaforge/linux-anvil-cos7-x86_64 -fortran_compiler: -- gfortran -fortran_compiler_version: -- '12' -hdf5: -- 1.14.3 -libnetcdf: -- 4.9.2 -netcdf_fortran: -- '4.6' -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -python: -- 3.11.* *_cpython -target_platform: -- linux-ppc64le -zip_keys: -- - cxx_compiler_version - - fortran_compiler_version diff --git a/.ci_support/linux_ppc64le_python3.12.____cpython.yaml b/.ci_support/linux_ppc64le_python3.12.____cpython.yaml deleted file mode 100644 index d23d094..0000000 --- a/.ci_support/linux_ppc64le_python3.12.____cpython.yaml +++ /dev/null @@ -1,33 +0,0 @@ -cdt_name: -- cos7 -channel_sources: -- conda-forge -channel_targets: -- conda-forge main -cxx_compiler: -- gxx -cxx_compiler_version: -- '12' -docker_image: -- quay.io/condaforge/linux-anvil-cos7-x86_64 -fortran_compiler: -- gfortran -fortran_compiler_version: -- '12' -hdf5: -- 1.14.3 -libnetcdf: -- 4.9.2 -netcdf_fortran: -- '4.6' -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -python: -- 3.12.* *_cpython -target_platform: -- linux-ppc64le -zip_keys: -- - cxx_compiler_version - - fortran_compiler_version diff --git a/.ci_support/linux_ppc64le_python3.8.____cpython.yaml b/.ci_support/linux_ppc64le_python3.8.____cpython.yaml deleted file mode 100644 index dfa4014..0000000 --- a/.ci_support/linux_ppc64le_python3.8.____cpython.yaml +++ /dev/null @@ -1,33 +0,0 @@ -cdt_name: -- cos7 -channel_sources: -- conda-forge -channel_targets: -- conda-forge main -cxx_compiler: -- gxx -cxx_compiler_version: -- '12' -docker_image: -- quay.io/condaforge/linux-anvil-cos7-x86_64 -fortran_compiler: -- gfortran -fortran_compiler_version: -- '12' -hdf5: -- 1.14.3 -libnetcdf: -- 4.9.2 -netcdf_fortran: -- '4.6' -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -python: -- 3.8.* *_cpython -target_platform: -- linux-ppc64le -zip_keys: -- - cxx_compiler_version - - fortran_compiler_version diff --git a/.ci_support/linux_ppc64le_python3.9.____cpython.yaml b/.ci_support/linux_ppc64le_python3.9.____cpython.yaml deleted file mode 100644 index 616055e..0000000 --- a/.ci_support/linux_ppc64le_python3.9.____cpython.yaml +++ /dev/null @@ -1,33 +0,0 @@ -cdt_name: -- cos7 -channel_sources: -- conda-forge -channel_targets: -- conda-forge main -cxx_compiler: -- gxx -cxx_compiler_version: -- '12' -docker_image: -- quay.io/condaforge/linux-anvil-cos7-x86_64 -fortran_compiler: -- gfortran -fortran_compiler_version: -- '12' -hdf5: -- 1.14.3 -libnetcdf: -- 4.9.2 -netcdf_fortran: -- '4.6' -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -python: -- 3.9.* *_cpython -target_platform: -- linux-ppc64le -zip_keys: -- - cxx_compiler_version - - fortran_compiler_version diff --git a/.ci_support/osx_64_python3.10.____cpython.yaml b/.ci_support/osx_64_python3.10.____cpython.yaml index 0d9e85c..982e3d2 100644 --- a/.ci_support/osx_64_python3.10.____cpython.yaml +++ b/.ci_support/osx_64_python3.10.____cpython.yaml @@ -2,6 +2,10 @@ MACOSX_DEPLOYMENT_TARGET: - '10.13' MACOSX_SDK_VERSION: - '10.13' +c_stdlib: +- macosx_deployment_target +c_stdlib_version: +- '10.13' channel_sources: - conda-forge channel_targets: diff --git a/.ci_support/osx_64_python3.11.____cpython.yaml b/.ci_support/osx_64_python3.11.____cpython.yaml index 5ee45d9..189a6aa 100644 --- a/.ci_support/osx_64_python3.11.____cpython.yaml +++ b/.ci_support/osx_64_python3.11.____cpython.yaml @@ -2,6 +2,10 @@ MACOSX_DEPLOYMENT_TARGET: - '10.13' MACOSX_SDK_VERSION: - '10.13' +c_stdlib: +- macosx_deployment_target +c_stdlib_version: +- '10.13' channel_sources: - conda-forge channel_targets: diff --git a/.ci_support/osx_64_python3.12.____cpython.yaml b/.ci_support/osx_64_python3.12.____cpython.yaml index d1a8ae2..505ae66 100644 --- a/.ci_support/osx_64_python3.12.____cpython.yaml +++ b/.ci_support/osx_64_python3.12.____cpython.yaml @@ -2,6 +2,10 @@ MACOSX_DEPLOYMENT_TARGET: - '10.13' MACOSX_SDK_VERSION: - '10.13' +c_stdlib: +- macosx_deployment_target +c_stdlib_version: +- '10.13' channel_sources: - conda-forge channel_targets: diff --git a/.ci_support/osx_64_python3.8.____cpython.yaml b/.ci_support/osx_64_python3.8.____cpython.yaml deleted file mode 100644 index 42726fc..0000000 --- a/.ci_support/osx_64_python3.8.____cpython.yaml +++ /dev/null @@ -1,37 +0,0 @@ -MACOSX_DEPLOYMENT_TARGET: -- '10.13' -MACOSX_SDK_VERSION: -- '10.13' -channel_sources: -- conda-forge -channel_targets: -- conda-forge main -cxx_compiler: -- clangxx -cxx_compiler_version: -- '16' -fortran_compiler: -- gfortran -fortran_compiler_version: -- '12' -hdf5: -- 1.14.3 -libnetcdf: -- 4.9.2 -llvm_openmp: -- '16' -macos_machine: -- x86_64-apple-darwin13.4.0 -netcdf_fortran: -- '4.6' -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -python: -- 3.8.* *_cpython -target_platform: -- osx-64 -zip_keys: -- - cxx_compiler_version - - fortran_compiler_version diff --git a/.ci_support/osx_64_python3.9.____cpython.yaml b/.ci_support/osx_64_python3.9.____cpython.yaml index 033c544..88d5e00 100644 --- a/.ci_support/osx_64_python3.9.____cpython.yaml +++ b/.ci_support/osx_64_python3.9.____cpython.yaml @@ -2,6 +2,10 @@ MACOSX_DEPLOYMENT_TARGET: - '10.13' MACOSX_SDK_VERSION: - '10.13' +c_stdlib: +- macosx_deployment_target +c_stdlib_version: +- '10.13' channel_sources: - conda-forge channel_targets: diff --git a/.ci_support/osx_arm64_python3.10.____cpython.yaml b/.ci_support/osx_arm64_python3.10.____cpython.yaml index 44b5dcb..3cc575f 100644 --- a/.ci_support/osx_arm64_python3.10.____cpython.yaml +++ b/.ci_support/osx_arm64_python3.10.____cpython.yaml @@ -2,6 +2,10 @@ MACOSX_DEPLOYMENT_TARGET: - '11.0' MACOSX_SDK_VERSION: - '11.0' +c_stdlib: +- macosx_deployment_target +c_stdlib_version: +- '11.0' channel_sources: - conda-forge channel_targets: diff --git a/.ci_support/osx_arm64_python3.11.____cpython.yaml b/.ci_support/osx_arm64_python3.11.____cpython.yaml index fcdd09b..28fb956 100644 --- a/.ci_support/osx_arm64_python3.11.____cpython.yaml +++ b/.ci_support/osx_arm64_python3.11.____cpython.yaml @@ -2,6 +2,10 @@ MACOSX_DEPLOYMENT_TARGET: - '11.0' MACOSX_SDK_VERSION: - '11.0' +c_stdlib: +- macosx_deployment_target +c_stdlib_version: +- '11.0' channel_sources: - conda-forge channel_targets: diff --git a/.ci_support/osx_arm64_python3.12.____cpython.yaml b/.ci_support/osx_arm64_python3.12.____cpython.yaml index 19bb3ad..bd086ab 100644 --- a/.ci_support/osx_arm64_python3.12.____cpython.yaml +++ b/.ci_support/osx_arm64_python3.12.____cpython.yaml @@ -2,6 +2,10 @@ MACOSX_DEPLOYMENT_TARGET: - '11.0' MACOSX_SDK_VERSION: - '11.0' +c_stdlib: +- macosx_deployment_target +c_stdlib_version: +- '11.0' channel_sources: - conda-forge channel_targets: diff --git a/.ci_support/osx_arm64_python3.8.____cpython.yaml b/.ci_support/osx_arm64_python3.8.____cpython.yaml deleted file mode 100644 index 9ba3539..0000000 --- a/.ci_support/osx_arm64_python3.8.____cpython.yaml +++ /dev/null @@ -1,37 +0,0 @@ -MACOSX_DEPLOYMENT_TARGET: -- '11.0' -MACOSX_SDK_VERSION: -- '11.0' -channel_sources: -- conda-forge -channel_targets: -- conda-forge main -cxx_compiler: -- clangxx -cxx_compiler_version: -- '16' -fortran_compiler: -- gfortran -fortran_compiler_version: -- '12' -hdf5: -- 1.14.3 -libnetcdf: -- 4.9.2 -llvm_openmp: -- '16' -macos_machine: -- arm64-apple-darwin20.0.0 -netcdf_fortran: -- '4.6' -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -python: -- 3.8.* *_cpython -target_platform: -- osx-arm64 -zip_keys: -- - cxx_compiler_version - - fortran_compiler_version diff --git a/.ci_support/osx_arm64_python3.9.____cpython.yaml b/.ci_support/osx_arm64_python3.9.____cpython.yaml index b55c3fe..5550b65 100644 --- a/.ci_support/osx_arm64_python3.9.____cpython.yaml +++ b/.ci_support/osx_arm64_python3.9.____cpython.yaml @@ -2,6 +2,10 @@ MACOSX_DEPLOYMENT_TARGET: - '11.0' MACOSX_SDK_VERSION: - '11.0' +c_stdlib: +- macosx_deployment_target +c_stdlib_version: +- '11.0' channel_sources: - conda-forge channel_targets: diff --git a/README.md b/README.md index a7a780d..2534486 100644 --- a/README.md +++ b/README.md @@ -55,13 +55,6 @@ Current build status variant - - linux_64_python3.8.____cpython - - - variant - - linux_64_python3.9.____cpython @@ -90,13 +83,6 @@ Current build status variant - - linux_aarch64_python3.8.____cpython - - - variant - - linux_aarch64_python3.9.____cpython @@ -104,41 +90,6 @@ Current build status variant - - linux_ppc64le_python3.10.____cpython - - - variant - - - - linux_ppc64le_python3.11.____cpython - - - variant - - - - linux_ppc64le_python3.12.____cpython - - - variant - - - - linux_ppc64le_python3.8.____cpython - - - variant - - - - linux_ppc64le_python3.9.____cpython - - - variant - - osx_64_python3.10.____cpython @@ -160,13 +111,6 @@ Current build status variant - - osx_64_python3.8.____cpython - - - variant - - osx_64_python3.9.____cpython @@ -195,13 +139,6 @@ Current build status variant - - osx_arm64_python3.8.____cpython - - - variant - - osx_arm64_python3.9.____cpython From 9cd3f08f9e6b9149decf927be9aa47108b980c35 Mon Sep 17 00:00:00 2001 From: Xylar Asay-Davis Date: Wed, 3 Jul 2024 06:48:31 -0600 Subject: [PATCH 7/7] Update dependencies --- recipe/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 7d01b9e..8bb7431 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -70,7 +70,7 @@ requirements: - jigsawpy >=0.2.1 - matplotlib-base - netcdf4 - - numpy + - numpy >=2.0,<3.0 - progressbar2 - pyamg - pyevtk