Clear out try-imports in loader test fixtures

Author: stephane-caron

tests/loaders/test_pinocchio.py

@@ -20,46 +20,41 @@
 
 from robot_descriptions._descriptions import DESCRIPTIONS
 
-try:
-    from robot_descriptions.loaders.pinocchio import load_robot_description
+from robot_descriptions.loaders.pinocchio import load_robot_description
 
-    class TestPinocchio(unittest.TestCase):
+class TestPinocchio(unittest.TestCase):
 
-        """
-        Check that all descriptions are loaded properly in Pinocchio.
-        """
-
-        def setUp(self):
-            logging.basicConfig()
-            logging.getLogger().setLevel(logging.INFO)
+    """
+    Check that all descriptions are loaded properly in Pinocchio.
+    """
 
-        @staticmethod
-        def get_test_for_description(description: str):
-            """
-            Get test function for a given description.
+    def setUp(self):
+        logging.basicConfig()
+        logging.getLogger().setLevel(logging.INFO)
 
-            Args:
-                description: Name of the description.
-
-            Returns:
-                Test function for that description.
-            """
+    @staticmethod
+    def get_test_for_description(description: str):
+        """
+        Get test function for a given description.
 
-            def test(self):
-                logging.info(f"Loading {description} in Pinocchio...")
-                load_robot_description(description)
+        Args:
+            description: Name of the description.
 
-            return test
+        Returns:
+            Test function for that description.
+        """
 
-    # Add a test function for each URDF description
-    for name, description in DESCRIPTIONS.items():
-        if description.has_urdf:
-            setattr(
-                TestPinocchio,
-                f"test_{name}",
-                TestPinocchio.get_test_for_description(name),
-            )
+        def test(self):
+            logging.info(f"Loading {description} in Pinocchio...")
+            load_robot_description(description)
 
-except ImportError:
+        return test
 
-    pass
+# Add a test function for each URDF description
+for name, description in DESCRIPTIONS.items():
+    if description.has_urdf:
+        setattr(
+            TestPinocchio,
+            f"test_{name}",
+            TestPinocchio.get_test_for_description(name),
+        )

tests/loaders/test_pybullet.py

@@ -21,6 +21,7 @@
 import pybullet
 
 from robot_descriptions._descriptions import DESCRIPTIONS
+
 from robot_descriptions.loaders.pybullet import load_robot_description
 
 

tests/loaders/test_robomeshcat.py

@@ -17,41 +17,36 @@
 
 import unittest
 
-try:
-    from robot_descriptions.loaders.robomeshcat import load_robot_description
+from robot_descriptions.loaders.robomeshcat import load_robot_description
 
-    class TestRoboMeshCat(unittest.TestCase):
 
-        """
-        Check that all descriptions are loaded properly in RoboMeshCat.
-
-        Since RoboMeshCat relies on Pinocchio, we only test it on a couple of
-        robot descriptions.
-        """
+class TestRoboMeshCat(unittest.TestCase):
 
-        def test_load_robot_description(self):
-            """
-            Load a robot description with RoboMeshCat.
+    """
+    Check that all descriptions are loaded properly in RoboMeshCat.
 
-            """
-            mini_cheetah = load_robot_description("mini_cheetah_description")
-            self.assertIsNotNone(mini_cheetah)
+    Since RoboMeshCat relies on Pinocchio, we only test it on a couple of
+    robot descriptions.
+    """
 
-        # def test_description_with_cylinders(self):
-        #     """
-        #     Load a robot description with cylinder shapes.
-        #     """
-        #     upkie = load_robot_description("upkie_description")
-        #     self.assertIsNotNone(upkie)
-
-        def test_collada_description(self):
-            """
-            Test a robot description with Collada meshes.
-            """
-            r2 = load_robot_description("r2_description")
-            self.assertIsNotNone(r2)
+    def test_load_robot_description(self):
+        """
+        Load a robot description with RoboMeshCat.
 
+        """
+        mini_cheetah = load_robot_description("mini_cheetah_description")
+        self.assertIsNotNone(mini_cheetah)
 
-except ImportError:
+    def test_description_with_cylinders(self):
+        """
+        Load a robot description with cylinder shapes.
+        """
+        upkie = load_robot_description("upkie_description")
+        self.assertIsNotNone(upkie)
 
-    pass
+    def test_collada_description(self):
+        """
+        Test a robot description with Collada meshes.
+        """
+        r2 = load_robot_description("r2_description")
+        self.assertIsNotNone(r2)

tests/loaders/test_yourdfpy.py

@@ -19,8 +19,8 @@
 import unittest
 
 from robot_descriptions._descriptions import DESCRIPTIONS
-from robot_descriptions.loaders.yourdfpy import load_robot_description
 
+from robot_descriptions.loaders.yourdfpy import load_robot_description
 
 class TestYourdfpy(unittest.TestCase):
 
@@ -50,7 +50,6 @@ def test(self):
 
         return test
 
-
 for name, description in DESCRIPTIONS.items():
     if description.has_urdf:
         setattr(

tox.ini

@@ -1,6 +1,6 @@
 [tox]
 isolated_build = True
-envlist = py{37, 38, 39, 310}
+envlist = py{37,38,39,310}-{mujoco,pinocchio,pybullet,robomeshcat,yourdfpy}
 
 [gh-actions]
 python =