Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[bot-automerge] gz-transport v14.0.0 #43

Merged
merged 6 commits into from
Sep 29, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 14 additions & 14 deletions README.md

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions conda-forge.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
bot:
abi_migration_branches:
- v12
- v13
automerge: true
build_platform:
linux_aarch64: linux_64
Expand Down
27 changes: 16 additions & 11 deletions recipe/meta.yaml
Original file line number Diff line number Diff line change
@@ -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 %}
Expand All @@ -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 }}
Expand All @@ -28,6 +28,8 @@ outputs:
build:
run_exports:
- {{ pin_subpackage(cxx_name, max_pin='x') }}
ignore_run_exports_from:
- python
requirements:
build:
- {{ compiler('cxx') }}
Expand All @@ -36,11 +38,14 @@ outputs:
- ninja
- cmake
- pkg-config
- python # [build_platform != target_platform]
- cross-python_{{ target_platform }} # [build_platform != target_platform]
host:
- libgz-cmake3
- libgz-msgs10
- python
- libgz-cmake4
- libgz-msgs11
- libgz-tools2
- libgz-utils2
- libgz-utils3
- cppzmq
- zeromq
- libuuid # [linux]
Expand Down Expand Up @@ -82,23 +87,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:
Expand All @@ -121,7 +126,7 @@ outputs:
requires:
- pip
imports:
- gz.transport13
- gz.transport14

about:
home: https://github.com/gazebosim/{{ repo_name }}
Expand Down
16 changes: 8 additions & 8 deletions recipe/standalone_bindings.patch
Original file line number Diff line number Diff line change
@@ -1,22 +1,22 @@
From 306ca18574f192c7fedfe7edfcda31b36067f82a Mon Sep 17 00:00:00 2001
From b00a0ffa720ae85a2f9bea8b2380e8f5fd30f73f Mon Sep 17 00:00:00 2001
From: Silvio Traversaro <[email protected]>
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 <[email protected]>
---
python/CMakeLists.txt | 15 +++++++++++++++
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)
Expand All @@ -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