diff --git a/generate_parameter_library/cmake/generate_parameter_library.cmake b/generate_parameter_library/cmake/generate_parameter_library.cmake index 1bf6d18c..5e6bb223 100644 --- a/generate_parameter_library/cmake/generate_parameter_library.cmake +++ b/generate_parameter_library/cmake/generate_parameter_library.cmake @@ -91,7 +91,6 @@ macro(generate_parameter_library LIB_NAME YAML_FILE) set_target_properties(${LIB_NAME} PROPERTIES LINKER_LANGUAGE CXX) target_link_libraries(${LIB_NAME} INTERFACE fmt::fmt - parameter_traits::parameter_traits rclcpp::rclcpp rclcpp_lifecycle::rclcpp_lifecycle rsl::rsl @@ -99,7 +98,7 @@ macro(generate_parameter_library LIB_NAME YAML_FILE) tl_expected::tl_expected ) install(DIRECTORY ${LIB_INCLUDE_DIR} DESTINATION include) - ament_export_dependencies(fmt parameter_traits rclcpp rclcpp_lifecycle rsl tcb_span tl_expected) + ament_export_dependencies(fmt rclcpp rclcpp_lifecycle rsl tcb_span tl_expected) endmacro() diff --git a/generate_parameter_library/generate_parameter_library-extras.cmake b/generate_parameter_library/generate_parameter_library-extras.cmake index 452030d4..a03ac546 100644 --- a/generate_parameter_library/generate_parameter_library-extras.cmake +++ b/generate_parameter_library/generate_parameter_library-extras.cmake @@ -27,7 +27,6 @@ # POSSIBILITY OF SUCH DAMAGE. find_package(fmt REQUIRED) -find_package(parameter_traits REQUIRED) find_package(rclcpp REQUIRED) find_package(rsl REQUIRED) find_package(rclcpp_lifecycle REQUIRED) diff --git a/generate_parameter_library/package.xml b/generate_parameter_library/package.xml index d1311a84..4216b0db 100644 --- a/generate_parameter_library/package.xml +++ b/generate_parameter_library/package.xml @@ -18,7 +18,6 @@ generate_parameter_library_py fmt - parameter_traits rclcpp rclpy rclcpp_lifecycle diff --git a/generate_parameter_library_py/generate_parameter_library_py/jinja_templates/cpp/parameter_library_header b/generate_parameter_library_py/generate_parameter_library_py/jinja_templates/cpp/parameter_library_header index 644d1ee7..2653822c 100644 --- a/generate_parameter_library_py/generate_parameter_library_py/jinja_templates/cpp/parameter_library_header +++ b/generate_parameter_library_py/generate_parameter_library_py/jinja_templates/cpp/parameter_library_header @@ -21,8 +21,6 @@ #include #include -#include - #include #include #include @@ -51,9 +49,6 @@ using rsl::gt_eq; using rsl::one_of; using rsl::to_parameter_result_msg; -// temporarily needed for backwards compatibility for custom validators -using namespace parameter_traits; - template [[nodiscard]] auto to_parameter_value(T value) { return rclcpp::ParameterValue(value); diff --git a/parameter_traits/CHANGELOG.rst b/parameter_traits/CHANGELOG.rst deleted file mode 100644 index 7a365156..00000000 --- a/parameter_traits/CHANGELOG.rst +++ /dev/null @@ -1,92 +0,0 @@ -^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -Changelog for package parameter_traits -^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ - -0.5.0 (2025-06-12) ------------------- -* Add some new maintainers for ROS releases (`#263 `_) -* Contributors: Nathan Brooks - -0.4.0 (2025-01-13) ------------------- - -0.3.9 (2024-10-27) ------------------- - -0.3.8 (2024-03-27) ------------------- - -0.3.7 (2024-01-12) ------------------- - -0.3.6 (2023-07-31) ------------------- - -0.3.5 (2023-07-28) ------------------- - -0.3.4 (2023-07-24) ------------------- - -0.3.3 (2023-04-13) ------------------- - -0.3.2 (2023-04-12) ------------------- - -0.3.1 (2023-02-01) ------------------- -* Make it easy for users to override (`#92 `_) -* Contributors: Tyler Weaver - -0.3.0 (2022-11-15) ------------------- -* Migrate from parameter_traits to RSL (take 2) (`#91 `_) -* Contributors: Tyler Weaver - -0.2.8 (2022-11-03) ------------------- - -0.2.7 (2022-10-28) ------------------- -* lt/gt/lt_eq/gt_eq validators (`#80 `_) -* Standardize cmake (`#79 `_) -* Add missing tcb_span ament export dep (`#78 `_) -* Contributors: Denis Štogl, Tyler Weaver - -0.2.6 (2022-09-28) ------------------- -* Remove unused member variable (`#77 `_) -* Depend on tcb_span (`#76 `_) -* Drop requirement for CMake to 3.16 (`#73 `_) -* Contributors: Tyler Weaver - -0.2.5 (2022-09-20) ------------------- -* Test validators and fix bugs (`#66 `_) -* Contributors: Tyler Weaver - -0.2.4 (2022-08-19) ------------------- -* 0.2.3 -* Contributors: Tyler Weaver - -0.2.3 (2022-08-05) ------------------- - -0.2.2 (2022-08-03) ------------------- - -0.2.1 (2022-08-02) ------------------- - -0.2.0 (2022-08-01) ------------------- -* Fixed length arrays (`#44 `_) -* Move fixed size string to parameter traits (`#42 `_) -* static OK to fix ODR errors (`#41 `_) -* Change package name (`#40 `_) -* Contributors: Paul Gesel, Tyler Weaver - -0.1.0 (2022-07-27) ------------------- diff --git a/parameter_traits/CMakeLists.txt b/parameter_traits/CMakeLists.txt deleted file mode 100644 index d4e6d6b2..00000000 --- a/parameter_traits/CMakeLists.txt +++ /dev/null @@ -1,49 +0,0 @@ -cmake_minimum_required(VERSION 3.16) -project(parameter_traits) - -# find dependencies -find_package(ament_cmake REQUIRED) -find_package(fmt REQUIRED) -find_package(rclcpp REQUIRED) -find_package(rsl REQUIRED) -find_package(tcb_span REQUIRED) -find_package(tl_expected REQUIRED) - -add_library(parameter_traits INTERFACE) -target_include_directories(parameter_traits INTERFACE - $ - $) -target_compile_features(parameter_traits INTERFACE cxx_std_17) -target_link_libraries(parameter_traits - INTERFACE - fmt::fmt - rclcpp::rclcpp - rsl::rsl - tcb_span::tcb_span - tl_expected::tl_expected -) - -if(BUILD_TESTING) - find_package(ament_lint_auto REQUIRED) - # the following lines skip linters - set(ament_cmake_cpplint_FOUND TRUE) # Conflicts with clang-foramt - set(ament_cmake_uncrustify_FOUND TRUE) # Conflicts with clang-format - ament_lint_auto_find_test_dependencies() -endif() - -install( - DIRECTORY include/ - DESTINATION include/parameter_traits -) - -install( - TARGETS parameter_traits - EXPORT export_parameter_traits - LIBRARY DESTINATION lib - ARCHIVE DESTINATION lib - RUNTIME DESTINATION bin -) - -ament_export_targets(export_parameter_traits HAS_LIBRARY_TARGET) -ament_export_dependencies(fmt rclcpp rsl tcb_span tl_expected) -ament_package() diff --git a/parameter_traits/include/parameter_traits/parameter_traits.hpp b/parameter_traits/include/parameter_traits/parameter_traits.hpp deleted file mode 100644 index f1e731a9..00000000 --- a/parameter_traits/include/parameter_traits/parameter_traits.hpp +++ /dev/null @@ -1,69 +0,0 @@ -// Copyright (c) 2022, PickNik Inc. -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions are met: -// -// * Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// -// * Redistributions in binary form must reproduce the above copyright -// notice, this list of conditions and the following disclaimer in the -// documentation and/or other materials provided with the distribution. -// -// * Neither the name of the copyright holder nor the names of its -// contributors may be used to endorse or promote products derived from -// this software without specific prior written permission. -// -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE -// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR -// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF -// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS -// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN -// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) -// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE -// POSSIBILITY OF SUCH DAMAGE. - -#pragma once - -#include -#include -#include - -namespace parameter_traits { - -using Result - [[deprecated("Use tl::expected for return instead. " - "`#include `.")]] = - tl::expected; - -template -[[deprecated( - "When returning tl::expected you can call fmt::format " - "directly.")]] auto -ERROR(const std::string& format, Args... args) - -> tl::expected { - return tl::make_unexpected(fmt::format(format, args...)); -} - -auto static OK - [[deprecated("When returning tl::expected default " - "construct for OK with `{}`.")]] = - tl::expected{}; - -template -[[deprecated("Use rsl::contains instead. `#include `")]] bool -contains(std::vector const& vec, T const& val) { - return rsl::contains(vec, val); -} - -template -[[deprecated( - "Use rsl::is_unique instead. `#include `")]] bool -is_unique(std::vector const& x) { - return rsl::is_unique(x); -} - -} // namespace parameter_traits diff --git a/parameter_traits/package.xml b/parameter_traits/package.xml deleted file mode 100644 index d8934c24..00000000 --- a/parameter_traits/package.xml +++ /dev/null @@ -1,29 +0,0 @@ - - - - parameter_traits - 0.5.0 - Functions and types for rclcpp::Parameter - bmagyar - christophfroehlich - Nathan Brooks - Shaurya Kumar - Paul Gesel - BSD-3-Clause - - ament_cmake - - fmt - rclcpp - rsl - tcb_span - tl_expected - - ament_cmake_gtest - ament_lint_auto - ament_lint_common - - - ament_cmake - -