Merge branch 'main' into glft_fix

Author: tomvanmele

CHANGELOG.md

@@ -38,6 +38,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 * Changed `RobotModelArtists.atteched_tool_models` to dictionary to support multiple tools.
 * Locked `sphinx` to 4.5.
 * Changed `GLTFExporter` such that generated gltfs can be viewed with webxr
+* Fixed source directory path in `compas_ghpython.uninstall` plugin.
+* Fixed bug in`compas_ghpython.components`that ignored input list of `.ghuser` objects to uninstall.
 
 ### Removed
 

src/compas_ghpython/components/__init__.py

@@ -76,14 +76,16 @@ def install_userobjects(source):
     return list(zip(symlinks_to_add, created))
 
 
-def uninstall_userobjects(userobjects):
+def uninstall_userobjects(userobjects=None):
     """
     Uninstalls Grasshopper user objects.
 
     Parameters
     ----------
-    userobjects : list of str
+    userobjects : list of str, optional
         List of user object names to uninstall, eg. ``['Compas_Info.ghuser']``
+        Defaults to ``None``, in which case the uninstaller will search for user objects
+        whose name starts with the string 'compas'.
 
     Returns
     -------
@@ -93,10 +95,11 @@ def uninstall_userobjects(userobjects):
     version = get_version_from_args()
     dstdir = get_grasshopper_userobjects_path(version)
 
-    userobjects = []
-    for name in os.listdir(dstdir):
-        if name.lower().startswith('compas'):
-            userobjects.append(name)
+    if not userobjects:
+        userobjects = []
+        for name in os.listdir(dstdir):
+            if name.lower().startswith('compas'):
+                userobjects.append(name)
 
     symlinks = []
     for obj in userobjects:
@@ -108,7 +111,4 @@ def uninstall_userobjects(userobjects):
     return list(zip(symlinks, removed))
 
 
-__all__ = [
-    'install_userobjects',
-    'uninstall_userobjects'
-]
+__all__ = ['install_userobjects', 'uninstall_userobjects']

src/compas_ghpython/uninstall.py

@@ -14,7 +14,7 @@ def after_rhino_uninstall(uninstalled_packages):
     if 'compas_ghpython' not in uninstalled_packages:
         return []
 
-    srcdir = os.path.join(os.path.dirname(__file__), 'components')
+    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)