From 66123ff9b693d4a24a75b8a5002f2eaa2ac5f51c Mon Sep 17 00:00:00 2001 From: "conda-forge-webservices[bot]" <121827174+conda-forge-webservices[bot]@users.noreply.github.com> Date: Sat, 24 Aug 2024 10:23:52 +0000 Subject: [PATCH 01/11] dummy commit for rerendering --- README.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/README.md b/README.md index 00ec203..b391f73 100644 --- a/README.md +++ b/README.md @@ -364,3 +364,6 @@ Feedstock Maintainers * [@traversaro](https://github.com/traversaro/) * [@wolfv](https://github.com/wolfv/) + + + From 995f59cfd81328a1be45e0862c208869c65eee38 Mon Sep 17 00:00:00 2001 From: "conda-forge-webservices[bot]" <91080706+conda-forge-webservices[bot]@users.noreply.github.com> Date: Sat, 24 Aug 2024 10:25:47 +0000 Subject: [PATCH 02/11] MNT: Re-rendered with conda-build 24.7.1, conda-smithy 3.39.0, and conda-forge-pinning 2024.08.23.18.51.20 --- .azure-pipelines/azure-pipelines-win.yml | 2 +- ..._python3.10.____cpythonpython_implcpython.yaml | 6 +++--- ..._python3.11.____cpythonpython_implcpython.yaml | 6 +++--- ..._python3.12.____cpythonpython_implcpython.yaml | 6 +++--- ...4_python3.8.____cpythonpython_implcpython.yaml | 6 +++--- ...x_64_python3.9.____73_pypypython_implpypy.yaml | 6 +++--- ...4_python3.9.____cpythonpython_implcpython.yaml | 6 +++--- ..._python3.10.____cpythonpython_implcpython.yaml | 4 ++-- ..._python3.11.____cpythonpython_implcpython.yaml | 4 ++-- ..._python3.12.____cpythonpython_implcpython.yaml | 4 ++-- ...4_python3.8.____cpythonpython_implcpython.yaml | 4 ++-- ...ch64_python3.9.____73_pypypython_implpypy.yaml | 4 ++-- ...4_python3.9.____cpythonpython_implcpython.yaml | 4 ++-- ..._python3.10.____cpythonpython_implcpython.yaml | 4 ++-- ..._python3.11.____cpythonpython_implcpython.yaml | 4 ++-- ..._python3.12.____cpythonpython_implcpython.yaml | 4 ++-- ...4_python3.8.____cpythonpython_implcpython.yaml | 4 ++-- ...x_64_python3.9.____73_pypypython_implpypy.yaml | 4 ++-- ...4_python3.9.____cpythonpython_implcpython.yaml | 4 ++-- .ci_support/osx_arm64_python3.10.____cpython.yaml | 4 ++-- .ci_support/osx_arm64_python3.11.____cpython.yaml | 4 ++-- .ci_support/osx_arm64_python3.12.____cpython.yaml | 4 ++-- .ci_support/osx_arm64_python3.8.____cpython.yaml | 4 ++-- .ci_support/osx_arm64_python3.9.____cpython.yaml | 4 ++-- .scripts/build_steps.sh | 15 ++++++++++++++- .scripts/run_osx_build.sh | 9 ++++++++- .scripts/run_win_build.bat | 5 +++++ README.md | 3 --- build-locally.py | 4 ++-- 29 files changed, 82 insertions(+), 60 deletions(-) diff --git a/.azure-pipelines/azure-pipelines-win.yml b/.azure-pipelines/azure-pipelines-win.yml index 910bbae..aec5521 100755 --- a/.azure-pipelines/azure-pipelines-win.yml +++ b/.azure-pipelines/azure-pipelines-win.yml @@ -39,7 +39,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.____cpythonpython_implcpython.yaml index e526f6d..e8f0559 100644 --- a/.ci_support/linux_64_python3.10.____cpythonpython_implcpython.yaml +++ b/.ci_support/linux_64_python3.10.____cpythonpython_implcpython.yaml @@ -1,9 +1,9 @@ c_compiler: - gcc c_compiler_version: -- '12' +- '13' cdt_name: -- cos6 +- cos7 channel_sources: - conda-forge channel_targets: @@ -11,7 +11,7 @@ channel_targets: cxx_compiler: - gxx cxx_compiler_version: -- '12' +- '13' docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 libabseil: diff --git a/.ci_support/linux_64_python3.11.____cpythonpython_implcpython.yaml b/.ci_support/linux_64_python3.11.____cpythonpython_implcpython.yaml index ac233d8..09b0a05 100644 --- a/.ci_support/linux_64_python3.11.____cpythonpython_implcpython.yaml +++ b/.ci_support/linux_64_python3.11.____cpythonpython_implcpython.yaml @@ -1,9 +1,9 @@ c_compiler: - gcc c_compiler_version: -- '12' +- '13' cdt_name: -- cos6 +- cos7 channel_sources: - conda-forge channel_targets: @@ -11,7 +11,7 @@ channel_targets: cxx_compiler: - gxx cxx_compiler_version: -- '12' +- '13' docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 libabseil: diff --git a/.ci_support/linux_64_python3.12.____cpythonpython_implcpython.yaml b/.ci_support/linux_64_python3.12.____cpythonpython_implcpython.yaml index 43accc2..19e44f3 100644 --- a/.ci_support/linux_64_python3.12.____cpythonpython_implcpython.yaml +++ b/.ci_support/linux_64_python3.12.____cpythonpython_implcpython.yaml @@ -1,9 +1,9 @@ c_compiler: - gcc c_compiler_version: -- '12' +- '13' cdt_name: -- cos6 +- cos7 channel_sources: - conda-forge channel_targets: @@ -11,7 +11,7 @@ channel_targets: cxx_compiler: - gxx cxx_compiler_version: -- '12' +- '13' docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 libabseil: diff --git a/.ci_support/linux_64_python3.8.____cpythonpython_implcpython.yaml b/.ci_support/linux_64_python3.8.____cpythonpython_implcpython.yaml index de60ee0..d33d7c1 100644 --- a/.ci_support/linux_64_python3.8.____cpythonpython_implcpython.yaml +++ b/.ci_support/linux_64_python3.8.____cpythonpython_implcpython.yaml @@ -1,9 +1,9 @@ c_compiler: - gcc c_compiler_version: -- '12' +- '13' cdt_name: -- cos6 +- cos7 channel_sources: - conda-forge channel_targets: @@ -11,7 +11,7 @@ channel_targets: cxx_compiler: - gxx cxx_compiler_version: -- '12' +- '13' docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 libabseil: diff --git a/.ci_support/linux_64_python3.9.____73_pypypython_implpypy.yaml b/.ci_support/linux_64_python3.9.____73_pypypython_implpypy.yaml index 8389245..2a8100a 100644 --- a/.ci_support/linux_64_python3.9.____73_pypypython_implpypy.yaml +++ b/.ci_support/linux_64_python3.9.____73_pypypython_implpypy.yaml @@ -1,9 +1,9 @@ c_compiler: - gcc c_compiler_version: -- '12' +- '13' cdt_name: -- cos6 +- cos7 channel_sources: - conda-forge channel_targets: @@ -11,7 +11,7 @@ channel_targets: cxx_compiler: - gxx cxx_compiler_version: -- '12' +- '13' docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 libabseil: diff --git a/.ci_support/linux_64_python3.9.____cpythonpython_implcpython.yaml b/.ci_support/linux_64_python3.9.____cpythonpython_implcpython.yaml index c6125ce..005b3d3 100644 --- a/.ci_support/linux_64_python3.9.____cpythonpython_implcpython.yaml +++ b/.ci_support/linux_64_python3.9.____cpythonpython_implcpython.yaml @@ -1,9 +1,9 @@ c_compiler: - gcc c_compiler_version: -- '12' +- '13' cdt_name: -- cos6 +- cos7 channel_sources: - conda-forge channel_targets: @@ -11,7 +11,7 @@ channel_targets: cxx_compiler: - gxx cxx_compiler_version: -- '12' +- '13' docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 libabseil: diff --git a/.ci_support/linux_aarch64_python3.10.____cpythonpython_implcpython.yaml b/.ci_support/linux_aarch64_python3.10.____cpythonpython_implcpython.yaml index 7848b20..725d3bd 100644 --- a/.ci_support/linux_aarch64_python3.10.____cpythonpython_implcpython.yaml +++ b/.ci_support/linux_aarch64_python3.10.____cpythonpython_implcpython.yaml @@ -3,7 +3,7 @@ BUILD: c_compiler: - gcc c_compiler_version: -- '12' +- '13' cdt_arch: - aarch64 cdt_name: @@ -15,7 +15,7 @@ channel_targets: cxx_compiler: - gxx cxx_compiler_version: -- '12' +- '13' docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 libabseil: diff --git a/.ci_support/linux_aarch64_python3.11.____cpythonpython_implcpython.yaml b/.ci_support/linux_aarch64_python3.11.____cpythonpython_implcpython.yaml index 0005cf3..a46039a 100644 --- a/.ci_support/linux_aarch64_python3.11.____cpythonpython_implcpython.yaml +++ b/.ci_support/linux_aarch64_python3.11.____cpythonpython_implcpython.yaml @@ -3,7 +3,7 @@ BUILD: c_compiler: - gcc c_compiler_version: -- '12' +- '13' cdt_arch: - aarch64 cdt_name: @@ -15,7 +15,7 @@ channel_targets: cxx_compiler: - gxx cxx_compiler_version: -- '12' +- '13' docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 libabseil: diff --git a/.ci_support/linux_aarch64_python3.12.____cpythonpython_implcpython.yaml b/.ci_support/linux_aarch64_python3.12.____cpythonpython_implcpython.yaml index de95368..9423f73 100644 --- a/.ci_support/linux_aarch64_python3.12.____cpythonpython_implcpython.yaml +++ b/.ci_support/linux_aarch64_python3.12.____cpythonpython_implcpython.yaml @@ -3,7 +3,7 @@ BUILD: c_compiler: - gcc c_compiler_version: -- '12' +- '13' cdt_arch: - aarch64 cdt_name: @@ -15,7 +15,7 @@ channel_targets: cxx_compiler: - gxx cxx_compiler_version: -- '12' +- '13' docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 libabseil: diff --git a/.ci_support/linux_aarch64_python3.8.____cpythonpython_implcpython.yaml b/.ci_support/linux_aarch64_python3.8.____cpythonpython_implcpython.yaml index 832245e..5fc6ed1 100644 --- a/.ci_support/linux_aarch64_python3.8.____cpythonpython_implcpython.yaml +++ b/.ci_support/linux_aarch64_python3.8.____cpythonpython_implcpython.yaml @@ -3,7 +3,7 @@ BUILD: c_compiler: - gcc c_compiler_version: -- '12' +- '13' cdt_arch: - aarch64 cdt_name: @@ -15,7 +15,7 @@ channel_targets: cxx_compiler: - gxx cxx_compiler_version: -- '12' +- '13' docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 libabseil: diff --git a/.ci_support/linux_aarch64_python3.9.____73_pypypython_implpypy.yaml b/.ci_support/linux_aarch64_python3.9.____73_pypypython_implpypy.yaml index c813523..efcbd79 100644 --- a/.ci_support/linux_aarch64_python3.9.____73_pypypython_implpypy.yaml +++ b/.ci_support/linux_aarch64_python3.9.____73_pypypython_implpypy.yaml @@ -3,7 +3,7 @@ BUILD: c_compiler: - gcc c_compiler_version: -- '12' +- '13' cdt_arch: - aarch64 cdt_name: @@ -15,7 +15,7 @@ channel_targets: cxx_compiler: - gxx cxx_compiler_version: -- '12' +- '13' docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 libabseil: diff --git a/.ci_support/linux_aarch64_python3.9.____cpythonpython_implcpython.yaml b/.ci_support/linux_aarch64_python3.9.____cpythonpython_implcpython.yaml index 5e02a7d..6ecfe3f 100644 --- a/.ci_support/linux_aarch64_python3.9.____cpythonpython_implcpython.yaml +++ b/.ci_support/linux_aarch64_python3.9.____cpythonpython_implcpython.yaml @@ -3,7 +3,7 @@ BUILD: c_compiler: - gcc c_compiler_version: -- '12' +- '13' cdt_arch: - aarch64 cdt_name: @@ -15,7 +15,7 @@ channel_targets: cxx_compiler: - gxx cxx_compiler_version: -- '12' +- '13' docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 libabseil: diff --git a/.ci_support/osx_64_python3.10.____cpythonpython_implcpython.yaml b/.ci_support/osx_64_python3.10.____cpythonpython_implcpython.yaml index 3c6fc56..3334d59 100644 --- a/.ci_support/osx_64_python3.10.____cpythonpython_implcpython.yaml +++ b/.ci_support/osx_64_python3.10.____cpythonpython_implcpython.yaml @@ -5,7 +5,7 @@ MACOSX_SDK_VERSION: c_compiler: - clang c_compiler_version: -- '16' +- '17' channel_sources: - conda-forge channel_targets: @@ -13,7 +13,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.____cpythonpython_implcpython.yaml index 8fa0acd..7d15028 100644 --- a/.ci_support/osx_64_python3.11.____cpythonpython_implcpython.yaml +++ b/.ci_support/osx_64_python3.11.____cpythonpython_implcpython.yaml @@ -5,7 +5,7 @@ MACOSX_SDK_VERSION: c_compiler: - clang c_compiler_version: -- '16' +- '17' channel_sources: - conda-forge channel_targets: @@ -13,7 +13,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.____cpythonpython_implcpython.yaml index 14418c7..98298ad 100644 --- a/.ci_support/osx_64_python3.12.____cpythonpython_implcpython.yaml +++ b/.ci_support/osx_64_python3.12.____cpythonpython_implcpython.yaml @@ -5,7 +5,7 @@ MACOSX_SDK_VERSION: c_compiler: - clang c_compiler_version: -- '16' +- '17' channel_sources: - conda-forge channel_targets: @@ -13,7 +13,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 index 12ff283..ee01eaa 100644 --- a/.ci_support/osx_64_python3.8.____cpythonpython_implcpython.yaml +++ b/.ci_support/osx_64_python3.8.____cpythonpython_implcpython.yaml @@ -5,7 +5,7 @@ MACOSX_SDK_VERSION: c_compiler: - clang c_compiler_version: -- '16' +- '17' channel_sources: - conda-forge channel_targets: @@ -13,7 +13,7 @@ channel_targets: cxx_compiler: - clangxx cxx_compiler_version: -- '16' +- '17' libabseil: - '20240116' libprotobuf: diff --git a/.ci_support/osx_64_python3.9.____73_pypypython_implpypy.yaml b/.ci_support/osx_64_python3.9.____73_pypypython_implpypy.yaml index 0e67eb0..b8e06ee 100644 --- a/.ci_support/osx_64_python3.9.____73_pypypython_implpypy.yaml +++ b/.ci_support/osx_64_python3.9.____73_pypypython_implpypy.yaml @@ -5,7 +5,7 @@ MACOSX_SDK_VERSION: c_compiler: - clang c_compiler_version: -- '16' +- '17' channel_sources: - conda-forge channel_targets: @@ -13,7 +13,7 @@ channel_targets: cxx_compiler: - clangxx cxx_compiler_version: -- '16' +- '17' libabseil: - '20240116' libprotobuf: diff --git a/.ci_support/osx_64_python3.9.____cpythonpython_implcpython.yaml b/.ci_support/osx_64_python3.9.____cpythonpython_implcpython.yaml index 0852fa4..89b84be 100644 --- a/.ci_support/osx_64_python3.9.____cpythonpython_implcpython.yaml +++ b/.ci_support/osx_64_python3.9.____cpythonpython_implcpython.yaml @@ -5,7 +5,7 @@ MACOSX_SDK_VERSION: c_compiler: - clang c_compiler_version: -- '16' +- '17' channel_sources: - conda-forge channel_targets: @@ -13,7 +13,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..ccb845b 100644 --- a/.ci_support/osx_arm64_python3.10.____cpython.yaml +++ b/.ci_support/osx_arm64_python3.10.____cpython.yaml @@ -5,7 +5,7 @@ MACOSX_SDK_VERSION: c_compiler: - clang c_compiler_version: -- '16' +- '17' channel_sources: - conda-forge channel_targets: @@ -13,7 +13,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..d1587f4 100644 --- a/.ci_support/osx_arm64_python3.11.____cpython.yaml +++ b/.ci_support/osx_arm64_python3.11.____cpython.yaml @@ -5,7 +5,7 @@ MACOSX_SDK_VERSION: c_compiler: - clang c_compiler_version: -- '16' +- '17' channel_sources: - conda-forge channel_targets: @@ -13,7 +13,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..df15615 100644 --- a/.ci_support/osx_arm64_python3.12.____cpython.yaml +++ b/.ci_support/osx_arm64_python3.12.____cpython.yaml @@ -5,7 +5,7 @@ MACOSX_SDK_VERSION: c_compiler: - clang c_compiler_version: -- '16' +- '17' channel_sources: - conda-forge channel_targets: @@ -13,7 +13,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 index 62d3ac4..fa6048a 100644 --- a/.ci_support/osx_arm64_python3.8.____cpython.yaml +++ b/.ci_support/osx_arm64_python3.8.____cpython.yaml @@ -5,7 +5,7 @@ MACOSX_SDK_VERSION: c_compiler: - clang c_compiler_version: -- '16' +- '17' channel_sources: - conda-forge channel_targets: @@ -13,7 +13,7 @@ channel_targets: cxx_compiler: - clangxx cxx_compiler_version: -- '16' +- '17' libabseil: - '20240116' libprotobuf: diff --git a/.ci_support/osx_arm64_python3.9.____cpython.yaml b/.ci_support/osx_arm64_python3.9.____cpython.yaml index 5279f37..34bc1a7 100644 --- a/.ci_support/osx_arm64_python3.9.____cpython.yaml +++ b/.ci_support/osx_arm64_python3.9.____cpython.yaml @@ -5,7 +5,7 @@ MACOSX_SDK_VERSION: c_compiler: - clang c_compiler_version: -- '16' +- '17' channel_sources: - conda-forge channel_targets: @@ -13,7 +13,7 @@ channel_targets: cxx_compiler: - clangxx cxx_compiler_version: -- '16' +- '17' libabseil: - '20240116' libprotobuf: diff --git a/.scripts/build_steps.sh b/.scripts/build_steps.sh index f42ebe5..6488f2f 100755 --- a/.scripts/build_steps.sh +++ b/.scripts/build_steps.sh @@ -43,6 +43,12 @@ 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, @@ -51,7 +57,8 @@ source run_conda_forge_build_setup /usr/bin/sudo -n yum install -y mesa-libGL mesa-dri-drivers libselinux libXdamage libXxf86vm libXext -# make the build number clobber + +)# make the build number clobber make_build_number "${FEEDSTOCK_ROOT}" "${RECIPE_ROOT}" "${CONFIG_FILE}" if [[ "${HOST_PLATFORM}" != "${BUILD_PLATFORM}" ]] && [[ "${HOST_PLATFORM}" != linux-* ]] && [[ "${BUILD_WITH_CONDA_DEBUG:-0}" != 1 ]]; then @@ -80,6 +87,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..65650bf 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:*/=%" diff --git a/README.md b/README.md index b391f73..00ec203 100644 --- a/README.md +++ b/README.md @@ -364,6 +364,3 @@ Feedstock Maintainers * [@traversaro](https://github.com/traversaro/) * [@wolfv](https://github.com/wolfv/) - - - diff --git a/build-locally.py b/build-locally.py index e0d408d..d78427b 100755 --- a/build-locally.py +++ b/build-locally.py @@ -3,11 +3,11 @@ # This file has been generated by conda-smithy in order to build the recipe # locally. # -import os import glob +import os +import platform import subprocess from argparse import ArgumentParser -import platform def setup_environment(ns): From a6489fbbfa17abdf134eabf7379737f1229ad485 Mon Sep 17 00:00:00 2001 From: Silvio Traversaro Date: Sat, 24 Aug 2024 12:29:02 +0200 Subject: [PATCH 03/11] Bump version to 8.6.0 --- recipe/meta.yaml | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 8ce2361..c34f92d 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 = "8_8.6.0" %} {% set version_package = version.split('_')[1] %} {% set major_version = version.split('_')[0] %} {% set name = repo_name + major_version %} @@ -18,10 +18,9 @@ source: 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 +35,7 @@ outputs: requirements: build: - {{ compiler('c') }} + - {{ stdlib('c') }} - {{ compiler('cxx') }} - cmake - pkg-config @@ -79,7 +79,6 @@ outputs: # populated in the .ci_config/*.yaml files, for use in {build,install}-py.{sh,bat}. - python # [python_impl == "cpython"] - python # [python_impl == "pypy"] - - pip - pybind11 - pybind11-abi - xorg-libxfixes # [linux] @@ -102,6 +101,7 @@ outputs: requirements: build: - {{ compiler('c') }} + - {{ stdlib('c') }} - {{ compiler('cxx') }} - swig - ninja @@ -122,7 +122,6 @@ outputs: - {{ pin_subpackage(cxx_name, exact=True) }} - libgz-common5 - python - - pip - pybind11 - pybind11-abi - pytest From b737866297ecd5b5c4d3225f5f8d2ef9d513b46b Mon Sep 17 00:00:00 2001 From: "conda-forge-webservices[bot]" <91080706+conda-forge-webservices[bot]@users.noreply.github.com> Date: Sat, 24 Aug 2024 10:31:37 +0000 Subject: [PATCH 04/11] MNT: Re-rendered with conda-build 24.7.1, conda-smithy 3.39.0, and conda-forge-pinning 2024.08.23.18.51.20 --- .../linux_64_python3.10.____cpythonpython_implcpython.yaml | 6 ++++++ .../linux_64_python3.11.____cpythonpython_implcpython.yaml | 6 ++++++ .../linux_64_python3.12.____cpythonpython_implcpython.yaml | 6 ++++++ .../linux_64_python3.8.____cpythonpython_implcpython.yaml | 6 ++++++ .../linux_64_python3.9.____73_pypypython_implpypy.yaml | 6 ++++++ .../linux_64_python3.9.____cpythonpython_implcpython.yaml | 6 ++++++ ...ux_aarch64_python3.10.____cpythonpython_implcpython.yaml | 6 ++++++ ...ux_aarch64_python3.11.____cpythonpython_implcpython.yaml | 6 ++++++ ...ux_aarch64_python3.12.____cpythonpython_implcpython.yaml | 6 ++++++ ...nux_aarch64_python3.8.____cpythonpython_implcpython.yaml | 6 ++++++ .../linux_aarch64_python3.9.____73_pypypython_implpypy.yaml | 6 ++++++ ...nux_aarch64_python3.9.____cpythonpython_implcpython.yaml | 6 ++++++ .../osx_64_python3.10.____cpythonpython_implcpython.yaml | 4 ++++ .../osx_64_python3.11.____cpythonpython_implcpython.yaml | 4 ++++ .../osx_64_python3.12.____cpythonpython_implcpython.yaml | 4 ++++ .../osx_64_python3.8.____cpythonpython_implcpython.yaml | 4 ++++ .../osx_64_python3.9.____73_pypypython_implpypy.yaml | 4 ++++ .../osx_64_python3.9.____cpythonpython_implcpython.yaml | 4 ++++ .ci_support/osx_arm64_python3.10.____cpython.yaml | 4 ++++ .ci_support/osx_arm64_python3.11.____cpython.yaml | 4 ++++ .ci_support/osx_arm64_python3.12.____cpython.yaml | 4 ++++ .ci_support/osx_arm64_python3.8.____cpython.yaml | 4 ++++ .ci_support/osx_arm64_python3.9.____cpython.yaml | 4 ++++ .../win_64_python3.10.____cpythonpython_implcpython.yaml | 2 ++ .../win_64_python3.11.____cpythonpython_implcpython.yaml | 2 ++ .../win_64_python3.12.____cpythonpython_implcpython.yaml | 2 ++ .../win_64_python3.8.____cpythonpython_implcpython.yaml | 2 ++ .../win_64_python3.9.____73_pypypython_implpypy.yaml | 2 ++ .../win_64_python3.9.____cpythonpython_implcpython.yaml | 2 ++ 29 files changed, 128 insertions(+) diff --git a/.ci_support/linux_64_python3.10.____cpythonpython_implcpython.yaml b/.ci_support/linux_64_python3.10.____cpythonpython_implcpython.yaml index e8f0559..94b9ef0 100644 --- a/.ci_support/linux_64_python3.10.____cpythonpython_implcpython.yaml +++ b/.ci_support/linux_64_python3.10.____cpythonpython_implcpython.yaml @@ -2,6 +2,10 @@ c_compiler: - gcc c_compiler_version: - '13' +c_stdlib: +- sysroot +c_stdlib_version: +- '2.17' cdt_name: - cos7 channel_sources: @@ -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.____cpythonpython_implcpython.yaml index 09b0a05..49bfcac 100644 --- a/.ci_support/linux_64_python3.11.____cpythonpython_implcpython.yaml +++ b/.ci_support/linux_64_python3.11.____cpythonpython_implcpython.yaml @@ -2,6 +2,10 @@ c_compiler: - gcc c_compiler_version: - '13' +c_stdlib: +- sysroot +c_stdlib_version: +- '2.17' cdt_name: - cos7 channel_sources: @@ -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.____cpythonpython_implcpython.yaml index 19e44f3..b25bfb9 100644 --- a/.ci_support/linux_64_python3.12.____cpythonpython_implcpython.yaml +++ b/.ci_support/linux_64_python3.12.____cpythonpython_implcpython.yaml @@ -2,6 +2,10 @@ c_compiler: - gcc c_compiler_version: - '13' +c_stdlib: +- sysroot +c_stdlib_version: +- '2.17' cdt_name: - cos7 channel_sources: @@ -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 index d33d7c1..7b7ff70 100644 --- a/.ci_support/linux_64_python3.8.____cpythonpython_implcpython.yaml +++ b/.ci_support/linux_64_python3.8.____cpythonpython_implcpython.yaml @@ -2,6 +2,10 @@ c_compiler: - gcc c_compiler_version: - '13' +c_stdlib: +- sysroot +c_stdlib_version: +- '2.17' cdt_name: - cos7 channel_sources: @@ -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.9.____73_pypypython_implpypy.yaml b/.ci_support/linux_64_python3.9.____73_pypypython_implpypy.yaml index 2a8100a..d682179 100644 --- a/.ci_support/linux_64_python3.9.____73_pypypython_implpypy.yaml +++ b/.ci_support/linux_64_python3.9.____73_pypypython_implpypy.yaml @@ -2,6 +2,10 @@ c_compiler: - gcc c_compiler_version: - '13' +c_stdlib: +- sysroot +c_stdlib_version: +- '2.17' cdt_name: - cos7 channel_sources: @@ -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.9.____cpythonpython_implcpython.yaml b/.ci_support/linux_64_python3.9.____cpythonpython_implcpython.yaml index 005b3d3..c6af328 100644 --- a/.ci_support/linux_64_python3.9.____cpythonpython_implcpython.yaml +++ b/.ci_support/linux_64_python3.9.____cpythonpython_implcpython.yaml @@ -2,6 +2,10 @@ c_compiler: - gcc c_compiler_version: - '13' +c_stdlib: +- sysroot +c_stdlib_version: +- '2.17' cdt_name: - cos7 channel_sources: @@ -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.____cpythonpython_implcpython.yaml index 725d3bd..0315a7f 100644 --- a/.ci_support/linux_aarch64_python3.10.____cpythonpython_implcpython.yaml +++ b/.ci_support/linux_aarch64_python3.10.____cpythonpython_implcpython.yaml @@ -4,6 +4,10 @@ c_compiler: - gcc c_compiler_version: - '13' +c_stdlib: +- sysroot +c_stdlib_version: +- '2.17' cdt_arch: - aarch64 cdt_name: @@ -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.____cpythonpython_implcpython.yaml index a46039a..1c71060 100644 --- a/.ci_support/linux_aarch64_python3.11.____cpythonpython_implcpython.yaml +++ b/.ci_support/linux_aarch64_python3.11.____cpythonpython_implcpython.yaml @@ -4,6 +4,10 @@ c_compiler: - gcc c_compiler_version: - '13' +c_stdlib: +- sysroot +c_stdlib_version: +- '2.17' cdt_arch: - aarch64 cdt_name: @@ -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.____cpythonpython_implcpython.yaml index 9423f73..c295774 100644 --- a/.ci_support/linux_aarch64_python3.12.____cpythonpython_implcpython.yaml +++ b/.ci_support/linux_aarch64_python3.12.____cpythonpython_implcpython.yaml @@ -4,6 +4,10 @@ c_compiler: - gcc c_compiler_version: - '13' +c_stdlib: +- sysroot +c_stdlib_version: +- '2.17' cdt_arch: - aarch64 cdt_name: @@ -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 index 5fc6ed1..890b73d 100644 --- a/.ci_support/linux_aarch64_python3.8.____cpythonpython_implcpython.yaml +++ b/.ci_support/linux_aarch64_python3.8.____cpythonpython_implcpython.yaml @@ -4,6 +4,10 @@ c_compiler: - gcc c_compiler_version: - '13' +c_stdlib: +- sysroot +c_stdlib_version: +- '2.17' cdt_arch: - aarch64 cdt_name: @@ -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.9.____73_pypypython_implpypy.yaml b/.ci_support/linux_aarch64_python3.9.____73_pypypython_implpypy.yaml index efcbd79..e1bac3f 100644 --- a/.ci_support/linux_aarch64_python3.9.____73_pypypython_implpypy.yaml +++ b/.ci_support/linux_aarch64_python3.9.____73_pypypython_implpypy.yaml @@ -4,6 +4,10 @@ c_compiler: - gcc c_compiler_version: - '13' +c_stdlib: +- sysroot +c_stdlib_version: +- '2.17' cdt_arch: - aarch64 cdt_name: @@ -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.9.____cpythonpython_implcpython.yaml b/.ci_support/linux_aarch64_python3.9.____cpythonpython_implcpython.yaml index 6ecfe3f..2764603 100644 --- a/.ci_support/linux_aarch64_python3.9.____cpythonpython_implcpython.yaml +++ b/.ci_support/linux_aarch64_python3.9.____cpythonpython_implcpython.yaml @@ -4,6 +4,10 @@ c_compiler: - gcc c_compiler_version: - '13' +c_stdlib: +- sysroot +c_stdlib_version: +- '2.17' cdt_arch: - aarch64 cdt_name: @@ -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/osx_64_python3.10.____cpythonpython_implcpython.yaml b/.ci_support/osx_64_python3.10.____cpythonpython_implcpython.yaml index 3334d59..494fbb8 100644 --- a/.ci_support/osx_64_python3.10.____cpythonpython_implcpython.yaml +++ b/.ci_support/osx_64_python3.10.____cpythonpython_implcpython.yaml @@ -6,6 +6,10 @@ c_compiler: - clang c_compiler_version: - '17' +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.____cpythonpython_implcpython.yaml b/.ci_support/osx_64_python3.11.____cpythonpython_implcpython.yaml index 7d15028..bc9236b 100644 --- a/.ci_support/osx_64_python3.11.____cpythonpython_implcpython.yaml +++ b/.ci_support/osx_64_python3.11.____cpythonpython_implcpython.yaml @@ -6,6 +6,10 @@ c_compiler: - clang c_compiler_version: - '17' +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.____cpythonpython_implcpython.yaml b/.ci_support/osx_64_python3.12.____cpythonpython_implcpython.yaml index 98298ad..3d9cc51 100644 --- a/.ci_support/osx_64_python3.12.____cpythonpython_implcpython.yaml +++ b/.ci_support/osx_64_python3.12.____cpythonpython_implcpython.yaml @@ -6,6 +6,10 @@ c_compiler: - clang c_compiler_version: - '17' +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.____cpythonpython_implcpython.yaml b/.ci_support/osx_64_python3.8.____cpythonpython_implcpython.yaml index ee01eaa..f98a1c1 100644 --- a/.ci_support/osx_64_python3.8.____cpythonpython_implcpython.yaml +++ b/.ci_support/osx_64_python3.8.____cpythonpython_implcpython.yaml @@ -6,6 +6,10 @@ c_compiler: - clang c_compiler_version: - '17' +c_stdlib: +- macosx_deployment_target +c_stdlib_version: +- '10.13' channel_sources: - conda-forge channel_targets: diff --git a/.ci_support/osx_64_python3.9.____73_pypypython_implpypy.yaml b/.ci_support/osx_64_python3.9.____73_pypypython_implpypy.yaml index b8e06ee..7a6faa8 100644 --- a/.ci_support/osx_64_python3.9.____73_pypypython_implpypy.yaml +++ b/.ci_support/osx_64_python3.9.____73_pypypython_implpypy.yaml @@ -6,6 +6,10 @@ c_compiler: - clang c_compiler_version: - '17' +c_stdlib: +- macosx_deployment_target +c_stdlib_version: +- '10.13' channel_sources: - conda-forge channel_targets: diff --git a/.ci_support/osx_64_python3.9.____cpythonpython_implcpython.yaml b/.ci_support/osx_64_python3.9.____cpythonpython_implcpython.yaml index 89b84be..ed804d9 100644 --- a/.ci_support/osx_64_python3.9.____cpythonpython_implcpython.yaml +++ b/.ci_support/osx_64_python3.9.____cpythonpython_implcpython.yaml @@ -6,6 +6,10 @@ c_compiler: - clang c_compiler_version: - '17' +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 ccb845b..8708560 100644 --- a/.ci_support/osx_arm64_python3.10.____cpython.yaml +++ b/.ci_support/osx_arm64_python3.10.____cpython.yaml @@ -6,6 +6,10 @@ c_compiler: - clang c_compiler_version: - '17' +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 d1587f4..66ad64a 100644 --- a/.ci_support/osx_arm64_python3.11.____cpython.yaml +++ b/.ci_support/osx_arm64_python3.11.____cpython.yaml @@ -6,6 +6,10 @@ c_compiler: - clang c_compiler_version: - '17' +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 df15615..c86ff90 100644 --- a/.ci_support/osx_arm64_python3.12.____cpython.yaml +++ b/.ci_support/osx_arm64_python3.12.____cpython.yaml @@ -6,6 +6,10 @@ c_compiler: - clang c_compiler_version: - '17' +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 index fa6048a..dca3fda 100644 --- a/.ci_support/osx_arm64_python3.8.____cpython.yaml +++ b/.ci_support/osx_arm64_python3.8.____cpython.yaml @@ -6,6 +6,10 @@ c_compiler: - clang c_compiler_version: - '17' +c_stdlib: +- macosx_deployment_target +c_stdlib_version: +- '11.0' channel_sources: - conda-forge channel_targets: diff --git a/.ci_support/osx_arm64_python3.9.____cpython.yaml b/.ci_support/osx_arm64_python3.9.____cpython.yaml index 34bc1a7..d690e0f 100644 --- a/.ci_support/osx_arm64_python3.9.____cpython.yaml +++ b/.ci_support/osx_arm64_python3.9.____cpython.yaml @@ -6,6 +6,10 @@ c_compiler: - clang c_compiler_version: - '17' +c_stdlib: +- macosx_deployment_target +c_stdlib_version: +- '11.0' channel_sources: - conda-forge channel_targets: diff --git a/.ci_support/win_64_python3.10.____cpythonpython_implcpython.yaml b/.ci_support/win_64_python3.10.____cpythonpython_implcpython.yaml index 6a90601..c6d4f87 100644 --- a/.ci_support/win_64_python3.10.____cpythonpython_implcpython.yaml +++ b/.ci_support/win_64_python3.10.____cpythonpython_implcpython.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.____cpythonpython_implcpython.yaml index 6ed1dd1..77a12ce 100644 --- a/.ci_support/win_64_python3.11.____cpythonpython_implcpython.yaml +++ b/.ci_support/win_64_python3.11.____cpythonpython_implcpython.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.____cpythonpython_implcpython.yaml index 5a113ab..550ee66 100644 --- a/.ci_support/win_64_python3.12.____cpythonpython_implcpython.yaml +++ b/.ci_support/win_64_python3.12.____cpythonpython_implcpython.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 index 8fb6129..fd1ab19 100644 --- a/.ci_support/win_64_python3.8.____cpythonpython_implcpython.yaml +++ b/.ci_support/win_64_python3.8.____cpythonpython_implcpython.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.9.____73_pypypython_implpypy.yaml b/.ci_support/win_64_python3.9.____73_pypypython_implpypy.yaml index 0593e7c..c2bc059 100644 --- a/.ci_support/win_64_python3.9.____73_pypypython_implpypy.yaml +++ b/.ci_support/win_64_python3.9.____73_pypypython_implpypy.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.9.____cpythonpython_implcpython.yaml b/.ci_support/win_64_python3.9.____cpythonpython_implcpython.yaml index 978f1ab..c560d6d 100644 --- a/.ci_support/win_64_python3.9.____cpythonpython_implcpython.yaml +++ b/.ci_support/win_64_python3.9.____cpythonpython_implcpython.yaml @@ -1,5 +1,7 @@ c_compiler: - vs2019 +c_stdlib: +- vs channel_sources: - conda-forge channel_targets: From 3a86f35dd228a47fd26cb1c29c07487e64486952 Mon Sep 17 00:00:00 2001 From: Silvio Traversaro Date: Sat, 24 Aug 2024 13:08:15 +0200 Subject: [PATCH 05/11] Update meta.yaml --- recipe/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index c34f92d..1e3472b 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -14,7 +14,7 @@ package: source: - url: https://github.com/gazebosim/gz-sim/archive/refs/tags/gz-sim{{ version }}.tar.gz - sha256: e59a6c983c3e44c7452315394012df1c96eeb18be60b0ee3a6db5d2e9b9409c0 + sha256: d709eafd7c919add5fc828e10f6605abaa2aceb6b9609f44e115f204853cf5db patches: - standalone_bindings.patch - support_protobuf_crosscompilation.patch From c552bfc36932d3a1c8fea5e90b211d7f91d0b73e Mon Sep 17 00:00:00 2001 From: Silvio Traversaro Date: Sun, 25 Aug 2024 10:00:56 +0200 Subject: [PATCH 06/11] Fix auto-tick bot --- recipe/meta.yaml | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 1e3472b..fb083a1 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,8 +1,7 @@ {% set component_name = "sim" %} {% set repo_name = "gz-" + component_name %} -{% set version = "8_8.6.0" %} -{% set version_package = version.split('_')[1] %} -{% set major_version = version.split('_')[0] %} +{% set version = "8.6.0" %} +{% set major_version = version.split('.')[0] %} {% set name = repo_name + major_version %} {% set component_version = component_name + major_version %} {% set cxx_name = "lib" + name %} @@ -10,10 +9,10 @@ package: name: {{ name }} - version: {{ version_package }} + version: {{ version }} source: - - url: https://github.com/gazebosim/gz-sim/archive/refs/tags/gz-sim{{ version }}.tar.gz + - url: https://github.com/gazebosim/{{ repo_name }}/archive/refs/tags/{{ repo_name }}{{ major_version }}_{{ version }}.tar.gz sha256: d709eafd7c919add5fc828e10f6605abaa2aceb6b9609f44e115f204853cf5db patches: - standalone_bindings.patch From 77de65beeca19bf7ecc58f0d04e655663cb5704a Mon Sep 17 00:00:00 2001 From: Silvio Traversaro Date: Sun, 25 Aug 2024 10:13:00 +0200 Subject: [PATCH 07/11] Update meta.yaml --- recipe/meta.yaml | 3 --- 1 file changed, 3 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index fb083a1..23813cd 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -20,9 +20,6 @@ source: build: 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] outputs: - name: {{ cxx_name }} From a99b24a64dfc0c2d3ac3fd453b4704bafdcbb763 Mon Sep 17 00:00:00 2001 From: Silvio Traversaro Date: Mon, 26 Aug 2024 01:31:48 +0200 Subject: [PATCH 08/11] Add constraint on minimum gz-rendering version --- recipe/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 23813cd..043f858 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -63,7 +63,7 @@ outputs: - libgz-gui8 - libgz-physics7 - libgz-sensors8 - - libgz-rendering8 + - libgz-rendering8 >=8.2.0 - libgz-utils2 - libgz-math7 - libgz-tools2 From 52914455677bb7bf3a3dbfb1da0c51e14178a11d Mon Sep 17 00:00:00 2001 From: "conda-forge-webservices[bot]" <91080706+conda-forge-webservices[bot]@users.noreply.github.com> Date: Mon, 23 Sep 2024 22:32:38 +0000 Subject: [PATCH 09/11] MNT: Re-rendered with conda-build 24.7.1, conda-smithy 3.40.1, and conda-forge-pinning 2024.09.23.09.40.07 --- .azure-pipelines/azure-pipelines-linux.yml | 48 +++---- .azure-pipelines/azure-pipelines-osx.yml | 25 ++-- .azure-pipelines/azure-pipelines-win.yml | 22 ++- ...l => linux_64_python3.10.____cpython.yaml} | 0 ...l => linux_64_python3.11.____cpython.yaml} | 0 ...l => linux_64_python3.12.____cpython.yaml} | 0 ...thon3.8.____cpythonpython_implcpython.yaml | 47 ------- ..._python3.9.____73_pypypython_implpypy.yaml | 47 ------- ...ml => linux_64_python3.9.____cpython.yaml} | 0 ...linux_aarch64_python3.10.____cpython.yaml} | 0 ...linux_aarch64_python3.11.____cpython.yaml} | 0 ...linux_aarch64_python3.12.____cpython.yaml} | 0 ...thon3.8.____cpythonpython_implcpython.yaml | 51 ------- ..._python3.9.____73_pypypython_implpypy.yaml | 51 ------- ... linux_aarch64_python3.9.____cpython.yaml} | 0 .ci_support/migrations/pypy38.yaml | 43 ------ ...aml => osx_64_python3.10.____cpython.yaml} | 0 ...aml => osx_64_python3.11.____cpython.yaml} | 0 ...aml => osx_64_python3.12.____cpython.yaml} | 0 ...thon3.8.____cpythonpython_implcpython.yaml | 47 ------- ..._python3.9.____73_pypypython_implpypy.yaml | 47 ------- ...yaml => osx_64_python3.9.____cpython.yaml} | 0 .../osx_arm64_python3.8.____cpython.yaml | 47 ------- ...aml => win_64_python3.10.____cpython.yaml} | 0 ...aml => win_64_python3.11.____cpython.yaml} | 0 ...aml => win_64_python3.12.____cpython.yaml} | 0 ...thon3.8.____cpythonpython_implcpython.yaml | 33 ----- ..._python3.9.____73_pypypython_implpypy.yaml | 33 ----- ...yaml => win_64_python3.9.____cpython.yaml} | 0 .scripts/build_steps.sh | 5 +- .scripts/run_win_build.bat | 4 +- README.md | 127 +++++------------- build-locally.py | 5 +- 33 files changed, 72 insertions(+), 610 deletions(-) rename .ci_support/{linux_64_python3.10.____cpythonpython_implcpython.yaml => linux_64_python3.10.____cpython.yaml} (100%) rename .ci_support/{linux_64_python3.11.____cpythonpython_implcpython.yaml => linux_64_python3.11.____cpython.yaml} (100%) rename .ci_support/{linux_64_python3.12.____cpythonpython_implcpython.yaml => linux_64_python3.12.____cpython.yaml} (100%) 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} (100%) rename .ci_support/{linux_aarch64_python3.10.____cpythonpython_implcpython.yaml => linux_aarch64_python3.10.____cpython.yaml} (100%) rename .ci_support/{linux_aarch64_python3.11.____cpythonpython_implcpython.yaml => linux_aarch64_python3.11.____cpython.yaml} (100%) rename .ci_support/{linux_aarch64_python3.12.____cpythonpython_implcpython.yaml => linux_aarch64_python3.12.____cpython.yaml} (100%) 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} (100%) delete mode 100644 .ci_support/migrations/pypy38.yaml rename .ci_support/{osx_64_python3.10.____cpythonpython_implcpython.yaml => osx_64_python3.10.____cpython.yaml} (100%) rename .ci_support/{osx_64_python3.11.____cpythonpython_implcpython.yaml => osx_64_python3.11.____cpython.yaml} (100%) rename .ci_support/{osx_64_python3.12.____cpythonpython_implcpython.yaml => osx_64_python3.12.____cpython.yaml} (100%) 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} (100%) 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} (100%) rename .ci_support/{win_64_python3.11.____cpythonpython_implcpython.yaml => win_64_python3.11.____cpython.yaml} (100%) rename .ci_support/{win_64_python3.12.____cpythonpython_implcpython.yaml => win_64_python3.12.____cpython.yaml} (100%) 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} (100%) 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 aec5521..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: diff --git a/.ci_support/linux_64_python3.10.____cpythonpython_implcpython.yaml b/.ci_support/linux_64_python3.10.____cpython.yaml similarity index 100% rename from .ci_support/linux_64_python3.10.____cpythonpython_implcpython.yaml rename to .ci_support/linux_64_python3.10.____cpython.yaml diff --git a/.ci_support/linux_64_python3.11.____cpythonpython_implcpython.yaml b/.ci_support/linux_64_python3.11.____cpython.yaml similarity index 100% rename from .ci_support/linux_64_python3.11.____cpythonpython_implcpython.yaml rename to .ci_support/linux_64_python3.11.____cpython.yaml diff --git a/.ci_support/linux_64_python3.12.____cpythonpython_implcpython.yaml b/.ci_support/linux_64_python3.12.____cpython.yaml similarity index 100% rename from .ci_support/linux_64_python3.12.____cpythonpython_implcpython.yaml rename to .ci_support/linux_64_python3.12.____cpython.yaml 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 7b7ff70..0000000 --- a/.ci_support/linux_64_python3.8.____cpythonpython_implcpython.yaml +++ /dev/null @@ -1,47 +0,0 @@ -c_compiler: -- gcc -c_compiler_version: -- '13' -c_stdlib: -- sysroot -c_stdlib_version: -- '2.17' -cdt_name: -- cos7 -channel_sources: -- conda-forge -channel_targets: -- conda-forge main -cxx_compiler: -- gxx -cxx_compiler_version: -- '13' -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 -- - c_stdlib_version - - cdt_name -- - 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 d682179..0000000 --- a/.ci_support/linux_64_python3.9.____73_pypypython_implpypy.yaml +++ /dev/null @@ -1,47 +0,0 @@ -c_compiler: -- gcc -c_compiler_version: -- '13' -c_stdlib: -- sysroot -c_stdlib_version: -- '2.17' -cdt_name: -- cos7 -channel_sources: -- conda-forge -channel_targets: -- conda-forge main -cxx_compiler: -- gxx -cxx_compiler_version: -- '13' -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 -- - c_stdlib_version - - cdt_name -- - 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 100% rename from .ci_support/linux_64_python3.9.____cpythonpython_implcpython.yaml rename to .ci_support/linux_64_python3.9.____cpython.yaml diff --git a/.ci_support/linux_aarch64_python3.10.____cpythonpython_implcpython.yaml b/.ci_support/linux_aarch64_python3.10.____cpython.yaml similarity index 100% rename from .ci_support/linux_aarch64_python3.10.____cpythonpython_implcpython.yaml rename to .ci_support/linux_aarch64_python3.10.____cpython.yaml diff --git a/.ci_support/linux_aarch64_python3.11.____cpythonpython_implcpython.yaml b/.ci_support/linux_aarch64_python3.11.____cpython.yaml similarity index 100% rename from .ci_support/linux_aarch64_python3.11.____cpythonpython_implcpython.yaml rename to .ci_support/linux_aarch64_python3.11.____cpython.yaml diff --git a/.ci_support/linux_aarch64_python3.12.____cpythonpython_implcpython.yaml b/.ci_support/linux_aarch64_python3.12.____cpython.yaml similarity index 100% rename from .ci_support/linux_aarch64_python3.12.____cpythonpython_implcpython.yaml rename to .ci_support/linux_aarch64_python3.12.____cpython.yaml 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 890b73d..0000000 --- a/.ci_support/linux_aarch64_python3.8.____cpythonpython_implcpython.yaml +++ /dev/null @@ -1,51 +0,0 @@ -BUILD: -- aarch64-conda_cos7-linux-gnu -c_compiler: -- gcc -c_compiler_version: -- '13' -c_stdlib: -- sysroot -c_stdlib_version: -- '2.17' -cdt_arch: -- aarch64 -cdt_name: -- cos7 -channel_sources: -- conda-forge -channel_targets: -- conda-forge main -cxx_compiler: -- gxx -cxx_compiler_version: -- '13' -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 -- - c_stdlib_version - - cdt_name -- - 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 e1bac3f..0000000 --- a/.ci_support/linux_aarch64_python3.9.____73_pypypython_implpypy.yaml +++ /dev/null @@ -1,51 +0,0 @@ -BUILD: -- aarch64-conda_cos7-linux-gnu -c_compiler: -- gcc -c_compiler_version: -- '13' -c_stdlib: -- sysroot -c_stdlib_version: -- '2.17' -cdt_arch: -- aarch64 -cdt_name: -- cos7 -channel_sources: -- conda-forge -channel_targets: -- conda-forge main -cxx_compiler: -- gxx -cxx_compiler_version: -- '13' -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 -- - c_stdlib_version - - cdt_name -- - 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 100% rename from .ci_support/linux_aarch64_python3.9.____cpythonpython_implcpython.yaml rename to .ci_support/linux_aarch64_python3.9.____cpython.yaml 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 100% rename from .ci_support/osx_64_python3.10.____cpythonpython_implcpython.yaml rename to .ci_support/osx_64_python3.10.____cpython.yaml diff --git a/.ci_support/osx_64_python3.11.____cpythonpython_implcpython.yaml b/.ci_support/osx_64_python3.11.____cpython.yaml similarity index 100% rename from .ci_support/osx_64_python3.11.____cpythonpython_implcpython.yaml rename to .ci_support/osx_64_python3.11.____cpython.yaml diff --git a/.ci_support/osx_64_python3.12.____cpythonpython_implcpython.yaml b/.ci_support/osx_64_python3.12.____cpython.yaml similarity index 100% rename from .ci_support/osx_64_python3.12.____cpythonpython_implcpython.yaml rename to .ci_support/osx_64_python3.12.____cpython.yaml 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 f98a1c1..0000000 --- a/.ci_support/osx_64_python3.8.____cpythonpython_implcpython.yaml +++ /dev/null @@ -1,47 +0,0 @@ -MACOSX_DEPLOYMENT_TARGET: -- '10.13' -MACOSX_SDK_VERSION: -- '10.13' -c_compiler: -- clang -c_compiler_version: -- '17' -c_stdlib: -- macosx_deployment_target -c_stdlib_version: -- '10.13' -channel_sources: -- conda-forge -channel_targets: -- conda-forge main -cxx_compiler: -- clangxx -cxx_compiler_version: -- '17' -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 7a6faa8..0000000 --- a/.ci_support/osx_64_python3.9.____73_pypypython_implpypy.yaml +++ /dev/null @@ -1,47 +0,0 @@ -MACOSX_DEPLOYMENT_TARGET: -- '10.13' -MACOSX_SDK_VERSION: -- '10.13' -c_compiler: -- clang -c_compiler_version: -- '17' -c_stdlib: -- macosx_deployment_target -c_stdlib_version: -- '10.13' -channel_sources: -- conda-forge -channel_targets: -- conda-forge main -cxx_compiler: -- clangxx -cxx_compiler_version: -- '17' -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 100% rename from .ci_support/osx_64_python3.9.____cpythonpython_implcpython.yaml rename to .ci_support/osx_64_python3.9.____cpython.yaml 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 dca3fda..0000000 --- a/.ci_support/osx_arm64_python3.8.____cpython.yaml +++ /dev/null @@ -1,47 +0,0 @@ -MACOSX_DEPLOYMENT_TARGET: -- '11.0' -MACOSX_SDK_VERSION: -- '11.0' -c_compiler: -- clang -c_compiler_version: -- '17' -c_stdlib: -- macosx_deployment_target -c_stdlib_version: -- '11.0' -channel_sources: -- conda-forge -channel_targets: -- conda-forge main -cxx_compiler: -- clangxx -cxx_compiler_version: -- '17' -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/win_64_python3.10.____cpythonpython_implcpython.yaml b/.ci_support/win_64_python3.10.____cpython.yaml similarity index 100% rename from .ci_support/win_64_python3.10.____cpythonpython_implcpython.yaml rename to .ci_support/win_64_python3.10.____cpython.yaml diff --git a/.ci_support/win_64_python3.11.____cpythonpython_implcpython.yaml b/.ci_support/win_64_python3.11.____cpython.yaml similarity index 100% rename from .ci_support/win_64_python3.11.____cpythonpython_implcpython.yaml rename to .ci_support/win_64_python3.11.____cpython.yaml diff --git a/.ci_support/win_64_python3.12.____cpythonpython_implcpython.yaml b/.ci_support/win_64_python3.12.____cpython.yaml similarity index 100% rename from .ci_support/win_64_python3.12.____cpythonpython_implcpython.yaml rename to .ci_support/win_64_python3.12.____cpython.yaml 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 fd1ab19..0000000 --- a/.ci_support/win_64_python3.8.____cpythonpython_implcpython.yaml +++ /dev/null @@ -1,33 +0,0 @@ -c_compiler: -- vs2019 -c_stdlib: -- vs -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 c2bc059..0000000 --- a/.ci_support/win_64_python3.9.____73_pypypython_implpypy.yaml +++ /dev/null @@ -1,33 +0,0 @@ -c_compiler: -- vs2019 -c_stdlib: -- vs -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 100% rename from .ci_support/win_64_python3.9.____cpythonpython_implcpython.yaml rename to .ci_support/win_64_python3.9.____cpython.yaml diff --git a/.scripts/build_steps.sh b/.scripts/build_steps.sh index 6488f2f..8307fca 100755 --- a/.scripts/build_steps.sh +++ b/.scripts/build_steps.sh @@ -55,10 +55,9 @@ ulimit -n 1024 # 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 the build number clobber make_build_number "${FEEDSTOCK_ROOT}" "${RECIPE_ROOT}" "${CONFIG_FILE}" if [[ "${HOST_PLATFORM}" != "${BUILD_PLATFORM}" ]] && [[ "${HOST_PLATFORM}" != linux-* ]] && [[ "${BUILD_WITH_CONDA_DEBUG:-0}" != 1 ]]; then diff --git a/.scripts/run_win_build.bat b/.scripts/run_win_build.bat index 65650bf..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 diff --git a/README.md b/README.md index 00ec203..42c2469 100644 --- a/README.md +++ b/README.md @@ -27,129 +27,87 @@ Current build status - + - + - + - + - + - + - + - + - + - + - + - + - - - - - - - - - - - - - - - - - - @@ -173,13 +131,6 @@ Current build status variant - - - - - - - - - - + - + - + - + diff --git a/build-locally.py b/build-locally.py index d78427b..6788aea 100755 --- a/build-locally.py +++ b/build-locally.py @@ -1,8 +1,11 @@ -#!/usr/bin/env python3 +#!/bin/sh +"""exec" "python3" "$0" "$@" #""" # fmt: off # fmt: on # # This file has been generated by conda-smithy in order to build the recipe # locally. # +# The line above this comment is a bash / sh / zsh guard +# to stop people from running it with the wrong interpreter import glob import os import platform From 48d8edba7e00c2e3d0b5e7bf77c7547c4bcd2a18 Mon Sep 17 00:00:00 2001 From: Silvio Traversaro Date: Fri, 27 Sep 2024 13:17:40 +0200 Subject: [PATCH 10/11] Add constraint on minum gz-physics version --- recipe/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 043f858..36ac019 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -61,7 +61,7 @@ outputs: - libgz-common5 - libgz-fuel-tools9 - libgz-gui8 - - libgz-physics7 + - libgz-physics7 >=7.3.0 - libgz-sensors8 - libgz-rendering8 >=8.2.0 - libgz-utils2 From 6bb643bc7a0e14c83ab86ad6de6bdd78860641fb Mon Sep 17 00:00:00 2001 From: Silvio Traversaro Date: Sun, 29 Sep 2024 23:42:32 +0200 Subject: [PATCH 11/11] Update meta.yaml --- recipe/meta.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 36ac019..9f4ffb6 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -121,6 +121,9 @@ outputs: - pybind11 - pybind11-abi - pytest + # Workaround for wrong pinning + - libabseil + - libprotobuf - xorg-libxfixes # [linux] run: - {{ pin_subpackage(cxx_name, exact=True) }}
VariantStatus
linux_64_python3.10.____cpythonpython_implcpythonlinux_64_python3.10.____cpython - variant + variant
linux_64_python3.11.____cpythonpython_implcpythonlinux_64_python3.11.____cpython - variant + variant
linux_64_python3.12.____cpythonpython_implcpythonlinux_64_python3.12.____cpython - variant + variant
linux_64_python3.8.____cpythonpython_implcpythonlinux_64_python3.9.____cpython - variant + variant
linux_64_python3.9.____73_pypypython_implpypylinux_aarch64_python3.10.____cpython - variant + variant
linux_64_python3.9.____cpythonpython_implcpythonlinux_aarch64_python3.11.____cpython - variant + variant
linux_aarch64_python3.10.____cpythonpython_implcpythonlinux_aarch64_python3.12.____cpython - variant + variant
linux_aarch64_python3.11.____cpythonpython_implcpythonlinux_aarch64_python3.9.____cpython - variant + variant
linux_aarch64_python3.12.____cpythonpython_implcpythonosx_64_python3.10.____cpython - variant + variant
linux_aarch64_python3.8.____cpythonpython_implcpythonosx_64_python3.11.____cpython - variant + variant
linux_aarch64_python3.9.____73_pypypython_implpypyosx_64_python3.12.____cpython - variant + variant
linux_aarch64_python3.9.____cpythonpython_implcpythonosx_64_python3.9.____cpython - variant - -
osx_64_python3.10.____cpythonpython_implcpython - - variant - -
osx_64_python3.11.____cpythonpython_implcpython - - variant - -
osx_64_python3.12.____cpythonpython_implcpython - - variant - -
osx_64_python3.8.____cpythonpython_implcpython - - variant - -
osx_64_python3.9.____73_pypypython_implpypy - - variant - -
osx_64_python3.9.____cpythonpython_implcpython - - variant + variant
osx_arm64_python3.8.____cpython - - variant - -
osx_arm64_python3.9.____cpython @@ -188,45 +139,31 @@ Current build status
win_64_python3.10.____cpythonpython_implcpython - - variant - -
win_64_python3.11.____cpythonpython_implcpython - - variant - -
win_64_python3.12.____cpythonpython_implcpythonwin_64_python3.10.____cpython - variant + variant
win_64_python3.8.____cpythonpython_implcpythonwin_64_python3.11.____cpython - variant + variant
win_64_python3.9.____73_pypypython_implpypywin_64_python3.12.____cpython - variant + variant
win_64_python3.9.____cpythonpython_implcpythonwin_64_python3.9.____cpython - variant + variant