Merge pull request #850 from compas-dev/gh_clean

Remove ghuser components on invoke clean

Author: beverlylytle

.gitignore

@@ -140,4 +140,4 @@ data/ctralie
 .vscode
 
 # Grasshopper generated objects
-src/compas_ghpython/components/*.ghuser
+src/compas_ghpython/components/**/*.ghuser

CHANGELOG.md

@@ -21,6 +21,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 * Allow str or int as joint type in `compas.robots.Joint` constructor.
 * `compas_ghpython.artists.FrameArtist.draw` now draws a Rhino Plane.
+* Changed directory where ghuser components are installed.
+* Added ghuser components directory to those removed by the `clean` task.
 * Fixed bug in `compas.geometry.bestfit_circle_numpy`.
 
 ### Removed

src/compas_ghpython/install.py

@@ -18,6 +18,6 @@ def after_rhino_install(installed_packages):
     if 'compas_ghpython' not in installed_packages:
         return []
 
-    installed_objects = install_userobjects(os.path.join(os.path.dirname(__file__), 'components'))
+    installed_objects = install_userobjects(os.path.join(os.path.dirname(__file__), 'components', 'ghuser'))
 
     return [('compas_ghpython', 'Installed {} GH User Objects'.format(len(installed_objects)), True)]

tasks.py

@@ -62,7 +62,7 @@ def help(ctx):
     'docs': 'True to clean up generated documentation, otherwise False',
     'bytecode': 'True to clean up compiled python files, otherwise False.',
     'builds': 'True to clean up build/packaging artifacts, otherwise False.'})
-def clean(ctx, docs=True, bytecode=True, builds=True):
+def clean(ctx, docs=True, bytecode=True, builds=True, ghuser=True):
     """Cleans the local copy from compiled artifacts."""
 
     with chdir(BASE_FOLDER):
@@ -92,6 +92,9 @@ def clean(ctx, docs=True, bytecode=True, builds=True):
             folders.append('build/')
             folders.append('src/compas.egg-info/')
 
+        if ghuser:
+            folders.append('src/compas_ghpython/components/ghuser')
+
         for folder in folders:
             shutil.rmtree(os.path.join(BASE_FOLDER, folder), ignore_errors=True)
 
@@ -192,7 +195,8 @@ def build_ghuser_components(ctx, gh_io_folder=None, ironpython=None):
     """Build Grasshopper user objects from source"""
     with chdir(BASE_FOLDER):
         with tempfile.TemporaryDirectory('actions.ghcomponentizer') as action_dir:
-            target_dir = source_dir = os.path.abspath('src/compas_ghpython/components')
+            source_dir = os.path.abspath('src/compas_ghpython/components')
+            target_dir = os.path.join(source_dir, 'ghuser')
             ctx.run('git clone https://github.com/compas-dev/compas-actions.ghpython_components.git {}'.format(action_dir))
             if not gh_io_folder:
                 import compas_ghpython