From de039a7312fcb9241415fc72faa939637afd5a17 Mon Sep 17 00:00:00 2001 From: brgcode Date: Fri, 10 Dec 2021 16:50:21 +0100 Subject: [PATCH] update default versions everywhere --- src/compas_ghpython/components/__init__.py | 3 ++- src/compas_rhino/__init__.py | 2 +- src/compas_rhino/install.py | 6 +++--- src/compas_rhino/uninstall.py | 6 +++--- src/compas_rhino/uninstall_plugin.py | 2 +- 5 files changed, 10 insertions(+), 9 deletions(-) diff --git a/src/compas_ghpython/components/__init__.py b/src/compas_ghpython/components/__init__.py index 003250ce352..49418c935c6 100644 --- a/src/compas_ghpython/components/__init__.py +++ b/src/compas_ghpython/components/__init__.py @@ -31,6 +31,7 @@ from compas._os import remove_symlinks from compas_ghpython import get_grasshopper_userobjects_path from compas_rhino import _check_rhino_version +import compas_rhino def coerce_frame(plane): @@ -46,7 +47,7 @@ def coerce_frame(plane): def get_version_from_args(): parser = argparse.ArgumentParser() - parser.add_argument('-v', '--version', choices=['5.0', '6.0', '7.0'], default='6.0') + parser.add_argument('-v', '--version', choices=compas_rhino.SUPPORTED_VERSIONS, default=compas_rhino.DEFAULT_VERSION) args = parser.parse_args() return _check_rhino_version(args.version) diff --git a/src/compas_rhino/__init__.py b/src/compas_rhino/__init__.py index 55f4bcbb115..587a8076f9f 100644 --- a/src/compas_rhino/__init__.py +++ b/src/compas_rhino/__init__.py @@ -147,7 +147,7 @@ def _get_app_folder(version): '5': ['/', 'Applications', 'Rhinoceros.app'], '6': ['/', 'Applications', 'Rhinoceros.app'], '7': ['/', 'Applications', 'Rhino 7.app', ], - '8': ['/', 'Applications', 'Rhino 8.app', ] + '8': ['/', 'Applications', 'RhinoWIP.app', ] } app = os.path.join(*paths[version]) diff --git a/src/compas_rhino/install.py b/src/compas_rhino/install.py index 04bfc6e756c..e4cf45ab6e8 100644 --- a/src/compas_rhino/install.py +++ b/src/compas_rhino/install.py @@ -26,7 +26,7 @@ def install(version=None, packages=None, clean=False): ---------- version : {'5.0', '6.0', '7.0', '8.0'}, optional The version number of Rhino. - Default is ``'6.0'``. + Default is ``'7.0'``. packages : list of str, optional List of packages to install or None to use default package list. Default is the result of ``installable_rhino_packages``, @@ -40,11 +40,11 @@ def install(version=None, packages=None, clean=False): .. code-block:: python import compas_rhino.install - compas_rhino.install.install('6.0') + compas_rhino.install.install() .. code-block:: bash - python -m compas_rhino.install -v 6.0 + python -m compas_rhino.install """ version = compas_rhino._check_rhino_version(version) diff --git a/src/compas_rhino/uninstall.py b/src/compas_rhino/uninstall.py index efa1ca88a4c..6dc4e9b0478 100644 --- a/src/compas_rhino/uninstall.py +++ b/src/compas_rhino/uninstall.py @@ -25,7 +25,7 @@ def uninstall(version=None, packages=None): ---------- version : {'5.0', '6.0', '7.0', '8.0'}, optional The version number of Rhino. - Default is ``'6.0'``. + Default is ``'7.0'``. packages : list of str, optional List of packages to uninstall. Default is to uninstall all packages installed by the COMPAS installer. @@ -35,11 +35,11 @@ def uninstall(version=None, packages=None): .. code-block:: python import compas_rhino - compas_rhino.uninstall('6.0') + compas_rhino.uninstall() .. code-block:: bash - python -m compas_rhino.uninstall -v 6.0 + python -m compas_rhino.uninstall """ version = compas_rhino._check_rhino_version(version) diff --git a/src/compas_rhino/uninstall_plugin.py b/src/compas_rhino/uninstall_plugin.py index f740acfc8ed..339695741b0 100644 --- a/src/compas_rhino/uninstall_plugin.py +++ b/src/compas_rhino/uninstall_plugin.py @@ -21,7 +21,7 @@ def uninstall_plugin(plugin, version=None): The name of the plugin. version : {'5.0', '6.0', '7.0', '8.0'}, optional The version of Rhino for which the plugin should be uninstalled. - Default is ``'6.0'``. + Default is ``'7.0'``. Notes -----