add (un)install support for 3.1

Author: tomvanmele

src/compas_blender/__init__.py

@@ -55,7 +55,7 @@ def redraw():
 
 
 def _check_blender_version(version):
-    supported_versions = ['2.83', '2.93']
+    supported_versions = ['2.83', '2.93', '3.1']
 
     if not version:
         return '2.93'

src/compas_blender/install.py

@@ -53,7 +53,7 @@ def install(blender_path, version=None):
         The path to the folder with the version number of Blender.
         For example, on Mac: ``'/Applications/Blender.app/Contents/Resources/2.83'``.
         On Windows: ``'%PROGRAMFILES%/Blender Foundation/Blender 2.83/2.83'``.
-    version : {'2.83', '2.93'}, optional
+    version : {'2.83', '2.93', '3.1'}, optional
         The version number of Blender.
         Default is ``'2.93'``.
 
@@ -151,7 +151,7 @@ def install(blender_path, version=None):
     parser = argparse.ArgumentParser()
 
     parser.add_argument('blenderpath', nargs='?', help="The path to the folder with the version number of Blender.")
-    parser.add_argument('-v', '--version', choices=['2.83', '2.93'], help="The version of Blender to install COMPAS in.")
+    parser.add_argument('-v', '--version', choices=['2.83', '2.93', '3.1'], help="The version of Blender to install COMPAS in.")
 
     args = parser.parse_args()
 

src/compas_blender/uninstall.py

@@ -1,22 +1,28 @@
 import os
 import sys
+import compas
 
 from compas._os import remove
 from compas._os import remove_symlink
 from compas._os import rename
 
+import compas_blender
+
 __all__ = ['uninstall']
 
 
-def uninstall(blender_path):
+def uninstall(blender_path, version=None):
     """Uninstall COMPAS from Blender.
 
     Parameters
     ----------
     blender_path : str
         The path to the folder with the version number of Blender.
-        For example, on Mac: ``'/Applications/blender.app/Contents/Resources/2.80'``.
-        On Windows: ``'%PROGRAMFILES%\\Blender Foundation\\Blender\\2.80'``.
+        For example, on Mac: ``'/Applications/Blender.app/Contents/Resources/2.83'``.
+        On Windows: ``'%PROGRAMFILES%/Blender Foundation/Blender 2.83/2.83'``.
+    version : {'2.83', '2.93', '3.1'}, optional
+        The version number of Blender.
+        Default is ``'2.93'``.
 
     Examples
     --------
@@ -29,6 +35,23 @@ def uninstall(blender_path):
         print('Conda environment not found. The installation into Blender requires an active conda environment with a matching Python version to continue.')
         sys.exit(-1)
 
+    if not version and not blender_path:
+        version = '2.93'
+
+    if version and blender_path:
+        print('Both options cannot be provided simultaneously. Provide the full installation path, or the version with flag -v.')
+        sys.exit(-1)
+
+    if version:
+        if compas.LINUX:
+            print('Version-based installs are currently not supported for Linux. Please provide the full installation path with the -p option.')
+            sys.exit(-1)
+
+        blender_path = compas_blender._get_default_blender_installation_path(version)
+
+    if not os.path.exists(blender_path):
+        raise FileNotFoundError('Blender version folder not found.')
+
     path, version = os.path.split(blender_path)
 
     print('Uninstalling COMPAS for Blender {}'.format(version))
@@ -65,7 +88,9 @@ def uninstall(blender_path):
 
     parser = argparse.ArgumentParser()
 
-    parser.add_argument('versionpath', help="The path to the folder with the version number of Blender.")
+    parser.add_argument('blenderpath', nargs='?', help="The path to the folder with the version number of Blender.")
+    parser.add_argument('-v', '--version', choices=['2.83', '2.93', '3.1'], help="The version of Blender to install COMPAS in.")
+
     args = parser.parse_args()
 
-    uninstall(args.versionpath)
+    uninstall(args.blenderpath, version=args.version)