Merge pull request #200 from compas-dev/rhino-installer-plugin

Use new extension point for declaring rhino installable packages

Author: gonzalocasas

CHANGELOG.rst

@@ -36,6 +36,7 @@ Unreleased
 * Parameter ``backend`` of forward kinematics has been renamed to ``solver``
 * The signatures of all kinematics, motion planning and planning scene management methods have been homogenized across backend clients and within ``Robot``
 * All examples have been updated to reflect these changes
+* The installer to Rhino has been unified with COMPAS core. Now running ``python -m compas_rhino.install`` will also detect and install COMPAS FAB and its dependencies.
 * Renamed all ``RobotArtist`` implementations to ``RobotModelArtist`` to reflect
   the fact they depend on ``compas.robots.RobotModel``.
 * Renamed  ``compas_fab.robots.Robot.from_tool0_to_attached_tool`` to ``compas_fab.robots.Robot.from_t0cf_to_tcf``

docs/getting_started.rst

@@ -40,12 +40,11 @@ Working in Rhino
 ================
 
 To make **COMPAS FAB** available inside Rhino, open the *command prompt*
-and type the following which will install it on both Rhino 5.0 and 6.0:
+and type the following:
 
 ::
 
-    python -m compas_fab.rhino.install -v 5.0
-    python -m compas_fab.rhino.install -v 6.0
+    python -m compas_rhino.install
 
 .. note:
 

setup.py

@@ -11,7 +11,7 @@
 
 requirements = [
     # Until COMPAS reaches 1.0, we pin major.minor and allow patch version updates
-    'compas>=0.16.4,<0.17',
+    'compas>=0.16.8,<0.17',
     'roslibpy>=1.1.0',
     'pybullet',
     'pyserial',

src/compas_fab/__init__.py

@@ -69,4 +69,5 @@ def get(filename):
 except Exception:
     pass
 
+__all_plugins__ = ['compas_fab.rhino.install']
 __all__ = ['__author__', '__author_email__', '__copyright__', '__description__', '__license__', '__title__', '__url__', '__version__', 'get']

src/compas_fab/rhino/install.py

@@ -2,28 +2,15 @@
 from __future__ import division
 from __future__ import print_function
 
-import compas
-if compas.RHINO:
-    import compas_rhino.install
+import compas.plugins
 
-__all__ = []
 
-INSTALLABLE_PACKAGES = ['compas_fab', 'roslibpy']
+@compas.plugins.plugin(category='install')
+def installable_rhino_packages():
+    return ['compas_fab', 'roslibpy']
 
 
-# ==============================================================================
-# Main
-# ==============================================================================
-
 if __name__ == "__main__":
-
-    import argparse
-
-    parser = argparse.ArgumentParser()
-    parser.add_argument('-v', '--version', choices=['5.0', '6.0'], default='6.0', help="The version of Rhino to install the packages in.")
-
-    args = parser.parse_args()
-
-    packages = set(compas_rhino.install.INSTALLABLE_PACKAGES + INSTALLABLE_PACKAGES)
-
-    compas_rhino.install.install(version=args.version, packages=packages)
+    print('This installation method is obsolete.')
+    print('Please use `python -m compas_rhino.install` instead')
+    print('COMPAS FAB will be automatically detected and installed')

src/compas_fab/rhino/uninstall.py

@@ -2,31 +2,6 @@
 from __future__ import division
 from __future__ import print_function
 
-import compas
-import compas_fab.rhino.install
-
-if compas.RHINO:
-    import compas_rhino.install
-    import compas_rhino.uninstall
-
-
-__all__ = []
-
-
-# ==============================================================================
-# Main
-# ==============================================================================
-
 if __name__ == "__main__":
-
-    import argparse
-
-    parser = argparse.ArgumentParser()
-
-    parser.add_argument('-v', '--version', choices=['5.0', '6.0'], default='5.0', help="The version of Rhino to install the packages in.")
-
-    args = parser.parse_args()
-
-    packages = set(compas_rhino.install.INSTALLABLE_PACKAGES + compas_fab.rhino.install.INSTALLABLE_PACKAGES)
-
-    compas_rhino.uninstall.uninstall(version=args.version, packages=packages)
+    print('This uninstallation method is obsolete.')
+    print('Please use `python -m compas_rhino.uninstall` instead')