From 00b122e340e85f7bf26e7845e9afa49c2cb299f5 Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Fri, 27 Sep 2024 07:14:11 +0000 Subject: [PATCH 01/11] updated v9_9.0.0 --- recipe/meta.yaml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 8ce2361..9f0ae0d 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,6 +1,6 @@ {% set component_name = "sim" %} {% set repo_name = "gz-" + component_name %} -{% set version = "8_8.3.0" %} +{% set version = "9_9.0.0" %} {% set version_package = version.split('_')[1] %} {% set major_version = version.split('_')[0] %} {% set name = repo_name + major_version %} @@ -14,14 +14,14 @@ package: source: - url: https://github.com/gazebosim/gz-sim/archive/refs/tags/gz-sim{{ version }}.tar.gz - sha256: e59a6c983c3e44c7452315394012df1c96eeb18be60b0ee3a6db5d2e9b9409c0 + sha256: de9815b4b2a19c2c3e30b29a7b312c4949713a317021d4e416c521ceb525c358 patches: - standalone_bindings.patch - support_protobuf_crosscompilation.patch - 2382.patch build: - number: 1 + number: 0 # gz-sim requires gz-common's geospatial component, that requires # gdal that is not available on ppc64le https://github.com/conda-forge/gdal-feedstock/issues/918 skip: true # [ppc64le] @@ -36,6 +36,7 @@ outputs: requirements: build: - {{ compiler('c') }} + - {{ stdlib("c") }} - {{ compiler('cxx') }} - cmake - pkg-config @@ -102,6 +103,7 @@ outputs: requirements: build: - {{ compiler('c') }} + - {{ stdlib("c") }} - {{ compiler('cxx') }} - swig - ninja From ed65957c57599f36f3a08b40a74e9a3b10936b80 Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Fri, 27 Sep 2024 07:15:12 +0000 Subject: [PATCH 02/11] MNT: Re-rendered with conda-build 24.9.0, conda-smithy 3.40.1, and conda-forge-pinning 2024.09.27.00.47.16 --- .azure-pipelines/azure-pipelines-linux.yml | 48 ++---- .azure-pipelines/azure-pipelines-osx.yml | 25 +-- .azure-pipelines/azure-pipelines-win.yml | 24 +-- ...l => linux_64_python3.10.____cpython.yaml} | 12 +- ...l => linux_64_python3.11.____cpython.yaml} | 12 +- ...l => linux_64_python3.12.____cpython.yaml} | 12 +- ...thon3.8.____cpythonpython_implcpython.yaml | 41 ----- ..._python3.9.____73_pypypython_implpypy.yaml | 41 ----- ...ml => linux_64_python3.9.____cpython.yaml} | 12 +- ...linux_aarch64_python3.10.____cpython.yaml} | 10 +- ...linux_aarch64_python3.11.____cpython.yaml} | 10 +- ...linux_aarch64_python3.12.____cpython.yaml} | 10 +- ...thon3.8.____cpythonpython_implcpython.yaml | 45 ----- ..._python3.9.____73_pypypython_implpypy.yaml | 45 ----- ... linux_aarch64_python3.9.____cpython.yaml} | 10 +- .ci_support/migrations/pypy38.yaml | 43 ----- ...aml => osx_64_python3.10.____cpython.yaml} | 8 +- ...aml => osx_64_python3.11.____cpython.yaml} | 8 +- ...aml => osx_64_python3.12.____cpython.yaml} | 8 +- ...thon3.8.____cpythonpython_implcpython.yaml | 43 ----- ..._python3.9.____73_pypypython_implpypy.yaml | 43 ----- ...yaml => osx_64_python3.9.____cpython.yaml} | 8 +- .../osx_arm64_python3.10.____cpython.yaml | 8 +- .../osx_arm64_python3.11.____cpython.yaml | 8 +- .../osx_arm64_python3.12.____cpython.yaml | 8 +- .../osx_arm64_python3.8.____cpython.yaml | 43 ----- .../osx_arm64_python3.9.____cpython.yaml | 8 +- ...aml => win_64_python3.10.____cpython.yaml} | 2 + ...aml => win_64_python3.11.____cpython.yaml} | 2 + ...aml => win_64_python3.12.____cpython.yaml} | 2 + ...thon3.8.____cpythonpython_implcpython.yaml | 31 ---- ..._python3.9.____73_pypypython_implpypy.yaml | 31 ---- ...yaml => win_64_python3.9.____cpython.yaml} | 2 + .scripts/build_steps.sh | 14 +- .scripts/run_osx_build.sh | 9 +- .scripts/run_win_build.bat | 9 +- README.md | 155 ++++++------------ build-locally.py | 9 +- 38 files changed, 237 insertions(+), 622 deletions(-) rename .ci_support/{linux_64_python3.10.____cpythonpython_implcpython.yaml => linux_64_python3.10.____cpython.yaml} (84%) rename .ci_support/{linux_64_python3.11.____cpythonpython_implcpython.yaml => linux_64_python3.11.____cpython.yaml} (84%) rename .ci_support/{linux_64_python3.12.____cpythonpython_implcpython.yaml => linux_64_python3.12.____cpython.yaml} (84%) delete mode 100644 .ci_support/linux_64_python3.8.____cpythonpython_implcpython.yaml delete mode 100644 .ci_support/linux_64_python3.9.____73_pypypython_implpypy.yaml rename .ci_support/{linux_64_python3.9.____cpythonpython_implcpython.yaml => linux_64_python3.9.____cpython.yaml} (84%) rename .ci_support/{linux_aarch64_python3.10.____cpythonpython_implcpython.yaml => linux_aarch64_python3.10.____cpython.yaml} (86%) rename .ci_support/{linux_aarch64_python3.11.____cpythonpython_implcpython.yaml => linux_aarch64_python3.11.____cpython.yaml} (86%) rename .ci_support/{linux_aarch64_python3.12.____cpythonpython_implcpython.yaml => linux_aarch64_python3.12.____cpython.yaml} (86%) delete mode 100644 .ci_support/linux_aarch64_python3.8.____cpythonpython_implcpython.yaml delete mode 100644 .ci_support/linux_aarch64_python3.9.____73_pypypython_implpypy.yaml rename .ci_support/{linux_aarch64_python3.9.____cpythonpython_implcpython.yaml => linux_aarch64_python3.9.____cpython.yaml} (86%) delete mode 100644 .ci_support/migrations/pypy38.yaml rename .ci_support/{osx_64_python3.10.____cpythonpython_implcpython.yaml => osx_64_python3.10.____cpython.yaml} (88%) rename .ci_support/{osx_64_python3.11.____cpythonpython_implcpython.yaml => osx_64_python3.11.____cpython.yaml} (88%) rename .ci_support/{osx_64_python3.12.____cpythonpython_implcpython.yaml => osx_64_python3.12.____cpython.yaml} (88%) delete mode 100644 .ci_support/osx_64_python3.8.____cpythonpython_implcpython.yaml delete mode 100644 .ci_support/osx_64_python3.9.____73_pypypython_implpypy.yaml rename .ci_support/{osx_64_python3.9.____cpythonpython_implcpython.yaml => osx_64_python3.9.____cpython.yaml} (88%) delete mode 100644 .ci_support/osx_arm64_python3.8.____cpython.yaml rename .ci_support/{win_64_python3.10.____cpythonpython_implcpython.yaml => win_64_python3.10.____cpython.yaml} (96%) rename .ci_support/{win_64_python3.11.____cpythonpython_implcpython.yaml => win_64_python3.11.____cpython.yaml} (96%) rename .ci_support/{win_64_python3.12.____cpythonpython_implcpython.yaml => win_64_python3.12.____cpython.yaml} (96%) delete mode 100644 .ci_support/win_64_python3.8.____cpythonpython_implcpython.yaml delete mode 100644 .ci_support/win_64_python3.9.____73_pypypython_implpypy.yaml rename .ci_support/{win_64_python3.9.____cpythonpython_implcpython.yaml => win_64_python3.9.____cpython.yaml} (96%) diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml index 01102bf..f58b7d6 100755 --- a/.azure-pipelines/azure-pipelines-linux.yml +++ b/.azure-pipelines/azure-pipelines-linux.yml @@ -8,52 +8,36 @@ jobs: vmImage: ubuntu-latest strategy: matrix: - linux_64_python3.10.____cpythonpython_implcpython: - CONFIG: linux_64_python3.10.____cpythonpython_implcpython + linux_64_python3.10.____cpython: + CONFIG: linux_64_python3.10.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_64_python3.11.____cpythonpython_implcpython: - CONFIG: linux_64_python3.11.____cpythonpython_implcpython + linux_64_python3.11.____cpython: + CONFIG: linux_64_python3.11.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_64_python3.12.____cpythonpython_implcpython: - CONFIG: linux_64_python3.12.____cpythonpython_implcpython + linux_64_python3.12.____cpython: + CONFIG: linux_64_python3.12.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_64_python3.8.____cpythonpython_implcpython: - CONFIG: linux_64_python3.8.____cpythonpython_implcpython + linux_64_python3.9.____cpython: + CONFIG: linux_64_python3.9.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_64_python3.9.____73_pypypython_implpypy: - CONFIG: linux_64_python3.9.____73_pypypython_implpypy + linux_aarch64_python3.10.____cpython: + CONFIG: linux_aarch64_python3.10.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_64_python3.9.____cpythonpython_implcpython: - CONFIG: linux_64_python3.9.____cpythonpython_implcpython + linux_aarch64_python3.11.____cpython: + CONFIG: linux_aarch64_python3.11.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_aarch64_python3.10.____cpythonpython_implcpython: - CONFIG: linux_aarch64_python3.10.____cpythonpython_implcpython + linux_aarch64_python3.12.____cpython: + CONFIG: linux_aarch64_python3.12.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_aarch64_python3.11.____cpythonpython_implcpython: - CONFIG: linux_aarch64_python3.11.____cpythonpython_implcpython - UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_aarch64_python3.12.____cpythonpython_implcpython: - CONFIG: linux_aarch64_python3.12.____cpythonpython_implcpython - UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_aarch64_python3.8.____cpythonpython_implcpython: - CONFIG: linux_aarch64_python3.8.____cpythonpython_implcpython - UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_aarch64_python3.9.____73_pypypython_implpypy: - CONFIG: linux_aarch64_python3.9.____73_pypypython_implpypy - UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_aarch64_python3.9.____cpythonpython_implcpython: - CONFIG: linux_aarch64_python3.9.____cpythonpython_implcpython + linux_aarch64_python3.9.____cpython: + CONFIG: linux_aarch64_python3.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 f1de6cc..49fe09a 100755 --- a/.azure-pipelines/azure-pipelines-osx.yml +++ b/.azure-pipelines/azure-pipelines-osx.yml @@ -8,23 +8,17 @@ jobs: vmImage: macOS-12 strategy: matrix: - osx_64_python3.10.____cpythonpython_implcpython: - CONFIG: osx_64_python3.10.____cpythonpython_implcpython + osx_64_python3.10.____cpython: + CONFIG: osx_64_python3.10.____cpython UPLOAD_PACKAGES: 'True' - osx_64_python3.11.____cpythonpython_implcpython: - CONFIG: osx_64_python3.11.____cpythonpython_implcpython + osx_64_python3.11.____cpython: + CONFIG: osx_64_python3.11.____cpython UPLOAD_PACKAGES: 'True' - osx_64_python3.12.____cpythonpython_implcpython: - CONFIG: osx_64_python3.12.____cpythonpython_implcpython + osx_64_python3.12.____cpython: + CONFIG: osx_64_python3.12.____cpython UPLOAD_PACKAGES: 'True' - osx_64_python3.8.____cpythonpython_implcpython: - CONFIG: osx_64_python3.8.____cpythonpython_implcpython - UPLOAD_PACKAGES: 'True' - osx_64_python3.9.____73_pypypython_implpypy: - CONFIG: osx_64_python3.9.____73_pypypython_implpypy - UPLOAD_PACKAGES: 'True' - osx_64_python3.9.____cpythonpython_implcpython: - CONFIG: osx_64_python3.9.____cpythonpython_implcpython + osx_64_python3.9.____cpython: + CONFIG: osx_64_python3.9.____cpython UPLOAD_PACKAGES: 'True' osx_arm64_python3.10.____cpython: CONFIG: osx_arm64_python3.10.____cpython @@ -35,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/.azure-pipelines/azure-pipelines-win.yml b/.azure-pipelines/azure-pipelines-win.yml index 910bbae..fa9734f 100755 --- a/.azure-pipelines/azure-pipelines-win.yml +++ b/.azure-pipelines/azure-pipelines-win.yml @@ -8,23 +8,17 @@ jobs: vmImage: windows-2022 strategy: matrix: - win_64_python3.10.____cpythonpython_implcpython: - CONFIG: win_64_python3.10.____cpythonpython_implcpython + win_64_python3.10.____cpython: + CONFIG: win_64_python3.10.____cpython UPLOAD_PACKAGES: 'True' - win_64_python3.11.____cpythonpython_implcpython: - CONFIG: win_64_python3.11.____cpythonpython_implcpython + win_64_python3.11.____cpython: + CONFIG: win_64_python3.11.____cpython UPLOAD_PACKAGES: 'True' - win_64_python3.12.____cpythonpython_implcpython: - CONFIG: win_64_python3.12.____cpythonpython_implcpython + win_64_python3.12.____cpython: + CONFIG: win_64_python3.12.____cpython UPLOAD_PACKAGES: 'True' - win_64_python3.8.____cpythonpython_implcpython: - CONFIG: win_64_python3.8.____cpythonpython_implcpython - UPLOAD_PACKAGES: 'True' - win_64_python3.9.____73_pypypython_implpypy: - CONFIG: win_64_python3.9.____73_pypypython_implpypy - UPLOAD_PACKAGES: 'True' - win_64_python3.9.____cpythonpython_implcpython: - CONFIG: win_64_python3.9.____cpythonpython_implcpython + win_64_python3.9.____cpython: + CONFIG: win_64_python3.9.____cpython UPLOAD_PACKAGES: 'True' timeoutInMinutes: 360 variables: @@ -39,7 +33,7 @@ jobs: scriptSource: inline script: | import urllib.request - url = 'https://github.com/conda-forge/miniforge/releases/latest/download/Mambaforge-Windows-x86_64.exe' + url = 'https://github.com/conda-forge/miniforge/releases/latest/download/Miniforge3-Windows-x86_64.exe' path = r"$(Build.ArtifactStagingDirectory)/Miniforge.exe" urllib.request.urlretrieve(url, path) diff --git a/.ci_support/linux_64_python3.10.____cpythonpython_implcpython.yaml b/.ci_support/linux_64_python3.10.____cpython.yaml similarity index 84% rename from .ci_support/linux_64_python3.10.____cpythonpython_implcpython.yaml rename to .ci_support/linux_64_python3.10.____cpython.yaml index e526f6d..94b9ef0 100644 --- a/.ci_support/linux_64_python3.10.____cpythonpython_implcpython.yaml +++ b/.ci_support/linux_64_python3.10.____cpython.yaml @@ -1,9 +1,13 @@ c_compiler: - gcc c_compiler_version: -- '12' +- '13' +c_stdlib: +- sysroot +c_stdlib_version: +- '2.17' cdt_name: -- cos6 +- cos7 channel_sources: - conda-forge channel_targets: @@ -11,7 +15,7 @@ channel_targets: cxx_compiler: - gxx cxx_compiler_version: -- '12' +- '13' docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 libabseil: @@ -37,5 +41,7 @@ tinyxml2: zip_keys: - - c_compiler_version - cxx_compiler_version +- - c_stdlib_version + - cdt_name - - python - python_impl diff --git a/.ci_support/linux_64_python3.11.____cpythonpython_implcpython.yaml b/.ci_support/linux_64_python3.11.____cpython.yaml similarity index 84% rename from .ci_support/linux_64_python3.11.____cpythonpython_implcpython.yaml rename to .ci_support/linux_64_python3.11.____cpython.yaml index ac233d8..49bfcac 100644 --- a/.ci_support/linux_64_python3.11.____cpythonpython_implcpython.yaml +++ b/.ci_support/linux_64_python3.11.____cpython.yaml @@ -1,9 +1,13 @@ c_compiler: - gcc c_compiler_version: -- '12' +- '13' +c_stdlib: +- sysroot +c_stdlib_version: +- '2.17' cdt_name: -- cos6 +- cos7 channel_sources: - conda-forge channel_targets: @@ -11,7 +15,7 @@ channel_targets: cxx_compiler: - gxx cxx_compiler_version: -- '12' +- '13' docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 libabseil: @@ -37,5 +41,7 @@ tinyxml2: zip_keys: - - c_compiler_version - cxx_compiler_version +- - c_stdlib_version + - cdt_name - - python - python_impl diff --git a/.ci_support/linux_64_python3.12.____cpythonpython_implcpython.yaml b/.ci_support/linux_64_python3.12.____cpython.yaml similarity index 84% rename from .ci_support/linux_64_python3.12.____cpythonpython_implcpython.yaml rename to .ci_support/linux_64_python3.12.____cpython.yaml index 43accc2..b25bfb9 100644 --- a/.ci_support/linux_64_python3.12.____cpythonpython_implcpython.yaml +++ b/.ci_support/linux_64_python3.12.____cpython.yaml @@ -1,9 +1,13 @@ c_compiler: - gcc c_compiler_version: -- '12' +- '13' +c_stdlib: +- sysroot +c_stdlib_version: +- '2.17' cdt_name: -- cos6 +- cos7 channel_sources: - conda-forge channel_targets: @@ -11,7 +15,7 @@ channel_targets: cxx_compiler: - gxx cxx_compiler_version: -- '12' +- '13' docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 libabseil: @@ -37,5 +41,7 @@ tinyxml2: zip_keys: - - c_compiler_version - cxx_compiler_version +- - c_stdlib_version + - cdt_name - - python - python_impl diff --git a/.ci_support/linux_64_python3.8.____cpythonpython_implcpython.yaml b/.ci_support/linux_64_python3.8.____cpythonpython_implcpython.yaml deleted file mode 100644 index de60ee0..0000000 --- a/.ci_support/linux_64_python3.8.____cpythonpython_implcpython.yaml +++ /dev/null @@ -1,41 +0,0 @@ -c_compiler: -- gcc -c_compiler_version: -- '12' -cdt_name: -- cos6 -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 -libabseil: -- '20240116' -libprotobuf: -- 4.25.3 -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -pybind11_abi: -- '4' -python: -- 3.8.* *_cpython -python_impl: -- cpython -qt_main: -- '5.15' -target_platform: -- linux-64 -tinyxml2: -- '10' -zip_keys: -- - c_compiler_version - - cxx_compiler_version -- - python - - python_impl diff --git a/.ci_support/linux_64_python3.9.____73_pypypython_implpypy.yaml b/.ci_support/linux_64_python3.9.____73_pypypython_implpypy.yaml deleted file mode 100644 index 8389245..0000000 --- a/.ci_support/linux_64_python3.9.____73_pypypython_implpypy.yaml +++ /dev/null @@ -1,41 +0,0 @@ -c_compiler: -- gcc -c_compiler_version: -- '12' -cdt_name: -- cos6 -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 -libabseil: -- '20240116' -libprotobuf: -- 4.25.3 -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -pybind11_abi: -- '4' -python: -- 3.9.* *_73_pypy -python_impl: -- pypy -qt_main: -- '5.15' -target_platform: -- linux-64 -tinyxml2: -- '10' -zip_keys: -- - c_compiler_version - - cxx_compiler_version -- - python - - python_impl diff --git a/.ci_support/linux_64_python3.9.____cpythonpython_implcpython.yaml b/.ci_support/linux_64_python3.9.____cpython.yaml similarity index 84% rename from .ci_support/linux_64_python3.9.____cpythonpython_implcpython.yaml rename to .ci_support/linux_64_python3.9.____cpython.yaml index c6125ce..c6af328 100644 --- a/.ci_support/linux_64_python3.9.____cpythonpython_implcpython.yaml +++ b/.ci_support/linux_64_python3.9.____cpython.yaml @@ -1,9 +1,13 @@ c_compiler: - gcc c_compiler_version: -- '12' +- '13' +c_stdlib: +- sysroot +c_stdlib_version: +- '2.17' cdt_name: -- cos6 +- cos7 channel_sources: - conda-forge channel_targets: @@ -11,7 +15,7 @@ channel_targets: cxx_compiler: - gxx cxx_compiler_version: -- '12' +- '13' docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 libabseil: @@ -37,5 +41,7 @@ tinyxml2: zip_keys: - - c_compiler_version - cxx_compiler_version +- - c_stdlib_version + - cdt_name - - python - python_impl diff --git a/.ci_support/linux_aarch64_python3.10.____cpythonpython_implcpython.yaml b/.ci_support/linux_aarch64_python3.10.____cpython.yaml similarity index 86% rename from .ci_support/linux_aarch64_python3.10.____cpythonpython_implcpython.yaml rename to .ci_support/linux_aarch64_python3.10.____cpython.yaml index 7848b20..0315a7f 100644 --- a/.ci_support/linux_aarch64_python3.10.____cpythonpython_implcpython.yaml +++ b/.ci_support/linux_aarch64_python3.10.____cpython.yaml @@ -3,7 +3,11 @@ BUILD: c_compiler: - gcc c_compiler_version: -- '12' +- '13' +c_stdlib: +- sysroot +c_stdlib_version: +- '2.17' cdt_arch: - aarch64 cdt_name: @@ -15,7 +19,7 @@ channel_targets: cxx_compiler: - gxx cxx_compiler_version: -- '12' +- '13' docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 libabseil: @@ -41,5 +45,7 @@ tinyxml2: zip_keys: - - c_compiler_version - cxx_compiler_version +- - c_stdlib_version + - cdt_name - - python - python_impl diff --git a/.ci_support/linux_aarch64_python3.11.____cpythonpython_implcpython.yaml b/.ci_support/linux_aarch64_python3.11.____cpython.yaml similarity index 86% rename from .ci_support/linux_aarch64_python3.11.____cpythonpython_implcpython.yaml rename to .ci_support/linux_aarch64_python3.11.____cpython.yaml index 0005cf3..1c71060 100644 --- a/.ci_support/linux_aarch64_python3.11.____cpythonpython_implcpython.yaml +++ b/.ci_support/linux_aarch64_python3.11.____cpython.yaml @@ -3,7 +3,11 @@ BUILD: c_compiler: - gcc c_compiler_version: -- '12' +- '13' +c_stdlib: +- sysroot +c_stdlib_version: +- '2.17' cdt_arch: - aarch64 cdt_name: @@ -15,7 +19,7 @@ channel_targets: cxx_compiler: - gxx cxx_compiler_version: -- '12' +- '13' docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 libabseil: @@ -41,5 +45,7 @@ tinyxml2: zip_keys: - - c_compiler_version - cxx_compiler_version +- - c_stdlib_version + - cdt_name - - python - python_impl diff --git a/.ci_support/linux_aarch64_python3.12.____cpythonpython_implcpython.yaml b/.ci_support/linux_aarch64_python3.12.____cpython.yaml similarity index 86% rename from .ci_support/linux_aarch64_python3.12.____cpythonpython_implcpython.yaml rename to .ci_support/linux_aarch64_python3.12.____cpython.yaml index de95368..c295774 100644 --- a/.ci_support/linux_aarch64_python3.12.____cpythonpython_implcpython.yaml +++ b/.ci_support/linux_aarch64_python3.12.____cpython.yaml @@ -3,7 +3,11 @@ BUILD: c_compiler: - gcc c_compiler_version: -- '12' +- '13' +c_stdlib: +- sysroot +c_stdlib_version: +- '2.17' cdt_arch: - aarch64 cdt_name: @@ -15,7 +19,7 @@ channel_targets: cxx_compiler: - gxx cxx_compiler_version: -- '12' +- '13' docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 libabseil: @@ -41,5 +45,7 @@ tinyxml2: zip_keys: - - c_compiler_version - cxx_compiler_version +- - c_stdlib_version + - cdt_name - - python - python_impl diff --git a/.ci_support/linux_aarch64_python3.8.____cpythonpython_implcpython.yaml b/.ci_support/linux_aarch64_python3.8.____cpythonpython_implcpython.yaml deleted file mode 100644 index 832245e..0000000 --- a/.ci_support/linux_aarch64_python3.8.____cpythonpython_implcpython.yaml +++ /dev/null @@ -1,45 +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 main -cxx_compiler: -- gxx -cxx_compiler_version: -- '12' -docker_image: -- quay.io/condaforge/linux-anvil-cos7-x86_64 -libabseil: -- '20240116' -libprotobuf: -- 4.25.3 -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -pybind11_abi: -- '4' -python: -- 3.8.* *_cpython -python_impl: -- cpython -qt_main: -- '5.15' -target_platform: -- linux-aarch64 -tinyxml2: -- '10' -zip_keys: -- - c_compiler_version - - cxx_compiler_version -- - python - - python_impl diff --git a/.ci_support/linux_aarch64_python3.9.____73_pypypython_implpypy.yaml b/.ci_support/linux_aarch64_python3.9.____73_pypypython_implpypy.yaml deleted file mode 100644 index c813523..0000000 --- a/.ci_support/linux_aarch64_python3.9.____73_pypypython_implpypy.yaml +++ /dev/null @@ -1,45 +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 main -cxx_compiler: -- gxx -cxx_compiler_version: -- '12' -docker_image: -- quay.io/condaforge/linux-anvil-cos7-x86_64 -libabseil: -- '20240116' -libprotobuf: -- 4.25.3 -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -pybind11_abi: -- '4' -python: -- 3.9.* *_73_pypy -python_impl: -- pypy -qt_main: -- '5.15' -target_platform: -- linux-aarch64 -tinyxml2: -- '10' -zip_keys: -- - c_compiler_version - - cxx_compiler_version -- - python - - python_impl diff --git a/.ci_support/linux_aarch64_python3.9.____cpythonpython_implcpython.yaml b/.ci_support/linux_aarch64_python3.9.____cpython.yaml similarity index 86% rename from .ci_support/linux_aarch64_python3.9.____cpythonpython_implcpython.yaml rename to .ci_support/linux_aarch64_python3.9.____cpython.yaml index 5e02a7d..2764603 100644 --- a/.ci_support/linux_aarch64_python3.9.____cpythonpython_implcpython.yaml +++ b/.ci_support/linux_aarch64_python3.9.____cpython.yaml @@ -3,7 +3,11 @@ BUILD: c_compiler: - gcc c_compiler_version: -- '12' +- '13' +c_stdlib: +- sysroot +c_stdlib_version: +- '2.17' cdt_arch: - aarch64 cdt_name: @@ -15,7 +19,7 @@ channel_targets: cxx_compiler: - gxx cxx_compiler_version: -- '12' +- '13' docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 libabseil: @@ -41,5 +45,7 @@ tinyxml2: zip_keys: - - c_compiler_version - cxx_compiler_version +- - c_stdlib_version + - cdt_name - - python - python_impl diff --git a/.ci_support/migrations/pypy38.yaml b/.ci_support/migrations/pypy38.yaml deleted file mode 100644 index 2dd1ff4..0000000 --- a/.ci_support/migrations/pypy38.yaml +++ /dev/null @@ -1,43 +0,0 @@ -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 - -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.20 # [not (osx and arm64)] - - 1.20 # [not (osx and arm64)] -python_impl: - - pypy # [not (osx and arm64)] - - pypy # [not (osx and arm64)] diff --git a/.ci_support/osx_64_python3.10.____cpythonpython_implcpython.yaml b/.ci_support/osx_64_python3.10.____cpython.yaml similarity index 88% rename from .ci_support/osx_64_python3.10.____cpythonpython_implcpython.yaml rename to .ci_support/osx_64_python3.10.____cpython.yaml index 3c6fc56..494fbb8 100644 --- a/.ci_support/osx_64_python3.10.____cpythonpython_implcpython.yaml +++ b/.ci_support/osx_64_python3.10.____cpython.yaml @@ -5,7 +5,11 @@ MACOSX_SDK_VERSION: c_compiler: - clang c_compiler_version: -- '16' +- '17' +c_stdlib: +- macosx_deployment_target +c_stdlib_version: +- '10.13' channel_sources: - conda-forge channel_targets: @@ -13,7 +17,7 @@ channel_targets: cxx_compiler: - clangxx cxx_compiler_version: -- '16' +- '17' libabseil: - '20240116' libprotobuf: diff --git a/.ci_support/osx_64_python3.11.____cpythonpython_implcpython.yaml b/.ci_support/osx_64_python3.11.____cpython.yaml similarity index 88% rename from .ci_support/osx_64_python3.11.____cpythonpython_implcpython.yaml rename to .ci_support/osx_64_python3.11.____cpython.yaml index 8fa0acd..bc9236b 100644 --- a/.ci_support/osx_64_python3.11.____cpythonpython_implcpython.yaml +++ b/.ci_support/osx_64_python3.11.____cpython.yaml @@ -5,7 +5,11 @@ MACOSX_SDK_VERSION: c_compiler: - clang c_compiler_version: -- '16' +- '17' +c_stdlib: +- macosx_deployment_target +c_stdlib_version: +- '10.13' channel_sources: - conda-forge channel_targets: @@ -13,7 +17,7 @@ channel_targets: cxx_compiler: - clangxx cxx_compiler_version: -- '16' +- '17' libabseil: - '20240116' libprotobuf: diff --git a/.ci_support/osx_64_python3.12.____cpythonpython_implcpython.yaml b/.ci_support/osx_64_python3.12.____cpython.yaml similarity index 88% rename from .ci_support/osx_64_python3.12.____cpythonpython_implcpython.yaml rename to .ci_support/osx_64_python3.12.____cpython.yaml index 14418c7..3d9cc51 100644 --- a/.ci_support/osx_64_python3.12.____cpythonpython_implcpython.yaml +++ b/.ci_support/osx_64_python3.12.____cpython.yaml @@ -5,7 +5,11 @@ MACOSX_SDK_VERSION: c_compiler: - clang c_compiler_version: -- '16' +- '17' +c_stdlib: +- macosx_deployment_target +c_stdlib_version: +- '10.13' channel_sources: - conda-forge channel_targets: @@ -13,7 +17,7 @@ channel_targets: cxx_compiler: - clangxx cxx_compiler_version: -- '16' +- '17' libabseil: - '20240116' libprotobuf: diff --git a/.ci_support/osx_64_python3.8.____cpythonpython_implcpython.yaml b/.ci_support/osx_64_python3.8.____cpythonpython_implcpython.yaml deleted file mode 100644 index 12ff283..0000000 --- a/.ci_support/osx_64_python3.8.____cpythonpython_implcpython.yaml +++ /dev/null @@ -1,43 +0,0 @@ -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 main -cxx_compiler: -- clangxx -cxx_compiler_version: -- '16' -libabseil: -- '20240116' -libprotobuf: -- 4.25.3 -macos_machine: -- x86_64-apple-darwin13.4.0 -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -pybind11_abi: -- '4' -python: -- 3.8.* *_cpython -python_impl: -- cpython -qt_main: -- '5.15' -target_platform: -- osx-64 -tinyxml2: -- '10' -zip_keys: -- - c_compiler_version - - cxx_compiler_version -- - python - - python_impl diff --git a/.ci_support/osx_64_python3.9.____73_pypypython_implpypy.yaml b/.ci_support/osx_64_python3.9.____73_pypypython_implpypy.yaml deleted file mode 100644 index 0e67eb0..0000000 --- a/.ci_support/osx_64_python3.9.____73_pypypython_implpypy.yaml +++ /dev/null @@ -1,43 +0,0 @@ -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 main -cxx_compiler: -- clangxx -cxx_compiler_version: -- '16' -libabseil: -- '20240116' -libprotobuf: -- 4.25.3 -macos_machine: -- x86_64-apple-darwin13.4.0 -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -pybind11_abi: -- '4' -python: -- 3.9.* *_73_pypy -python_impl: -- pypy -qt_main: -- '5.15' -target_platform: -- osx-64 -tinyxml2: -- '10' -zip_keys: -- - c_compiler_version - - cxx_compiler_version -- - python - - python_impl diff --git a/.ci_support/osx_64_python3.9.____cpythonpython_implcpython.yaml b/.ci_support/osx_64_python3.9.____cpython.yaml similarity index 88% rename from .ci_support/osx_64_python3.9.____cpythonpython_implcpython.yaml rename to .ci_support/osx_64_python3.9.____cpython.yaml index 0852fa4..ed804d9 100644 --- a/.ci_support/osx_64_python3.9.____cpythonpython_implcpython.yaml +++ b/.ci_support/osx_64_python3.9.____cpython.yaml @@ -5,7 +5,11 @@ MACOSX_SDK_VERSION: c_compiler: - clang c_compiler_version: -- '16' +- '17' +c_stdlib: +- macosx_deployment_target +c_stdlib_version: +- '10.13' channel_sources: - conda-forge channel_targets: @@ -13,7 +17,7 @@ channel_targets: cxx_compiler: - clangxx cxx_compiler_version: -- '16' +- '17' libabseil: - '20240116' libprotobuf: diff --git a/.ci_support/osx_arm64_python3.10.____cpython.yaml b/.ci_support/osx_arm64_python3.10.____cpython.yaml index f44fab9..8708560 100644 --- a/.ci_support/osx_arm64_python3.10.____cpython.yaml +++ b/.ci_support/osx_arm64_python3.10.____cpython.yaml @@ -5,7 +5,11 @@ MACOSX_SDK_VERSION: c_compiler: - clang c_compiler_version: -- '16' +- '17' +c_stdlib: +- macosx_deployment_target +c_stdlib_version: +- '11.0' channel_sources: - conda-forge channel_targets: @@ -13,7 +17,7 @@ channel_targets: cxx_compiler: - clangxx cxx_compiler_version: -- '16' +- '17' libabseil: - '20240116' libprotobuf: diff --git a/.ci_support/osx_arm64_python3.11.____cpython.yaml b/.ci_support/osx_arm64_python3.11.____cpython.yaml index c4099f4..66ad64a 100644 --- a/.ci_support/osx_arm64_python3.11.____cpython.yaml +++ b/.ci_support/osx_arm64_python3.11.____cpython.yaml @@ -5,7 +5,11 @@ MACOSX_SDK_VERSION: c_compiler: - clang c_compiler_version: -- '16' +- '17' +c_stdlib: +- macosx_deployment_target +c_stdlib_version: +- '11.0' channel_sources: - conda-forge channel_targets: @@ -13,7 +17,7 @@ channel_targets: cxx_compiler: - clangxx cxx_compiler_version: -- '16' +- '17' libabseil: - '20240116' libprotobuf: diff --git a/.ci_support/osx_arm64_python3.12.____cpython.yaml b/.ci_support/osx_arm64_python3.12.____cpython.yaml index 68ab9a8..c86ff90 100644 --- a/.ci_support/osx_arm64_python3.12.____cpython.yaml +++ b/.ci_support/osx_arm64_python3.12.____cpython.yaml @@ -5,7 +5,11 @@ MACOSX_SDK_VERSION: c_compiler: - clang c_compiler_version: -- '16' +- '17' +c_stdlib: +- macosx_deployment_target +c_stdlib_version: +- '11.0' channel_sources: - conda-forge channel_targets: @@ -13,7 +17,7 @@ channel_targets: cxx_compiler: - clangxx cxx_compiler_version: -- '16' +- '17' libabseil: - '20240116' libprotobuf: 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 62d3ac4..0000000 --- a/.ci_support/osx_arm64_python3.8.____cpython.yaml +++ /dev/null @@ -1,43 +0,0 @@ -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 main -cxx_compiler: -- clangxx -cxx_compiler_version: -- '16' -libabseil: -- '20240116' -libprotobuf: -- 4.25.3 -macos_machine: -- arm64-apple-darwin20.0.0 -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -pybind11_abi: -- '4' -python: -- 3.8.* *_cpython -python_impl: -- cpython -qt_main: -- '5.15' -target_platform: -- osx-arm64 -tinyxml2: -- '10' -zip_keys: -- - c_compiler_version - - cxx_compiler_version -- - python - - python_impl diff --git a/.ci_support/osx_arm64_python3.9.____cpython.yaml b/.ci_support/osx_arm64_python3.9.____cpython.yaml index 5279f37..d690e0f 100644 --- a/.ci_support/osx_arm64_python3.9.____cpython.yaml +++ b/.ci_support/osx_arm64_python3.9.____cpython.yaml @@ -5,7 +5,11 @@ MACOSX_SDK_VERSION: c_compiler: - clang c_compiler_version: -- '16' +- '17' +c_stdlib: +- macosx_deployment_target +c_stdlib_version: +- '11.0' channel_sources: - conda-forge channel_targets: @@ -13,7 +17,7 @@ channel_targets: cxx_compiler: - clangxx cxx_compiler_version: -- '16' +- '17' libabseil: - '20240116' libprotobuf: diff --git a/.ci_support/win_64_python3.10.____cpythonpython_implcpython.yaml b/.ci_support/win_64_python3.10.____cpython.yaml similarity index 96% rename from .ci_support/win_64_python3.10.____cpythonpython_implcpython.yaml rename to .ci_support/win_64_python3.10.____cpython.yaml index 6a90601..c6d4f87 100644 --- a/.ci_support/win_64_python3.10.____cpythonpython_implcpython.yaml +++ b/.ci_support/win_64_python3.10.____cpython.yaml @@ -1,5 +1,7 @@ c_compiler: - vs2019 +c_stdlib: +- vs channel_sources: - conda-forge channel_targets: diff --git a/.ci_support/win_64_python3.11.____cpythonpython_implcpython.yaml b/.ci_support/win_64_python3.11.____cpython.yaml similarity index 96% rename from .ci_support/win_64_python3.11.____cpythonpython_implcpython.yaml rename to .ci_support/win_64_python3.11.____cpython.yaml index 6ed1dd1..77a12ce 100644 --- a/.ci_support/win_64_python3.11.____cpythonpython_implcpython.yaml +++ b/.ci_support/win_64_python3.11.____cpython.yaml @@ -1,5 +1,7 @@ c_compiler: - vs2019 +c_stdlib: +- vs channel_sources: - conda-forge channel_targets: diff --git a/.ci_support/win_64_python3.12.____cpythonpython_implcpython.yaml b/.ci_support/win_64_python3.12.____cpython.yaml similarity index 96% rename from .ci_support/win_64_python3.12.____cpythonpython_implcpython.yaml rename to .ci_support/win_64_python3.12.____cpython.yaml index 5a113ab..550ee66 100644 --- a/.ci_support/win_64_python3.12.____cpythonpython_implcpython.yaml +++ b/.ci_support/win_64_python3.12.____cpython.yaml @@ -1,5 +1,7 @@ c_compiler: - vs2019 +c_stdlib: +- vs channel_sources: - conda-forge channel_targets: diff --git a/.ci_support/win_64_python3.8.____cpythonpython_implcpython.yaml b/.ci_support/win_64_python3.8.____cpythonpython_implcpython.yaml deleted file mode 100644 index 8fb6129..0000000 --- a/.ci_support/win_64_python3.8.____cpythonpython_implcpython.yaml +++ /dev/null @@ -1,31 +0,0 @@ -c_compiler: -- vs2019 -channel_sources: -- conda-forge -channel_targets: -- conda-forge main -cxx_compiler: -- vs2019 -libabseil: -- '20240116' -libprotobuf: -- 4.25.3 -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -pybind11_abi: -- '4' -python: -- 3.8.* *_cpython -python_impl: -- cpython -qt_main: -- '5.15' -target_platform: -- win-64 -tinyxml2: -- '10' -zip_keys: -- - python - - python_impl diff --git a/.ci_support/win_64_python3.9.____73_pypypython_implpypy.yaml b/.ci_support/win_64_python3.9.____73_pypypython_implpypy.yaml deleted file mode 100644 index 0593e7c..0000000 --- a/.ci_support/win_64_python3.9.____73_pypypython_implpypy.yaml +++ /dev/null @@ -1,31 +0,0 @@ -c_compiler: -- vs2019 -channel_sources: -- conda-forge -channel_targets: -- conda-forge main -cxx_compiler: -- vs2019 -libabseil: -- '20240116' -libprotobuf: -- 4.25.3 -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -pybind11_abi: -- '4' -python: -- 3.9.* *_73_pypy -python_impl: -- pypy -qt_main: -- '5.15' -target_platform: -- win-64 -tinyxml2: -- '10' -zip_keys: -- - python - - python_impl diff --git a/.ci_support/win_64_python3.9.____cpythonpython_implcpython.yaml b/.ci_support/win_64_python3.9.____cpython.yaml similarity index 96% rename from .ci_support/win_64_python3.9.____cpythonpython_implcpython.yaml rename to .ci_support/win_64_python3.9.____cpython.yaml index 978f1ab..c560d6d 100644 --- a/.ci_support/win_64_python3.9.____cpythonpython_implcpython.yaml +++ b/.ci_support/win_64_python3.9.____cpython.yaml @@ -1,5 +1,7 @@ c_compiler: - vs2019 +c_stdlib: +- vs channel_sources: - conda-forge channel_targets: diff --git a/.scripts/build_steps.sh b/.scripts/build_steps.sh index f42ebe5..8307fca 100755 --- a/.scripts/build_steps.sh +++ b/.scripts/build_steps.sh @@ -43,13 +43,19 @@ setup_conda_rc "${FEEDSTOCK_ROOT}" "${RECIPE_ROOT}" "${CONFIG_FILE}" source run_conda_forge_build_setup +( +# Due to https://bugzilla.redhat.com/show_bug.cgi?id=1537564 old versions of rpm +# are drastically slowed down when the number of file descriptors is very high. +# This can be visible during a `yum install` step of a feedstock build. +# => Set a lower limit in a subshell for the `yum install`s only. +ulimit -n 1024 # Install the yum requirements defined canonically in the # "recipe/yum_requirements.txt" file. After updating that file, # run "conda smithy rerender" and this line will be updated # automatically. /usr/bin/sudo -n yum install -y mesa-libGL mesa-dri-drivers libselinux libXdamage libXxf86vm libXext - +) # make the build number clobber make_build_number "${FEEDSTOCK_ROOT}" "${RECIPE_ROOT}" "${CONFIG_FILE}" @@ -80,6 +86,12 @@ 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..420f051 100755 --- a/.scripts/run_osx_build.sh +++ b/.scripts/run_osx_build.sh @@ -11,7 +11,7 @@ MINIFORGE_HOME=${MINIFORGE_HOME:-${HOME}/miniforge3} ( startgroup "Installing a fresh version of Miniforge" ) 2> /dev/null MINIFORGE_URL="https://github.com/conda-forge/miniforge/releases/latest/download" -MINIFORGE_FILE="Mambaforge-MacOSX-$(uname -m).sh" +MINIFORGE_FILE="Miniforge3-MacOSX-$(uname -m).sh" curl -L -O "${MINIFORGE_URL}/${MINIFORGE_FILE}" rm -rf ${MINIFORGE_HOME} bash $MINIFORGE_FILE -b -p ${MINIFORGE_HOME} @@ -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 6d54697..a45c34f 100755 --- a/.scripts/run_win_build.bat +++ b/.scripts/run_win_build.bat @@ -24,7 +24,7 @@ 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 +mamba.exe install 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 @@ -48,7 +48,7 @@ if NOT [%HOST_PLATFORM%] == [%BUILD_PLATFORM%] ( ) 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%" + set "EXTRA_CB_OPTIONS=%EXTRA_CB_OPTIONS% --extra-meta flow_run_id=%flow_run_id% remote_url=%remote_url% sha=%sha%" ) call :end_group @@ -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:*/=%" diff --git a/README.md b/README.md index 00ec203..feb3a28 100644 --- a/README.md +++ b/README.md @@ -27,129 +27,87 @@ Current build status
Variant | Status | |
---|---|---|
linux_64_python3.10.____cpythonpython_implcpython | +linux_64_python3.10.____cpython | - + |
linux_64_python3.11.____cpythonpython_implcpython | +linux_64_python3.11.____cpython | - + |
linux_64_python3.12.____cpythonpython_implcpython | +linux_64_python3.12.____cpython | - + |
linux_64_python3.8.____cpythonpython_implcpython | +linux_64_python3.9.____cpython | - + |
linux_64_python3.9.____73_pypypython_implpypy | +linux_aarch64_python3.10.____cpython | - + |
linux_64_python3.9.____cpythonpython_implcpython | +linux_aarch64_python3.11.____cpython | - + |
linux_aarch64_python3.10.____cpythonpython_implcpython | +linux_aarch64_python3.12.____cpython | - + |
linux_aarch64_python3.11.____cpythonpython_implcpython | +linux_aarch64_python3.9.____cpython | - + |
linux_aarch64_python3.12.____cpythonpython_implcpython | +osx_64_python3.10.____cpython | - + |
linux_aarch64_python3.8.____cpythonpython_implcpython | +osx_64_python3.11.____cpython | - + |
linux_aarch64_python3.9.____73_pypypython_implpypy | +osx_64_python3.12.____cpython | - + |
linux_aarch64_python3.9.____cpythonpython_implcpython | +osx_64_python3.9.____cpython | - - - | -
osx_64_python3.10.____cpythonpython_implcpython | -- - - - | -|
osx_64_python3.11.____cpythonpython_implcpython | -- - - - | -|
osx_64_python3.12.____cpythonpython_implcpython | -- - - - | -|
osx_64_python3.8.____cpythonpython_implcpython | -- - - - | -|
osx_64_python3.9.____73_pypypython_implpypy | -- - - - | -|
osx_64_python3.9.____cpythonpython_implcpython | -- - + | |
osx_arm64_python3.8.____cpython | -- - - - | |
osx_arm64_python3.9.____cpython | @@ -188,45 +139,31 @@ Current build status | |
win_64_python3.10.____cpythonpython_implcpython | -- - - - | -|
win_64_python3.11.____cpythonpython_implcpython | -- - - - | -|
win_64_python3.12.____cpythonpython_implcpython | +win_64_python3.10.____cpython | - + |
win_64_python3.8.____cpythonpython_implcpython | +win_64_python3.11.____cpython | - + |
win_64_python3.9.____73_pypypython_implpypy | +win_64_python3.12.____cpython | - + |
win_64_python3.9.____cpythonpython_implcpython | +win_64_python3.9.____cpython | - + |