diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index eb632e2..eb78a08 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -1,20 +1,20 @@ -# Copyright (c) 2023 Boston Dynamics AI Institute LLC. All rights reserved. +# Copyright (c) 2023 Robotics and AI Institute LLC dba RAI Institute. All rights reserved. repos: - repo: https://github.com/charliermarsh/ruff-pre-commit # Ruff version. - rev: 'v0.0.263' + rev: 'v0.14.4' hooks: - id: ruff args: ['--fix', '--config', '.config/ruff.toml'] - repo: https://github.com/psf/black - rev: 23.3.0 + rev: 25.11.0 hooks: - id: black language_version: python3.10 args: ['--config', '.config/black.toml'] verbose: true - repo: https://github.com/pre-commit/pre-commit-hooks - rev: v4.4.0 + rev: v6.0.0 hooks: - id: check-yaml args: ['--unsafe'] # details about the unsafe flag: @@ -30,7 +30,7 @@ repos: - id: end-of-file-fixer - id: trailing-whitespace - repo: https://github.com/ssciwr/clang-format-hook.git - rev: v14.0.0 + rev: v16.0.2 hooks: - id: clang-format types_or: [c++, c] @@ -39,20 +39,23 @@ repos: hooks: - id: cpplint args: ['--quiet', '--filter=-whitespace/comments', '--linelength=120'] + - repo: https://github.com/pre-commit/mirrors-mypy - rev: v1.2.0 + rev: v1.18.2 hooks: - id: mypy args: ['--config-file', '.config/mypy.ini'] pass_filenames: false additional_dependencies: + - protobuf - types-protobuf + - types-pytz + - types-PyYAML - types-requests - types-simplejson - - types-ujson - - types-PyYAML - - types-toml - types-six + - types-toml + - types-ujson - typing-extensions - repo: https://github.com/jumanjihouse/pre-commit-hooks diff --git a/LICENSE b/LICENSE index aa696ca..e0dfb3d 100644 --- a/LICENSE +++ b/LICENSE @@ -1,6 +1,6 @@ MIT License -Copyright (c) 2023 Boston Dynamics AI Institute +Copyright (c) 2023 Robotics and AI Institute LLC dba RAI Institute Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/proto2ros/CMakeLists.txt b/proto2ros/CMakeLists.txt index 98079d2..4af88c6 100644 --- a/proto2ros/CMakeLists.txt +++ b/proto2ros/CMakeLists.txt @@ -1,4 +1,4 @@ -# Copyright (c) 2023 Boston Dynamics AI Institute LLC. All rights reserved. +# Copyright (c) 2023 Robotics and AI Institute LLC dba RAI Institute. All rights reserved. cmake_minimum_required(VERSION 3.9) if(POLICY CMP0148) cmake_policy(SET CMP0148 OLD) # to accommodate rosidl pipeline diff --git a/proto2ros/cmake/proto2ros_generate.cmake b/proto2ros/cmake/proto2ros_generate.cmake index 9dd24da..ca2367d 100644 --- a/proto2ros/cmake/proto2ros_generate.cmake +++ b/proto2ros/cmake/proto2ros_generate.cmake @@ -1,4 +1,4 @@ -# Copyright (c) 2023 Boston Dynamics AI Institute LLC. All rights reserved. +# Copyright (c) 2023 Robotics and AI Institute LLC dba RAI Institute. All rights reserved. # Generates Protobuf <-> ROS 2 interoperability interfaces. # diff --git a/proto2ros/cmake/proto2ros_vendor_package.cmake b/proto2ros/cmake/proto2ros_vendor_package.cmake index 31e10f9..5eb4eb0 100644 --- a/proto2ros/cmake/proto2ros_vendor_package.cmake +++ b/proto2ros/cmake/proto2ros_vendor_package.cmake @@ -1,4 +1,4 @@ -# Copyright (c) 2023 Boston Dynamics AI Institute LLC. All rights reserved. +# Copyright (c) 2023 Robotics and AI Institute LLC dba RAI Institute. All rights reserved. # Vendors a package providing Protobuf messages, adding ROS 2 interoperability interfaces. # diff --git a/proto2ros/cmake/rosidl_helpers.cmake b/proto2ros/cmake/rosidl_helpers.cmake index b7ce862..0b80c42 100644 --- a/proto2ros/cmake/rosidl_helpers.cmake +++ b/proto2ros/cmake/rosidl_helpers.cmake @@ -1,4 +1,4 @@ -# Copyright (c) 2023 Boston Dynamics AI Institute LLC. All rights reserved. +# Copyright (c) 2023 Robotics and AI Institute LLC dba RAI Institute. All rights reserved. # Adds Python sources to an existing rosidl generated Python package. # diff --git a/proto2ros/include/proto2ros/conversions.hpp b/proto2ros/include/proto2ros/conversions.hpp index 1a49868..861a9f0 100644 --- a/proto2ros/include/proto2ros/conversions.hpp +++ b/proto2ros/include/proto2ros/conversions.hpp @@ -1,4 +1,5 @@ -// Copyright (c) 2024 Boston Dynamics AI Institute LLC. All rights reserved. +// Copyright (c) 2024 Robotics and AI Institute LLC dba RAI Institute. All +// rights reserved. /// This module provides basic conversion APIs, applicable to any proto2ros /// generated packages. diff --git a/proto2ros/msg/Any.msg b/proto2ros/msg/Any.msg index e568cd2..a45880c 100644 --- a/proto2ros/msg/Any.msg +++ b/proto2ros/msg/Any.msg @@ -1,4 +1,4 @@ -# Copyright (c) 2023 Boston Dynamics AI Institute LLC. All rights reserved. +# Copyright (c) 2023 Robotics and AI Institute LLC dba RAI Institute. All rights reserved. # A dynamically typed ROS 2 message. diff --git a/proto2ros/msg/AnyProto.msg b/proto2ros/msg/AnyProto.msg index 881080c..c7f999e 100644 --- a/proto2ros/msg/AnyProto.msg +++ b/proto2ros/msg/AnyProto.msg @@ -1,4 +1,4 @@ -# Copyright (c) 2023 Boston Dynamics AI Institute LLC. All rights reserved. +# Copyright (c) 2023 Robotics and AI Institute LLC dba RAI Institute. All rights reserved. # A dynamically typed Protobuf message. Equivalent to the google.protobuf.Any message. # See https://protobuf.dev/reference/protobuf/google.protobuf/#any for further reference. diff --git a/proto2ros/msg/Bytes.msg b/proto2ros/msg/Bytes.msg index a835697..fc209a2 100644 --- a/proto2ros/msg/Bytes.msg +++ b/proto2ros/msg/Bytes.msg @@ -1,4 +1,4 @@ -# Copyright (c) 2023 Boston Dynamics AI Institute LLC. All rights reserved. +# Copyright (c) 2023 Robotics and AI Institute LLC dba RAI Institute. All rights reserved. # A binary blob. Equivalent to the google.protobuf.BytesValue message, also used to map repeated bytes fields to # the ROS 2 domain. See https://protobuf.dev/reference/protobuf/google.protobuf/#bytes-value for further reference. diff --git a/proto2ros/msg/List.msg b/proto2ros/msg/List.msg index d012d59..10c1898 100644 --- a/proto2ros/msg/List.msg +++ b/proto2ros/msg/List.msg @@ -1,4 +1,4 @@ -# Copyright (c) 2023 Boston Dynamics AI Institute LLC. All rights reserved. +# Copyright (c) 2023 Robotics and AI Institute LLC dba RAI Institute. All rights reserved. # A list of dynamically typed values. Equivalent to the google.protobuf.ListValue message. # See https://protobuf.dev/reference/protobuf/google.protobuf/#list-value for further reference. diff --git a/proto2ros/msg/Struct.msg b/proto2ros/msg/Struct.msg index 23d382a..8e70d50 100644 --- a/proto2ros/msg/Struct.msg +++ b/proto2ros/msg/Struct.msg @@ -1,4 +1,4 @@ -# Copyright (c) 2023 Boston Dynamics AI Institute LLC. All rights reserved. +# Copyright (c) 2023 Robotics and AI Institute LLC dba RAI Institute. All rights reserved. # A structured data value with dynamically typed fields. Equivalent to the google.protobuf.Struct message. # See https://protobuf.dev/reference/protobuf/google.protobuf/#struct for further reference. diff --git a/proto2ros/msg/StructEntry.msg b/proto2ros/msg/StructEntry.msg index 8d16464..e77d894 100644 --- a/proto2ros/msg/StructEntry.msg +++ b/proto2ros/msg/StructEntry.msg @@ -1,4 +1,4 @@ -# Copyright (c) 2023 Boston Dynamics AI Institute LLC. All rights reserved. +# Copyright (c) 2023 Robotics and AI Institute LLC dba RAI Institute. All rights reserved. # Key-value entries in the proto2ros/Struct ROS 2 message. Equivalent to # the auxiliary Protobuf message used over-the-wire representation of the diff --git a/proto2ros/msg/Value.msg b/proto2ros/msg/Value.msg index 92462c4..faef53d 100644 --- a/proto2ros/msg/Value.msg +++ b/proto2ros/msg/Value.msg @@ -1,4 +1,4 @@ -# Copyright (c) 2023 Boston Dynamics AI Institute LLC. All rights reserved. +# Copyright (c) 2023 Robotics and AI Institute LLC dba RAI Institute. All rights reserved. # A dynamically typed (scalar or composite) value. Equivalent to the google.protobuf.Value message. # See https://protobuf.dev/reference/protobuf/google.protobuf/#value for further reference. diff --git a/proto2ros/package.xml b/proto2ros/package.xml index ac1a826..7d26739 100644 --- a/proto2ros/package.xml +++ b/proto2ros/package.xml @@ -1,13 +1,13 @@ proto2ros 1.0.0 Protobuf to ROS 2 interoperability interfaces - Boston Dynamics AI Institute + Robotics and AI Institute LLC dba RAI Institute MIT ament_cmake diff --git a/proto2ros/proto2ros-extras.cmake b/proto2ros/proto2ros-extras.cmake index 5542598..3c3c14d 100644 --- a/proto2ros/proto2ros-extras.cmake +++ b/proto2ros/proto2ros-extras.cmake @@ -1,4 +1,4 @@ -# Copyright (c) 2023 Boston Dynamics AI Institute LLC. All rights reserved. +# Copyright (c) 2023 Robotics and AI Institute LLC dba RAI Institute. All rights reserved. include("${proto2ros_DIR}/rosidl_helpers.cmake") if(POLICY CMP0148) cmake_policy(SET CMP0148 OLD) # to accommodate rosidl pipeline diff --git a/proto2ros/proto2ros/cli/generate.py b/proto2ros/proto2ros/cli/generate.py index 747de74..bd351e8 100644 --- a/proto2ros/proto2ros/cli/generate.py +++ b/proto2ros/proto2ros/cli/generate.py @@ -1,4 +1,4 @@ -# Copyright (c) 2023 Boston Dynamics AI Institute LLC. All rights reserved. +# Copyright (c) 2023 Robotics and AI Institute LLC dba RAI Institute. All rights reserved. import argparse import collections import importlib diff --git a/proto2ros/proto2ros/compatibility.py b/proto2ros/proto2ros/compatibility.py index f14bca8..cac8e25 100644 --- a/proto2ros/proto2ros/compatibility.py +++ b/proto2ros/proto2ros/compatibility.py @@ -1,4 +1,4 @@ -# Copyright (c) 2023 Boston Dynamics AI Institute LLC. All rights reserved. +# Copyright (c) 2023 Robotics and AI Institute LLC dba RAI Institute. All rights reserved. # ruff: noqa # fmt: off diff --git a/proto2ros/proto2ros/configuration/__init__.py b/proto2ros/proto2ros/configuration/__init__.py index 8bb8181..b05f829 100644 --- a/proto2ros/proto2ros/configuration/__init__.py +++ b/proto2ros/proto2ros/configuration/__init__.py @@ -1,4 +1,4 @@ -# Copyright (c) 2023 Boston Dynamics AI Institute LLC. All rights reserved. +# Copyright (c) 2023 Robotics and AI Institute LLC dba RAI Institute. All rights reserved. """This module defines configuration data structures for proto2ros generation.""" diff --git a/proto2ros/proto2ros/conversions/__init__.py b/proto2ros/proto2ros/conversions/__init__.py index a579f2f..df2755d 100644 --- a/proto2ros/proto2ros/conversions/__init__.py +++ b/proto2ros/proto2ros/conversions/__init__.py @@ -1,4 +1,4 @@ -# Copyright (c) 2023 Boston Dynamics AI Institute LLC. All rights reserved. +# Copyright (c) 2023 Robotics and AI Institute LLC dba RAI Institute. All rights reserved. import multipledispatch # Overloads entrypoint (via multiple dispatch) diff --git a/proto2ros/proto2ros/conversions/basic.py b/proto2ros/proto2ros/conversions/basic.py index ed6e4eb..7a56990 100644 --- a/proto2ros/proto2ros/conversions/basic.py +++ b/proto2ros/proto2ros/conversions/basic.py @@ -1,4 +1,4 @@ -# Copyright (c) 2023 Boston Dynamics AI Institute LLC. All rights reserved. +# Copyright (c) 2023 Robotics and AI Institute LLC dba RAI Institute. All rights reserved. """This module provides basic conversion APIs, applicable to any proto2ros generated packages.""" @@ -353,12 +353,12 @@ def convert_proto2ros_value_message_to_google_protobuf_value_proto( elif ros_msg.kind == Value.BOOL_VALUE_SET: proto_msg.bool_value = ros_msg.bool_value elif ros_msg.kind == Value.STRUCT_VALUE_SET: - if proto_msg.struct_value.type_name != "proto2ros/Struct": + if ros_msg.struct_value.type_name != "proto2ros/Struct": raise ValueError( - f"expected proto2ros/Struct message for struct_value member, got {proto_msg.struct_value.type}", + f"expected proto2ros/Struct message for struct_value member, got {ros_msg.struct_value.type_name}", ) typed_field_message = rclpy.serialization.deserialize_message( - proto_msg.struct_value.value.tobytes(), + ros_msg.struct_value.value.tobytes(), Struct, ) convert_proto2ros_struct_message_to_google_protobuf_struct_proto( @@ -366,12 +366,12 @@ def convert_proto2ros_value_message_to_google_protobuf_value_proto( proto_msg.struct_value, ) elif ros_msg.kind == Value.LIST_VALUE_SET: - if proto_msg.list_value.type_name != "proto2ros/List": + if ros_msg.list_value.type_name != "proto2ros/List": raise ValueError( - f"expected proto2ros/Struct message for list_value member, got {proto_msg.list_value.type}", + f"expected proto2ros/List message for list_value member, got {ros_msg.list_value.type_name}", ) typed_field_message = rclpy.serialization.deserialize_message( - proto_msg.list_value.value.tobytes(), + ros_msg.list_value.value.tobytes(), List, ) convert_proto2ros_list_message_to_google_protobuf_list_value_proto( @@ -393,7 +393,7 @@ def convert_google_protobuf_value_proto_to_proto2ros_value_message( ros_msg: Value, ) -> None: """Converts from google.protobuf.Value Protobuf messages to proto2ros/Value ROS messages.""" - which = proto_msg.WhichOneOf("kind") + which = proto_msg.WhichOneof("kind") if which == "null_value": ros_msg.kind = Value.NO_VALUE_SET elif which == "number_value": @@ -421,7 +421,8 @@ def convert_google_protobuf_value_proto_to_proto2ros_value_message( ros_msg.list_value.type_name = "proto2ros/List" ros_msg.kind = Value.LIST_VALUE_SET else: - raise ValueError("unexpected one-of field: " + proto_msg.WhichOneOf("kind")) + which_oneof = proto_msg.WhichOneof("kind") + raise ValueError(f"unexpected one-of field: {which_oneof}") convert_proto_to_proto2ros_value = convert_google_protobuf_value_proto_to_proto2ros_value_message diff --git a/proto2ros/proto2ros/dependencies.py b/proto2ros/proto2ros/dependencies.py index b31a22d..6837045 100644 --- a/proto2ros/proto2ros/dependencies.py +++ b/proto2ros/proto2ros/dependencies.py @@ -1,4 +1,4 @@ -# Copyright (c) 2023 Boston Dynamics AI Institute LLC. All rights reserved. +# Copyright (c) 2023 Robotics and AI Institute LLC dba RAI Institute. All rights reserved. """This module provides APIs to manipulate dependencies between Protobuf <-> ROS message equivalences.""" diff --git a/proto2ros/proto2ros/descriptors/sources.py b/proto2ros/proto2ros/descriptors/sources.py index da30459..d57f3c9 100644 --- a/proto2ros/proto2ros/descriptors/sources.py +++ b/proto2ros/proto2ros/descriptors/sources.py @@ -1,4 +1,4 @@ -# Copyright (c) 2023 Boston Dynamics AI Institute LLC. All rights reserved. +# Copyright (c) 2023 Robotics and AI Institute LLC dba RAI Institute. All rights reserved. """This module provides APIs to work with Protobuf definition sources.""" diff --git a/proto2ros/proto2ros/descriptors/types.py b/proto2ros/proto2ros/descriptors/types.py index 2696c2a..d27b3e9 100644 --- a/proto2ros/proto2ros/descriptors/types.py +++ b/proto2ros/proto2ros/descriptors/types.py @@ -1,4 +1,4 @@ -# Copyright (c) 2023 Boston Dynamics AI Institute LLC. All rights reserved. +# Copyright (c) 2023 Robotics and AI Institute LLC dba RAI Institute. All rights reserved. """This module provides Protobuf typing details.""" diff --git a/proto2ros/proto2ros/descriptors/utilities.py b/proto2ros/proto2ros/descriptors/utilities.py index 9d30aab..f87405c 100644 --- a/proto2ros/proto2ros/descriptors/utilities.py +++ b/proto2ros/proto2ros/descriptors/utilities.py @@ -1,4 +1,4 @@ -# Copyright (c) 2023 Boston Dynamics AI Institute LLC. All rights reserved. +# Copyright (c) 2023 Robotics and AI Institute LLC dba RAI Institute. All rights reserved. """This module provides utilities to work with Protobuf descriptors. diff --git a/proto2ros/proto2ros/equivalences.py b/proto2ros/proto2ros/equivalences.py index 1177f01..af21b92 100644 --- a/proto2ros/proto2ros/equivalences.py +++ b/proto2ros/proto2ros/equivalences.py @@ -1,4 +1,4 @@ -# Copyright (c) 2023 Boston Dynamics AI Institute LLC. All rights reserved. +# Copyright (c) 2023 Robotics and AI Institute LLC dba RAI Institute. All rights reserved. """This module provides APIs to extract Protobuf <-> ROS message equivalences. diff --git a/proto2ros/proto2ros/output/cpp.py b/proto2ros/proto2ros/output/cpp.py index 66ad45a..5cf4436 100644 --- a/proto2ros/proto2ros/output/cpp.py +++ b/proto2ros/proto2ros/output/cpp.py @@ -1,4 +1,4 @@ -# Copyright (c) 2024 Boston Dynamics AI Institute LLC. All rights reserved. +# Copyright (c) 2024 Robotics and AI Institute LLC dba RAI Institute. All rights reserved. """This module provides APIs to write C++ conversion code.""" diff --git a/proto2ros/proto2ros/output/interfaces.py b/proto2ros/proto2ros/output/interfaces.py index 12c39c5..9585833 100644 --- a/proto2ros/proto2ros/output/interfaces.py +++ b/proto2ros/proto2ros/output/interfaces.py @@ -1,4 +1,4 @@ -# Copyright (c) 2023 Boston Dynamics AI Institute LLC. All rights reserved. +# Copyright (c) 2023 Robotics and AI Institute LLC dba RAI Institute. All rights reserved. """This module provides APIs to write ROS message specifications.""" diff --git a/proto2ros/proto2ros/output/python.py b/proto2ros/proto2ros/output/python.py index da15b9c..8767a55 100644 --- a/proto2ros/proto2ros/output/python.py +++ b/proto2ros/proto2ros/output/python.py @@ -1,4 +1,4 @@ -# Copyright (c) 2023 Boston Dynamics AI Institute LLC. All rights reserved. +# Copyright (c) 2023 Robotics and AI Institute LLC dba RAI Institute. All rights reserved. """This module provides APIs to write Python conversion code.""" diff --git a/proto2ros/proto2ros/utilities.py b/proto2ros/proto2ros/utilities.py index 15ee2ef..d785184 100644 --- a/proto2ros/proto2ros/utilities.py +++ b/proto2ros/proto2ros/utilities.py @@ -1,4 +1,4 @@ -# Copyright (c) 2023 Boston Dynamics AI Institute LLC. All rights reserved. +# Copyright (c) 2023 Robotics and AI Institute LLC dba RAI Institute. All rights reserved. """This module provides various utilities used across the proto2ros package.""" diff --git a/proto2ros/setup.cfg b/proto2ros/setup.cfg index 464b358..545c14c 100644 --- a/proto2ros/setup.cfg +++ b/proto2ros/setup.cfg @@ -1,4 +1,4 @@ -# Copyright (c) 2023 Boston Dynamics AI Institute LLC. All rights reserved. +# Copyright (c) 2023 Robotics and AI Institute LLC dba RAI Institute. All rights reserved. [options.entry_points] console_scripts = generate = proto2ros.cli.generate:main diff --git a/proto2ros/src/conversions.cpp b/proto2ros/src/conversions.cpp index afa5d58..f9c19d2 100644 --- a/proto2ros/src/conversions.cpp +++ b/proto2ros/src/conversions.cpp @@ -1,7 +1,9 @@ -// Copyright (c) 2024 Boston Dynamics AI Institute LLC. All rights reserved. +// Copyright (c) 2024 Robotics and AI Institute LLC dba RAI Institute. All +// rights reserved. #include "proto2ros/conversions.hpp" +#include #include #include diff --git a/proto2ros_tests/CMakeLists.txt b/proto2ros_tests/CMakeLists.txt index c9fbf9d..5927a11 100644 --- a/proto2ros_tests/CMakeLists.txt +++ b/proto2ros_tests/CMakeLists.txt @@ -1,4 +1,4 @@ -# Copyright (c) 2023 Boston Dynamics AI Institute LLC. All rights reserved. +# Copyright (c) 2023 Robotics and AI Institute LLC dba RAI Institute. All rights reserved. cmake_minimum_required(VERSION 3.12) if(POLICY CMP0148) cmake_policy(SET CMP0148 OLD) # to accommodate rosidl pipeline diff --git a/proto2ros_tests/include/proto2ros_tests/manual_conversions.hpp b/proto2ros_tests/include/proto2ros_tests/manual_conversions.hpp index a18c9a7..357ce2a 100644 --- a/proto2ros_tests/include/proto2ros_tests/manual_conversions.hpp +++ b/proto2ros_tests/include/proto2ros_tests/manual_conversions.hpp @@ -1,4 +1,5 @@ -// Copyright (c) 2024 Boston Dynamics AI Institute LLC. All rights reserved. +// Copyright (c) 2024 Robotics and AI Institute LLC dba RAI Institute. All +// rights reserved. #pragma once diff --git a/proto2ros_tests/package.xml b/proto2ros_tests/package.xml index bac2c4b..f83cbce 100644 --- a/proto2ros_tests/package.xml +++ b/proto2ros_tests/package.xml @@ -1,13 +1,13 @@ proto2ros_tests 1.0.0 Protobuf to ROS 2 interoperability interfaces tests - Boston Dynamics AI Institute + Robotics and AI Institute LLC dba RAI Institute MIT ament_cmake diff --git a/proto2ros_tests/proto/CMakeLists.txt b/proto2ros_tests/proto/CMakeLists.txt index 2b1f899..0fca34b 100644 --- a/proto2ros_tests/proto/CMakeLists.txt +++ b/proto2ros_tests/proto/CMakeLists.txt @@ -1,4 +1,4 @@ -# Copyright (c) 2023 Boston Dynamics AI Institute LLC. All rights reserved. +# Copyright (c) 2023 Robotics and AI Institute LLC dba RAI Institute. All rights reserved. find_package(Protobuf REQUIRED) file(MAKE_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/bosdyn/api") diff --git a/proto2ros_tests/proto2ros_tests/manual_conversions.py b/proto2ros_tests/proto2ros_tests/manual_conversions.py index 09dd61c..c573d55 100644 --- a/proto2ros_tests/proto2ros_tests/manual_conversions.py +++ b/proto2ros_tests/proto2ros_tests/manual_conversions.py @@ -4,7 +4,6 @@ import geometry_msgs.msg import sensor_msgs.msg import test_pb2 - from proto2ros.conversions import convert diff --git a/proto2ros_tests/src/manual_conversions.cpp b/proto2ros_tests/src/manual_conversions.cpp index b952704..e570c72 100644 --- a/proto2ros_tests/src/manual_conversions.cpp +++ b/proto2ros_tests/src/manual_conversions.cpp @@ -1,8 +1,10 @@ -// Copyright (c) 2024 Boston Dynamics AI Institute LLC. All rights reserved. +// Copyright (c) 2024 Robotics and AI Institute LLC dba RAI Institute. All +// rights reserved. #include "proto2ros_tests/manual_conversions.hpp" #include +#include namespace proto2ros_tests::conversions { diff --git a/proto2ros_tests/test/test_proto2ros.cpp b/proto2ros_tests/test/test_proto2ros.cpp index e1c9d00..2de7a36 100644 --- a/proto2ros_tests/test/test_proto2ros.cpp +++ b/proto2ros_tests/test/test_proto2ros.cpp @@ -1,4 +1,5 @@ -// Copyright (c) 2024 Boston Dynamics AI Institute LLC. All rights reserved. +// Copyright (c) 2024 Robotics and AI Institute LLC dba RAI Institute. All +// rights reserved. // NOLINTBEGIN(readability-magic-numbers,readability-function-cognitive-complexity,cppcoreguidelines-pro-type-reinterpret-cast) #include #include diff --git a/proto2ros_tests/test/test_proto2ros.py b/proto2ros_tests/test/test_proto2ros.py index f74665e..1c41b0d 100644 --- a/proto2ros_tests/test/test_proto2ros.py +++ b/proto2ros_tests/test/test_proto2ros.py @@ -1,4 +1,4 @@ -# Copyright (c) 2023 Boston Dynamics AI Institute LLC. All rights reserved. +# Copyright (c) 2023 Robotics and AI Institute LLC dba RAI Institute. All rights reserved. import filecmp import math @@ -8,11 +8,11 @@ import bosdyn.api.geometry_pb2 import geometry_msgs.msg import google.protobuf.type_pb2 +import proto2ros_tests.msg import test_pb2 +from proto2ros_tests.conversions import convert -import proto2ros_tests.msg from proto2ros.msg import Any, AnyProto # type: ignore -from proto2ros_tests.conversions import convert def test_message_generation() -> None: