dynamicalnodes 0.2.0__tar.gz → 0.2.1__tar.gz

{dynamicalnodes-0.2.0/src/dynamicalnodes.egg-info → dynamicalnodes-0.2.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dynamicalnodes
-Version: 0.2.0
+Version: 0.2.1
 Summary: dynamicalnodes is a Python library for modeling general control systems.
 Author-email: Nehal Singh Mangat <nehalsinghmangat.software@gmail.com>
 License-Expression: MIT

{dynamicalnodes-0.2.0 → dynamicalnodes-0.2.1}/pyproject.toml

@@ -7,7 +7,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "dynamicalnodes"
-version = "0.2.0"
+version = "0.2.1"
 description = "dynamicalnodes is a Python library for modeling general control systems."
 readme = "README.md"
 requires-python = ">=3.12"

{dynamicalnodes-0.2.0 → dynamicalnodes-0.2.1}/src/dynamicalnodes/__init__.py

@@ -20,7 +20,9 @@ def __getattr__(name):
             return mod if attr is None else getattr(mod, attr)
         except ImportError as e:
             raise ImportError(
-                f"{name} requires ROS2 dependencies. Install with: pip install dynamicalnodes[ros2]\n"
+                f"{name} requires a ROS2 installation (rclpy and the ROS message packages are "
+                f"system packages, not on PyPI). Install ROS2 and source its setup script, "
+                f"e.g. `source /opt/ros/jazzy/setup.bash`.\n"
                 f"Original error: {e}"
             ) from e
     raise AttributeError(f"module {__name__!r} has no attribute {name!r}")

{dynamicalnodes-0.2.0 → dynamicalnodes-0.2.1}/src/dynamicalnodes/rosnode.py

@@ -450,6 +450,8 @@ class ROSNode:
         True
         >>> "SingleThreadedExecutor" in content
         True
+        >>> "ExternalShutdownException" in content and "if rclpy.ok():" in content
+        True
         >>> "_u_k_seen" in content
         True
         >>> os.unlink(path)
@@ -751,7 +753,7 @@ class ROSNode:
         blank()
         ln("import rclpy")
         ln("from rclpy.node import Node")
-        ln("from rclpy.executors import SingleThreadedExecutor")
+        ln("from rclpy.executors import ExternalShutdownException, SingleThreadedExecutor")
         ln("from rclpy.callback_groups import ReentrantCallbackGroup")
         ln("from rclpy.qos import QoSProfile, QoSHistoryPolicy, QoSReliabilityPolicy")
         blank()
@@ -1121,11 +1123,12 @@ class ROSNode:
         ln("    executor.add_node(node)")
         ln("    try:")
         ln("        executor.spin()")
-        ln("    except KeyboardInterrupt:")
+        ln("    except (KeyboardInterrupt, ExternalShutdownException):")
         ln("        pass")
         ln("    finally:")
         ln("        node.destroy_node()")
-        ln("        rclpy.shutdown()")
+        ln("        if rclpy.ok():")
+        ln("            rclpy.shutdown()")
         blank()
         blank()
         ln('if __name__ == "__main__":')

{dynamicalnodes-0.2.0 → dynamicalnodes-0.2.1/src/dynamicalnodes.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dynamicalnodes
-Version: 0.2.0
+Version: 0.2.1
 Summary: dynamicalnodes is a Python library for modeling general control systems.
 Author-email: Nehal Singh Mangat <nehalsinghmangat.software@gmail.com>
 License-Expression: MIT