Skip to content

libsdformat v15.1.0 #132

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.

Sign up for GitHub

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

Merged
merged 10 commits into from
Feb 12, 2025
Merged

libsdformat v15.1.0 #132

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
2c77c69
updated v15.1.0
regro-cf-autotick-bot Nov 14, 2024
615ab3c
MNT: Re-rendered with conda-build 24.9.0, conda-smithy 3.44.3, and co…
regro-cf-autotick-bot Nov 14, 2024
d38ebef
Delete recipe/standalone_bindings_tests.patch
traversaro Nov 16, 2024
83d9953
Delete recipe/standalone_bindings.patch
traversaro Nov 16, 2024
6ff4215
Remove patches for independent Python bindings build
traversaro Nov 16, 2024
9bb2922
Create 1509.patch
traversaro Nov 16, 2024
032af8c
Add 1509.patch
traversaro Nov 16, 2024
3c66954
MNT: Re-rendered with conda-build 25.1.1, conda-smithy 3.45.4, and co…
Feb 11, 2025
54a463c
Create 1544.patch
traversaro Feb 12, 2025
863f5c7
Update meta.yaml
traversaro Feb 12, 2025
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
6 changes: 3 additions & 3 deletions .azure-pipelines/azure-pipelines-linux.yml
View file
Open in desktop

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

1 change: 1 addition & 0 deletions .azure-pipelines/azure-pipelines-win.yml
View file
Open in desktop

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

6 changes: 2 additions & 4 deletions .ci_support/linux_64_.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ c_stdlib:
c_stdlib_version:
- '2.17'
cdt_name:
- cos7
- conda
channel_sources:
- conda-forge
channel_targets:
Expand All @@ -17,7 +17,7 @@ cxx_compiler:
cxx_compiler_version:
- '13'
docker_image:
- quay.io/condaforge/linux-anvil-cos7-x86_64
- quay.io/condaforge/linux-anvil-x86_64:alma9
pin_run_as_build:
python:
min_pin: x.x
Expand All @@ -39,5 +39,3 @@ urdfdom:
zip_keys:
- - c_compiler_version
- cxx_compiler_version
- - c_stdlib_version
- cdt_name
10 changes: 2 additions & 8 deletions .ci_support/linux_aarch64_.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
BUILD:
- aarch64-conda_cos7-linux-gnu
c_compiler:
- gcc
c_compiler_version:
Expand All @@ -8,10 +6,8 @@ c_stdlib:
- sysroot
c_stdlib_version:
- '2.17'
cdt_arch:
- aarch64
cdt_name:
- cos7
- conda
channel_sources:
- conda-forge
channel_targets:
Expand All @@ -21,7 +17,7 @@ cxx_compiler:
cxx_compiler_version:
- '13'
docker_image:
- quay.io/condaforge/linux-anvil-cos7-x86_64
- quay.io/condaforge/linux-anvil-x86_64:alma9
pin_run_as_build:
python:
min_pin: x.x
Expand All @@ -43,5 +39,3 @@ urdfdom:
zip_keys:
- - c_compiler_version
- cxx_compiler_version
- - c_stdlib_version
- cdt_name
6 changes: 2 additions & 4 deletions .ci_support/linux_ppc64le_.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ c_stdlib:
c_stdlib_version:
- '2.17'
cdt_name:
- cos7
- conda
channel_sources:
- conda-forge
channel_targets:
Expand All @@ -17,7 +17,7 @@ cxx_compiler:
cxx_compiler_version:
- '13'
docker_image:
- quay.io/condaforge/linux-anvil-cos7-x86_64
- quay.io/condaforge/linux-anvil-x86_64:alma9
pin_run_as_build:
python:
min_pin: x.x
Expand All @@ -39,5 +39,3 @@ urdfdom:
zip_keys:
- - c_compiler_version
- cxx_compiler_version
- - c_stdlib_version
- cdt_name
3 changes: 3 additions & 0 deletions .gitignore
View file
Open in desktop

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

7 changes: 4 additions & 3 deletions .scripts/run_osx_build.sh
View file
Open in desktop

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

6 changes: 4 additions & 2 deletions .scripts/run_win_build.bat
View file
Open in desktop

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

7 changes: 7 additions & 0 deletions build-locally.py
View file
Open in desktop

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

41 changes: 41 additions & 0 deletions recipe/1509.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
From 4254e2868d11d1ffdc165d74b4351fee14371eed Mon Sep 17 00:00:00 2001
From: Silvio Traversaro <silvio@traversaro.it>
Date: Sat, 16 Nov 2024 18:49:02 +0100
Subject: [PATCH] Permit to test when building bindings separately from main
library

Signed-off-by: Silvio Traversaro <silvio@traversaro.it>
---
python/CMakeLists.txt | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/python/CMakeLists.txt b/python/CMakeLists.txt
index 5baa66271..58be732aa 100644
--- a/python/CMakeLists.txt
+++ b/python/CMakeLists.txt
@@ -10,6 +10,12 @@ if(CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR)
set(CMAKE_REQUIRE_FIND_PACKAGE_pybind11 TRUE)
include(GNUInstallDirs)
include(CTest)
+
+ if(BUILD_TESTING)
+ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/../test/test_config.hh.in
+ ${PROJECT_BINARY_DIR}/include/test_config.hh)
+ include_directories(${PROJECT_BINARY_DIR}/include)
+ endif()
endif()

set(PYBIND11_PYTHON_VERSION 3)
@@ -199,10 +205,10 @@ if (BUILD_TESTING AND NOT WIN32)
foreach (test ${python_tests})
if (pytest_FOUND)
add_test(NAME ${test}.py COMMAND
- "${Python3_EXECUTABLE}" -m pytest "${CMAKE_SOURCE_DIR}/python/test/${test}.py" --junitxml "${CMAKE_BINARY_DIR}/test_results/${test}.xml")
+ "${Python3_EXECUTABLE}" -m pytest "${CMAKE_CURRENT_SOURCE_DIR}/test/${test}.py" --junitxml "${CMAKE_BINARY_DIR}/test_results/${test}.xml")
else()
add_test(NAME ${test}.py COMMAND
- "${Python3_EXECUTABLE}" "${CMAKE_SOURCE_DIR}/python/test/${test}.py")
+ "${Python3_EXECUTABLE}" "${CMAKE_CURRENT_SOURCE_DIR}/test/${test}.py")
endif()
set(_env_vars)
list(APPEND _env_vars "PYTHONPATH=${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/python/:${CMAKE_BINARY_DIR}/lib:$ENV{PYTHONPATH}")
12 changes: 12 additions & 0 deletions recipe/1544.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
diff --git a/python/CMakeLists.txt b/python/CMakeLists.txt
index 81bf3c1f0..5a52cb675 100644
--- a/python/CMakeLists.txt
+++ b/python/CMakeLists.txt
@@ -133,7 +133,7 @@ set_target_properties(${BINDINGS_MODULE_NAME} PROPERTIES
configure_build_install_location(${BINDINGS_MODULE_NAME})

if (BUILD_TESTING AND NOT WIN32)
- pybind11_add_module(sdformattest SHARED
+ pybind11_add_module(sdformattest MODULE
test/_gz_sdformattest_pybind11.cc
)
10 changes: 5 additions & 5 deletions recipe/meta.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{% set repo_name = "sdformat" %}
{% set version = "15.0.0" %}
{% set version = "15.1.0" %}
{% set major_version = version.split('.')[0] %}
{% set name = repo_name + major_version %}
{% set cxx_name = "lib" + name %}
Expand All @@ -11,13 +11,13 @@ package:

source:
- url: https://github.com/osrf/sdformat/archive/sdformat{{ major_version }}_{{ version }}.tar.gz
sha256: 2b21c1efe7c4bb817a5867b80974c7e35cfdd863b4024fe94a3bcb1d6a05a813
sha256: a200a0202d389fd5e8ab9339377a7390822608a57ad935a9b6deaecb6f5b5301
patches:
- standalone_bindings.patch
- standalone_bindings_tests.patch
- 1509.patch
- 1544.patch

build:
number: 1
number: 0


outputs:
Expand Down
34 changes: 0 additions & 34 deletions recipe/standalone_bindings.patch
View file
Open in desktop

This file was deleted.

63 changes: 0 additions & 63 deletions recipe/standalone_bindings_tests.patch
View file
Open in desktop

This file was deleted.