From af396de142fa07274ac3ab8bc65fdadf38fb7fe3 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 01:37:59 +0000 Subject: [PATCH 1/6] updated v14.0.0 --- recipe/meta.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index f41bb8f..2941608 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,6 +1,6 @@ {% set component_name = "transport" %} {% set repo_name = "gz-" + component_name %} -{% set version = "13.4.0" %} +{% set version = "14.0.0" %} {% set major_version = version.split('.')[0] %} {% set name = repo_name + major_version %} {% set component_version = component_name + major_version %} @@ -13,13 +13,13 @@ package: source: - url: https://github.com/gazebosim/{{ repo_name }}/archive/{{ repo_name }}{{ major_version }}_{{ version }}.tar.gz - sha256: 7c9d7bc46b2d8abb81487be346cafe56b482873019110e39a7b65adb4cbc8514 + sha256: f503b9c7c71f2dff9647c88c872886d4e26bbfff8f8011ebb27fd11cc59c97c0 patches: - standalone_bindings.patch - 452.patch build: - number: 2 + number: 0 outputs: - name: {{ cxx_name }} From ff63f719cc75995e09ae711a9b9ef6a0f3029958 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 01:39:11 +0000 Subject: [PATCH 2/6] MNT: Re-rendered with conda-build 24.9.0, conda-smithy 3.40.1, and conda-forge-pinning 2024.09.27.00.47.16 --- README.md | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/README.md b/README.md index 252f5d1..946025e 100644 --- a/README.md +++ b/README.md @@ -249,9 +249,9 @@ Current release info | Name | Downloads | Version | Platforms | | --- | --- | --- | --- | -| [![Conda Recipe](https://img.shields.io/badge/recipe-gz--transport13-green.svg)](https://anaconda.org/conda-forge/gz-transport13) | [![Conda Downloads](https://img.shields.io/conda/dn/conda-forge/gz-transport13.svg)](https://anaconda.org/conda-forge/gz-transport13) | [![Conda Version](https://img.shields.io/conda/vn/conda-forge/gz-transport13.svg)](https://anaconda.org/conda-forge/gz-transport13) | [![Conda Platforms](https://img.shields.io/conda/pn/conda-forge/gz-transport13.svg)](https://anaconda.org/conda-forge/gz-transport13) | -| [![Conda Recipe](https://img.shields.io/badge/recipe-gz--transport13--python-green.svg)](https://anaconda.org/conda-forge/gz-transport13-python) | [![Conda Downloads](https://img.shields.io/conda/dn/conda-forge/gz-transport13-python.svg)](https://anaconda.org/conda-forge/gz-transport13-python) | [![Conda Version](https://img.shields.io/conda/vn/conda-forge/gz-transport13-python.svg)](https://anaconda.org/conda-forge/gz-transport13-python) | [![Conda Platforms](https://img.shields.io/conda/pn/conda-forge/gz-transport13-python.svg)](https://anaconda.org/conda-forge/gz-transport13-python) | -| [![Conda Recipe](https://img.shields.io/badge/recipe-libgz--transport13-green.svg)](https://anaconda.org/conda-forge/libgz-transport13) | [![Conda Downloads](https://img.shields.io/conda/dn/conda-forge/libgz-transport13.svg)](https://anaconda.org/conda-forge/libgz-transport13) | [![Conda Version](https://img.shields.io/conda/vn/conda-forge/libgz-transport13.svg)](https://anaconda.org/conda-forge/libgz-transport13) | [![Conda Platforms](https://img.shields.io/conda/pn/conda-forge/libgz-transport13.svg)](https://anaconda.org/conda-forge/libgz-transport13) | +| [![Conda Recipe](https://img.shields.io/badge/recipe-gz--transport14-green.svg)](https://anaconda.org/conda-forge/gz-transport14) | [![Conda Downloads](https://img.shields.io/conda/dn/conda-forge/gz-transport14.svg)](https://anaconda.org/conda-forge/gz-transport14) | [![Conda Version](https://img.shields.io/conda/vn/conda-forge/gz-transport14.svg)](https://anaconda.org/conda-forge/gz-transport14) | [![Conda Platforms](https://img.shields.io/conda/pn/conda-forge/gz-transport14.svg)](https://anaconda.org/conda-forge/gz-transport14) | +| [![Conda Recipe](https://img.shields.io/badge/recipe-gz--transport14--python-green.svg)](https://anaconda.org/conda-forge/gz-transport14-python) | [![Conda Downloads](https://img.shields.io/conda/dn/conda-forge/gz-transport14-python.svg)](https://anaconda.org/conda-forge/gz-transport14-python) | [![Conda Version](https://img.shields.io/conda/vn/conda-forge/gz-transport14-python.svg)](https://anaconda.org/conda-forge/gz-transport14-python) | [![Conda Platforms](https://img.shields.io/conda/pn/conda-forge/gz-transport14-python.svg)](https://anaconda.org/conda-forge/gz-transport14-python) | +| [![Conda Recipe](https://img.shields.io/badge/recipe-libgz--transport14-green.svg)](https://anaconda.org/conda-forge/libgz-transport14) | [![Conda Downloads](https://img.shields.io/conda/dn/conda-forge/libgz-transport14.svg)](https://anaconda.org/conda-forge/libgz-transport14) | [![Conda Version](https://img.shields.io/conda/vn/conda-forge/libgz-transport14.svg)](https://anaconda.org/conda-forge/libgz-transport14) | [![Conda Platforms](https://img.shields.io/conda/pn/conda-forge/libgz-transport14.svg)](https://anaconda.org/conda-forge/libgz-transport14) | Installing gz-transport ======================= @@ -263,41 +263,41 @@ conda config --add channels conda-forge conda config --set channel_priority strict ``` -Once the `conda-forge` channel has been enabled, `gz-transport13, gz-transport13-python, libgz-transport13` can be installed with `conda`: +Once the `conda-forge` channel has been enabled, `gz-transport14, gz-transport14-python, libgz-transport14` can be installed with `conda`: ``` -conda install gz-transport13 gz-transport13-python libgz-transport13 +conda install gz-transport14 gz-transport14-python libgz-transport14 ``` or with `mamba`: ``` -mamba install gz-transport13 gz-transport13-python libgz-transport13 +mamba install gz-transport14 gz-transport14-python libgz-transport14 ``` -It is possible to list all of the versions of `gz-transport13` available on your platform with `conda`: +It is possible to list all of the versions of `gz-transport14` available on your platform with `conda`: ``` -conda search gz-transport13 --channel conda-forge +conda search gz-transport14 --channel conda-forge ``` or with `mamba`: ``` -mamba search gz-transport13 --channel conda-forge +mamba search gz-transport14 --channel conda-forge ``` Alternatively, `mamba repoquery` may provide more information: ``` # Search all versions available on your platform: -mamba repoquery search gz-transport13 --channel conda-forge +mamba repoquery search gz-transport14 --channel conda-forge -# List packages depending on `gz-transport13`: -mamba repoquery whoneeds gz-transport13 --channel conda-forge +# List packages depending on `gz-transport14`: +mamba repoquery whoneeds gz-transport14 --channel conda-forge -# List dependencies of `gz-transport13`: -mamba repoquery depends gz-transport13 --channel conda-forge +# List dependencies of `gz-transport14`: +mamba repoquery depends gz-transport14 --channel conda-forge ``` From 1c915ab0d5afdc81d003cccd57571cbda152e2a2 Mon Sep 17 00:00:00 2001 From: Silvio Traversaro Date: Fri, 27 Sep 2024 13:32:42 +0200 Subject: [PATCH 3/6] Update for gz-transport 14 --- recipe/meta.yaml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 2941608..f091d8f 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -37,10 +37,10 @@ outputs: - cmake - pkg-config host: - - libgz-cmake3 - - libgz-msgs10 + - libgz-cmake4 + - libgz-msgs11 - libgz-tools2 - - libgz-utils2 + - libgz-utils3 - cppzmq - zeromq - libuuid # [linux] @@ -82,23 +82,23 @@ outputs: - pybind11 - pybind11-abi - pytest - - gz-msgs10-python + - gz-msgs11-python # Workaround for errors of type # package libgz-sim7-<..> requires <...>, but none of the providers can be installed - libabseil - libprotobuf - - libgz-msgs10 + - libgz-msgs11 run: - {{ pin_subpackage(cxx_name, exact=True) }} - python - - gz-msgs10-python + - gz-msgs11-python test: commands: - pip check requires: - pip imports: - - gz.transport13 + - gz.transport14 - name: {{ name }} build: @@ -121,7 +121,7 @@ outputs: requires: - pip imports: - - gz.transport13 + - gz.transport14 about: home: https://github.com/gazebosim/{{ repo_name }} From ce8e5aba7ad64bf722c118d839831ed10832ea23 Mon Sep 17 00:00:00 2001 From: Silvio Traversaro Date: Fri, 27 Sep 2024 13:33:43 +0200 Subject: [PATCH 4/6] Add v13 to abi_migration_branches --- conda-forge.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/conda-forge.yml b/conda-forge.yml index b42d248..2bc042b 100644 --- a/conda-forge.yml +++ b/conda-forge.yml @@ -1,6 +1,7 @@ bot: abi_migration_branches: - v12 + - v13 automerge: true build_platform: linux_aarch64: linux_64 From 0b81c7de889269a1796ea1877aecc29501d505e4 Mon Sep 17 00:00:00 2001 From: Silvio Traversaro Date: Sun, 29 Sep 2024 01:18:58 +0200 Subject: [PATCH 5/6] Update standalone_bindings.patch --- recipe/standalone_bindings.patch | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/recipe/standalone_bindings.patch b/recipe/standalone_bindings.patch index 0a80ddb..7b6b2e0 100644 --- a/recipe/standalone_bindings.patch +++ b/recipe/standalone_bindings.patch @@ -1,7 +1,7 @@ -From 306ca18574f192c7fedfe7edfcda31b36067f82a Mon Sep 17 00:00:00 2001 +From b00a0ffa720ae85a2f9bea8b2380e8f5fd30f73f Mon Sep 17 00:00:00 2001 From: Silvio Traversaro -Date: Thu, 5 Oct 2023 21:26:37 +0200 -Subject: [PATCH] Support for building standalone bindings +Date: Sun, 29 Sep 2024 01:15:35 +0200 +Subject: [PATCH] Support compilation of bindings as standalone project Signed-off-by: Silvio Traversaro --- @@ -9,14 +9,14 @@ Signed-off-by: Silvio Traversaro 1 file changed, 15 insertions(+) diff --git a/python/CMakeLists.txt b/python/CMakeLists.txt -index ea5f46b7d..c4d4148da 100644 +index eb348471..aa198ab3 100644 --- a/python/CMakeLists.txt +++ b/python/CMakeLists.txt @@ -1,3 +1,18 @@ +# Detect if we are doing a standalone build of the bindings, using an external gz-transport +if(CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR) + cmake_minimum_required(VERSION 3.16) -+ set(GZ_TRANSPORT_VER 13) ++ set(GZ_TRANSPORT_VER 14) + project(gz-transport${GZ_TRANSPORT_VER}-python VERSION ${GZ_TRANSPORT_VER}) + find_package(Python3 COMPONENTS Interpreter Development REQUIRED) + find_package(pybind11 REQUIRED) @@ -28,6 +28,6 @@ index ea5f46b7d..c4d4148da 100644 + endif() +endif() + - if(WIN32 AND CMAKE_BUILD_TYPE STREQUAL "Debug") - # pybind11 logic for setting up a debug build when both a debug and release - # python interpreter are present in the system seems to be pretty much broken. + if(USE_SYSTEM_PATHS_FOR_PYTHON_INSTALLATION) + if(NOT Python3_SITEARCH) + # Get install variable from Python3 module From a9aeac872548fd3cffd9cc94e93150f5fae7dfad Mon Sep 17 00:00:00 2001 From: Silvio Traversaro Date: Sun, 29 Sep 2024 09:59:58 +0200 Subject: [PATCH 6/6] Update meta.yaml --- recipe/meta.yaml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index f091d8f..d099164 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -28,6 +28,8 @@ outputs: build: run_exports: - {{ pin_subpackage(cxx_name, max_pin='x') }} + ignore_run_exports_from: + - python requirements: build: - {{ compiler('cxx') }} @@ -36,7 +38,10 @@ outputs: - ninja - cmake - pkg-config + - python # [build_platform != target_platform] + - cross-python_{{ target_platform }} # [build_platform != target_platform] host: + - python - libgz-cmake4 - libgz-msgs11 - libgz-tools2