diff --git a/python/CMakeLists.txt b/python/CMakeLists.txt index 385660fd5d..ee094ff590 100644 --- a/python/CMakeLists.txt +++ b/python/CMakeLists.txt @@ -64,20 +64,6 @@ target_link_libraries(common PRIVATE ignition-common${IGN_COMMON_VER}::ignition-common${IGN_COMMON_VER} ) -# TODO(ahcorde): Move this module to sdformat -pybind11_add_module(sdformat SHARED - src/ignition/sdformat/_sdformat_pybind11.cc - src/ignition/sdformat/Element.cc -) - -target_link_libraries(sdformat PRIVATE - sdformat${SDF_VER}::sdformat${SDF_VER} -) - -install(TARGETS sdformat - DESTINATION "${IGN_PYTHON_INSTALL_PATH}" -) - configure_build_install_location(gazebo) configure_build_install_location(common) @@ -88,7 +74,6 @@ if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang") if(${pybind11_VERSION} VERSION_LESS "2.4.4") target_compile_options(common PRIVATE -fsized-deallocation) target_compile_options(gazebo PRIVATE -fsized-deallocation) - target_compile_options(sdformat PRIVATE -fsized-deallocation) endif() endif() diff --git a/python/src/ignition/gazebo/wrap_functions.hh b/python/src/ignition/gazebo/wrap_functions.hh index 2a60b93668..4b4acc4697 100644 --- a/python/src/ignition/gazebo/wrap_functions.hh +++ b/python/src/ignition/gazebo/wrap_functions.hh @@ -287,8 +287,7 @@ struct wrap_ref_ptr : public wrap_arg_default {}; template struct wrap_ref_ptr && - !std::is_same_v> >> { + std::enable_if_t>> { // NOLINTNEXTLINE[runtime/references]: Intentional. static T* wrap(T& arg) { return &arg; } static T& unwrap(T* arg_wrapped) { diff --git a/python/src/ignition/sdformat/Element.cc b/python/src/ignition/sdformat/Element.cc deleted file mode 100644 index 4e40b0fdec..0000000000 --- a/python/src/ignition/sdformat/Element.cc +++ /dev/null @@ -1,36 +0,0 @@ -/* - * Copyright (C) 2021 Open Source Robotics Foundation - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#include -#include - -#include "sdf/Element.hh" - -namespace ignition -{ -namespace gazebo -{ -namespace python -{ -///////////////////////////////////////////////// -void defineGazeboElement(pybind11::object module) -{ - pybind11::class_>(module, "Element") - .def(pybind11::init<>()); -} -} // namespace python -} // namespace gazebo -} // namespace ignition diff --git a/python/src/ignition/sdformat/Element.hh b/python/src/ignition/sdformat/Element.hh deleted file mode 100644 index 370dcc53a1..0000000000 --- a/python/src/ignition/sdformat/Element.hh +++ /dev/null @@ -1,38 +0,0 @@ -/* - * Copyright (C) 2021 Open Source Robotics Foundation - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#ifndef IGNITION_GAZEBO_PYTHON__ELEMENT_HH_ -#define IGNITION_GAZEBO_PYTHON__ELEMENT_HH_ - -#include - -namespace ignition -{ -namespace gazebo -{ -namespace python -{ -/// Define a pybind11 wrapper for an sdformat::Element -/** - * \param[in] module a pybind11 module to add the definition to - */ -void -defineGazeboElement(pybind11::object module); -} // namespace python -} // namespace gazebo -} // namespace ignition - -#endif // IGNITION_GAZEBO_PYTHON__ELEMENT_HH_ diff --git a/python/src/ignition/sdformat/_sdformat_pybind11.cc b/python/src/ignition/sdformat/_sdformat_pybind11.cc deleted file mode 100644 index 1483727728..0000000000 --- a/python/src/ignition/sdformat/_sdformat_pybind11.cc +++ /dev/null @@ -1,23 +0,0 @@ -// Copyright 2021 Open Source Robotics Foundation, Inc. -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -#include - -#include "Element.hh" - -PYBIND11_MODULE(sdformat, m) { - m.doc() = "Ignition Common Python Library."; - - ignition::gazebo::python::defineGazeboElement(m); -} diff --git a/python/test/testFixture_TEST.py b/python/test/testFixture_TEST.py index b48c501330..32d6852249 100644 --- a/python/test/testFixture_TEST.py +++ b/python/test/testFixture_TEST.py @@ -19,7 +19,6 @@ from ignition.common import set_verbosity from ignition.gazebo import TestFixture, World, world_entity from ignition.math import Vector3d -from sdformat import Element post_iterations = 0 iterations = 0