maco 1.2.6__tar.gz → 1.2.7__tar.gz

{maco-1.2.6/maco.egg-info → maco-1.2.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: maco
-Version: 1.2.6
+Version: 1.2.7
 Author: sl-govau
 Maintainer: cccs-rs
 License: MIT License

{maco-1.2.6 → maco-1.2.7}/maco/utils.py

@@ -407,14 +407,24 @@ def import_extractors(
     create_venv: bool,
     logger: Logger,
     python_version: str = f"{sys.version_info.major}.{sys.version_info.minor}.{sys.version_info.micro}",
+    skip_install: bool = False,
 ):
     extractor_dirs, extractor_files = scan_for_extractors(root_directory, scanner, logger)
 
     logger.info(f"Extractor files found based on scanner ({len(extractor_files)}).")
     logger.debug(extractor_files)
 
-    # Install packages into the current environment or dynamically created virtual environments
-    venvs = _install_required_packages(create_venv, extractor_dirs, python_version, logger)
+    if not skip_install:
+        # Install packages into the current environment or dynamically created virtual environments
+        venvs = _install_required_packages(create_venv, extractor_dirs, python_version, logger)
+    else:
+        # Look for pre-existing virtual environments, if any
+        logger.info("Checking for pre-existing virtual environment(s)..")
+        venvs = [
+            os.path.join(root, VENV_DIRECTORY_NAME)
+            for root, dirs, _ in os.walk(root_directory)
+            if VENV_DIRECTORY_NAME in dirs
+        ]
 
     # With the environment prepared, we can now hunt for the extractors and register them
     logger.info("Registering extractors..")

{maco-1.2.6 → maco-1.2.7/maco.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: maco
-Version: 1.2.6
+Version: 1.2.7
 Author: sl-govau
 Maintainer: cccs-rs
 License: MIT License

{maco-1.2.6 → maco-1.2.7}/model_setup/maco/utils.py

@@ -407,14 +407,24 @@ def import_extractors(
     create_venv: bool,
     logger: Logger,
     python_version: str = f"{sys.version_info.major}.{sys.version_info.minor}.{sys.version_info.micro}",
+    skip_install: bool = False,
 ):
     extractor_dirs, extractor_files = scan_for_extractors(root_directory, scanner, logger)
 
     logger.info(f"Extractor files found based on scanner ({len(extractor_files)}).")
     logger.debug(extractor_files)
 
-    # Install packages into the current environment or dynamically created virtual environments
-    venvs = _install_required_packages(create_venv, extractor_dirs, python_version, logger)
+    if not skip_install:
+        # Install packages into the current environment or dynamically created virtual environments
+        venvs = _install_required_packages(create_venv, extractor_dirs, python_version, logger)
+    else:
+        # Look for pre-existing virtual environments, if any
+        logger.info("Checking for pre-existing virtual environment(s)..")
+        venvs = [
+            os.path.join(root, VENV_DIRECTORY_NAME)
+            for root, dirs, _ in os.walk(root_directory)
+            if VENV_DIRECTORY_NAME in dirs
+        ]
 
     # With the environment prepared, we can now hunt for the extractors and register them
     logger.info("Registering extractors..")