Merge pull request #380 from compas-dev/update-ghcomponents-install

gonzalocasas · web-flow · commit 8725e913d2f8 · 2023-03-27T11:24:55.000+02:00
Update gh component install
diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
@@ -13,7 +13,7 @@
 
 _Put an `x` in the boxes that apply. You can also fill these out after creating the PR. If you're unsure about any of them, don't hesitate to ask. We're here to help! This is simply a reminder of what we are going to look for before merging your code._
 
-- [ ] I added a line to the `CHANGELOG.rst` file in the `Unreleased` section under the most fitting heading (e.g. `Added`, `Changed`, `Removed`).
+- [ ] I added a line to the `CHANGELOG.md` file in the `Unreleased` section under the most fitting heading (e.g. `Added`, `Changed`, `Removed`).
 - [ ] I ran all tests on my computer and it's all green (i.e. `invoke test`).
 - [ ] I ran lint on my computer and there are no errors (i.e. `invoke lint`).
 - [ ] I added new functions/classes and made them available on a second-level import, e.g. `compas_fab.robots.CollisionMesh`.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -16,7 +16,6 @@ jobs:
         name: [
           "windows-py38",
           "macos-py37",
-          "ubuntu-py36",
           "ubuntu-py39",
         ]
         include:
@@ -26,9 +25,6 @@ jobs:
           - name: "macos-py37"
             os: macos-latest
             python-version: 3.7
-          - name: "ubuntu-py36"
-            os: ubuntu-latest
-            python-version: 3.6
           - name: "ubuntu-py39"
             os: ubuntu-latest
             python-version: 3.9
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -13,6 +13,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 **Changed**
 
+* Updated install process of GH components.
+
 **Fixed**
 
 **Deprecated**
diff --git a/src/compas_fab/__init__.py b/src/compas_fab/__init__.py
@@ -95,6 +95,7 @@ def get(filename):
 __all_plugins__ = [
     "compas_fab.rhino.install",
     "compas_fab.rhino.artists",
+    "compas_fab.ghpython.install",
     "compas_fab.ghpython.artists",
     "compas_fab.blender.artists",
 ]
diff --git a/src/compas_fab/backends/kinematics/solvers/spherical_wrist.py b/src/compas_fab/backends/kinematics/solvers/spherical_wrist.py
@@ -164,7 +164,6 @@ def inverse_kinematics_spherical_wrist(target_frame, points):
         axis1_angles += [a2] * 4
 
     for i in range(2):
-
         axis1_angle = axis1_angles[i * 4]
         Rot1 = Rotation.from_axis_and_angle([0, 0, 1], -1 * axis1_angle, point=[0, 0, 0])
         p1A = p1_proj.transformed(Rot1)
diff --git a/src/compas_fab/backends/ros/client.py b/src/compas_fab/backends/ros/client.py
@@ -223,7 +223,6 @@ def get_configuration(self):
         pass
 
     def follow_configurations(self, callback, joint_names, configurations, timesteps, timeout=60000):
-
         if len(configurations) != len(timesteps):
             raise ValueError(
                 "%d configurations must have %d timesteps, but %d given."
diff --git a/src/compas_fab/backends/ros/direct_ur_action_client.py b/src/compas_fab/backends/ros/direct_ur_action_client.py
@@ -114,7 +114,6 @@ def send_goal(self, goal, result_callback=None, timeout=None):
 
 
 def direct_ur_movel(ros_client, callback, frames, acceleration=None, velocity=None, time=None, radius=None):
-
     action_client = DirectUrActionClient(ros_client, timeout=50000)
 
     script_lines = []
diff --git a/src/compas_fab/backends/ros/messages/direct_ur.py b/src/compas_fab/backends/ros/messages/direct_ur.py
@@ -113,7 +113,6 @@ def msg(self):
 
 
 if __name__ == "__main__":
-
     from compas.geometry import Frame
 
     f1 = Frame((0.0, -193, 1001.0), (-1.0, 0.0, 0.0), (0.0, 0.0, -1.0))
diff --git a/src/compas_fab/backends/ros/messages/services.py b/src/compas_fab/backends/ros/messages/services.py
@@ -173,7 +173,6 @@ class MotionPlanResponse(ROSmsg):
     ROS_MSG_TYPE = "moveit_msgs/MotionPlanResponse"
 
     def __init__(self, trajectory_start=None, group_name=None, trajectory=None, planning_time=None, error_code=None):
-
         self.trajectory_start = trajectory_start or RobotState()
         self.group_name = group_name or ""
         self.trajectory = trajectory or RobotTrajectory()
diff --git a/src/compas_fab/ghpython/components/Cf_ConfigMerge/code.py b/src/compas_fab/ghpython/components/Cf_ConfigMerge/code.py
@@ -8,7 +8,6 @@
 
 class ConfigMerge(component):
     def RunScript(self, config_a, config_b):
-
         if config_a and config_b:
             return config_a.merged(config_b)
 
diff --git a/src/compas_fab/ghpython/components/Cf_ConfigZero/code.py b/src/compas_fab/ghpython/components/Cf_ConfigZero/code.py
@@ -8,7 +8,6 @@
 
 class ConfigZero(component):
     def RunScript(self, robot, group):
-
         if robot:
             return robot.zero_configuration(group)
 
diff --git a/src/compas_fab/ghpython/components/Cf_ConstraintsFromConfiguration/code.py b/src/compas_fab/ghpython/components/Cf_ConstraintsFromConfiguration/code.py
@@ -9,7 +9,6 @@
 
 
 class ConstraintsFromTargetConfiguration(component):
-
     DEFAULT_TOLERANCE_METERS = 0.001
     DEFAULT_TOLERANCE_RADIANS = math.radians(1)
 
diff --git a/src/compas_fab/ghpython/components/Cf_PlanCartesianMotion/code.py b/src/compas_fab/ghpython/components/Cf_PlanCartesianMotion/code.py
@@ -14,7 +14,6 @@ class PlanCartesianMotion(component):
     def RunScript(
         self, robot, planes, start_configuration, group, attached_collision_meshes, path_constraints, max_step, compute
     ):
-
         key = create_id(self, "trajectory")
 
         max_step = float(max_step) if max_step else 0.01
diff --git a/src/compas_fab/ghpython/components/Cf_PlanMotion/code.py b/src/compas_fab/ghpython/components/Cf_PlanMotion/code.py
@@ -21,7 +21,6 @@ def RunScript(
         planner_id,
         compute,
     ):
-
         key = create_id(self, "trajectory")
 
         path_constraints = list(path_constraints) if path_constraints else None
diff --git a/src/compas_fab/ghpython/components/Cf_VisualizeRobot/code.py b/src/compas_fab/ghpython/components/Cf_VisualizeRobot/code.py
@@ -24,7 +24,6 @@ def RunScript(
         show_cm,
         show_acm,
     ):
-
         visual = None
         collision = None
         collision_meshes = None
diff --git a/src/compas_fab/ghpython/components/install.py b/src/compas_fab/ghpython/components/install.py
diff --git a/src/compas_fab/ghpython/install.py b/src/compas_fab/ghpython/install.py
@@ -0,0 +1,43 @@
+import glob
+import os
+
+import compas.plugins
+from compas_ghpython.components import install_userobjects
+from compas_ghpython.components import uninstall_userobjects
+
+
+@compas.plugins.plugin(category="install")
+def after_rhino_install(installed_packages):
+    if "compas_fab" not in installed_packages:
+        return []
+
+    installed_objects = install_userobjects(os.path.join(os.path.dirname(__file__), "components", "ghuser"))
+
+    return [
+        (
+            "compas_fab",
+            "Installed {} GH User Objects".format(len(installed_objects)),
+            True,
+        )
+    ]
+
+
+@compas.plugins.plugin(category="install")
+def after_rhino_uninstall(uninstalled_packages):
+    if "compas_fab" not in uninstalled_packages:
+        return []
+
+    srcdir = os.path.join(os.path.dirname(__file__), "components", "ghuser")
+    userobjects = [os.path.basename(ghuser) for ghuser in glob.glob(os.path.join(srcdir, "*.ghuser"))]
+    uninstalled_objects = uninstall_userobjects(userobjects)
+
+    uninstall_errors = [uo[0] for uo in uninstalled_objects if not uo[1]]
+    error_msg = "" if not uninstall_errors else "and {} failed to uninstall".format(len(uninstall_errors))
+
+    return [
+        (
+            "compas_ghpython",
+            "Uninstalled {} GH User Objects {}".format(len(uninstalled_objects), error_msg),
+            True,
+        )
+    ]
diff --git a/src/compas_fab/rhino/install.py b/src/compas_fab/rhino/install.py
@@ -9,29 +9,3 @@
 @compas.plugins.plugin(category="install")
 def installable_rhino_packages():
     return ["compas_fab", "roslibpy"]
-
-
-@compas.plugins.plugin(category="install")
-def after_rhino_install(installed_packages):
-    if "compas_fab" not in installed_packages:
-        return []
-
-    import compas_fab.ghpython.components.install
-
-    return compas_fab.ghpython.components.install.install()
-
-
-@compas.plugins.plugin(category="install")
-def after_rhino_uninstall(installed_packages):
-    if "compas_fab" not in installed_packages:
-        return []
-
-    import compas_fab.ghpython.components.install
-
-    return compas_fab.ghpython.components.install.uninstall()
-
-
-if __name__ == "__main__":
-    print("This installation method is obsolete.")
-    print("Please use `python -m compas_rhino.install` instead")
-    print("COMPAS FAB will be automatically detected and installed")
diff --git a/src/compas_fab/rhino/uninstall.py b/src/compas_fab/rhino/uninstall.py
diff --git a/src/compas_fab/utilities/filesystem.py b/src/compas_fab/utilities/filesystem.py
@@ -39,7 +39,6 @@ def list_files_in_directory(directory, fullpath=False, extensions=None):
 
 
 if __name__ == "__main__":
-
     path = os.path.join(os.path.dirname(__file__), "..", "robots", "ur", "ur10", "model")
     os.listdir(path)
     print(list_files_in_directory(path, fullpath=True, extensions=["obj"]))

Original file line number	Diff line number	Diff line change
`@@ -95,6 +95,7 @@ def get(filename):`
`95`	`95`	`__all_plugins__ = [`
`96`	`96`	`"compas_fab.rhino.install",`
`97`	`97`	`"compas_fab.rhino.artists",`
	`98`	`+ "compas_fab.ghpython.install",`
`98`	`99`	`"compas_fab.ghpython.artists",`
`99`	`100`	`"compas_fab.blender.artists",`
`100`	`101`	`]`