Merge 66d47b6 into 6dd0984

gazebosim · Aug 25, 2023 · 054d511 · 054d511
2 parents 6dd0984 + 66d47b6
commit 054d511
Show file tree

Hide file tree

Showing 12 changed files with 25 additions and 14 deletions.
diff --git a/examples/scripts/python_api/testFixture.py b/examples/scripts/python_api/testFixture.py
@@ -24,7 +24,7 @@
 
 import os
 
-from gz.common import set_verbosity
+from gz.common5 import set_verbosity
 from gz.sim8 import TestFixture, World, world_entity
 from gz.math7 import Vector3d
 

diff --git a/python/CMakeLists.txt b/python/CMakeLists.txt
@@ -66,17 +66,22 @@ target_compile_definitions(${BINDINGS_MODULE_NAME} PRIVATE
   BINDINGS_MODULE_NAME=${BINDINGS_MODULE_NAME})
 
 # TODO(ahcorde): Move this module to gz-common
-pybind11_add_module(common MODULE
+
+set(GZ_COMMON_BINDINGS_MODULE_NAME "common${GZ_COMMON_VER}")
+pybind11_add_module(${GZ_COMMON_BINDINGS_MODULE_NAME} MODULE
   src/gz/common/_gz_common_pybind11.cc
   src/gz/common/Console.cc
 )
 
-target_link_libraries(common PRIVATE
+target_compile_definitions(${GZ_COMMON_BINDINGS_MODULE_NAME} PRIVATE
+  BINDINGS_MODULE_NAME=${GZ_COMMON_BINDINGS_MODULE_NAME})
+
+target_link_libraries(${GZ_COMMON_BINDINGS_MODULE_NAME} PRIVATE
   gz-common${GZ_COMMON_VER}::gz-common${GZ_COMMON_VER}
 )
 
 configure_build_install_location(${BINDINGS_MODULE_NAME})
-configure_build_install_location(common)
+configure_build_install_location(${GZ_COMMON_BINDINGS_MODULE_NAME})
 
 if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
   # Workaround for Clang and pybind11 on Focal

diff --git a/python/src/gz/common/_gz_common_pybind11.cc b/python/src/gz/common/_gz_common_pybind11.cc
@@ -16,7 +16,7 @@
 
 #include "Console.hh"
 
-PYBIND11_MODULE(common, m) {
+PYBIND11_MODULE(BINDINGS_MODULE_NAME, m) {
   m.doc() = "Gazebo Common Python Library.";
 
   m.def(

diff --git a/python/src/gz/sim/TestFixture.cc b/python/src/gz/sim/TestFixture.cc
@@ -34,6 +34,11 @@ defineSimTestFixture(pybind11::object module)
 {
   pybind11::class_<TestFixture, std::shared_ptr<TestFixture>> testFixture(module, "TestFixture");
 
+  // Since this class starts with "Test", pytest thinks it's a test and emits a
+  // warning when it can't "collect" it.
+  // Silence the warning by setting `__test__=False`.
+  testFixture.attr("__test__") = false;
+
   testFixture
   .def(pybind11::init<const std::string &>())
   .def(

diff --git a/python/test/actor_TEST.py b/python/test/actor_TEST.py
@@ -17,7 +17,7 @@
 import datetime
 import unittest
 
-from gz.common import set_verbosity
+from gz_test_deps.common import set_verbosity
 from gz_test_deps.sim import (Actor, K_NULL_ENTITY,
                               TestFixture, World, world_entity)
 from gz_test_deps.math import Pose3d

diff --git a/python/test/gz_test_deps/common.py b/python/test/gz_test_deps/common.py
@@ -0,0 +1 @@
+from gz.common5 import *
diff --git a/python/test/joint_TEST.py b/python/test/joint_TEST.py
@@ -16,7 +16,7 @@
 import os
 import unittest
 
-from gz.common import set_verbosity
+from gz_test_deps.common import set_verbosity
 from gz_test_deps.sim import (K_NULL_ENTITY, TestFixture,
                               Joint, Model, World, world_entity)
 from gz_test_deps.math import Pose3d

diff --git a/python/test/link_TEST.py b/python/test/link_TEST.py
@@ -16,7 +16,7 @@
 import os
 import unittest
 
-from gz.common import set_verbosity
+from gz_test_deps.common import set_verbosity
 from gz_test_deps.sim import K_NULL_ENTITY, TestFixture, Link, Model, World, world_entity
 from gz_test_deps.math import Matrix3d, Vector3d
 

diff --git a/python/test/model_TEST.py b/python/test/model_TEST.py
@@ -16,7 +16,7 @@
 import os
 import unittest
 
-from gz.common import set_verbosity
+from gz_test_deps.common import set_verbosity
 from gz_test_deps.sim import K_NULL_ENTITY, TestFixture, Model, World, world_entity
 
 class TestModel(unittest.TestCase):

diff --git a/python/test/sensor_TEST.py b/python/test/sensor_TEST.py
@@ -16,7 +16,7 @@
 import os
 import unittest
 
-from gz.common import set_verbosity
+from gz_test_deps.common import set_verbosity
 from gz_test_deps.sim import (K_NULL_ENTITY, TestFixture,
                               Joint, Model, Sensor, World, world_entity)
 from gz_test_deps.math import Pose3d

diff --git a/python/test/testFixture_TEST.py b/python/test/testFixture_TEST.py
@@ -16,9 +16,9 @@
 import os
 import unittest
 
-from gz.common import set_verbosity
-from gz.sim8 import TestFixture, World, world_entity
-from gz.math7 import Vector3d
+from gz_test_deps.common import set_verbosity
+from gz_test_deps.sim import TestFixture, World, world_entity
+from gz_test_deps.math import Vector3d
 
 post_iterations = 0
 iterations = 0

diff --git a/python/test/world_TEST.py b/python/test/world_TEST.py
@@ -16,7 +16,7 @@
 import os
 import unittest
 
-from gz.common import set_verbosity
+from gz_test_deps.common import set_verbosity
 from gz_test_deps.sim import K_NULL_ENTITY, TestFixture, World, world_entity
 from gz_test_deps.math import SphericalCoordinates, Vector3d
 from gz_test_deps.sdformat import Atmosphere