Fix divvy, remove requirement for old package, ensure looper is using…

… internal module #520

looper/cli_pydantic.py

@@ -26,8 +26,6 @@
 from pephubclient import PEPHubClient
 from pydantic_argparse.argparse.parser import ArgumentParser
 
-from divvy import select_divvy_config
-
 from . import __version__
 
 from .command_models.arguments import ArgumentEnum
@@ -354,6 +352,7 @@ def main(test_args=None) -> dict:
 
     return run_looper(args, parser, test_args=test_args)
 
+
 def main_cli() -> None:
     main()
 

looper/divvy.py

@@ -401,11 +401,13 @@ def divvy_init(config_path, template_config_path):
         _LOGGER.error("You must specify a template config file path.")
         return
 
+    if not os.path.isabs(config_path):
+        config_path = os.path.abspath(config_path)
+
     if config_path and not os.path.exists(config_path):
-        # dcc.write(config_path)
         # Init should *also* write the templates.
         dest_folder = os.path.dirname(config_path)
-        copytree(os.path.dirname(template_config_path), dest_folder)
+        copytree(os.path.dirname(template_config_path), dest_folder, dirs_exist_ok=True)
         template_subfolder = os.path.join(dest_folder, "divvy_templates")
         _LOGGER.info("Wrote divvy templates to folder: {}".format(template_subfolder))
         new_template = os.path.join(

requirements/requirements-all.txt

@@ -1,5 +1,4 @@
 colorama>=0.3.9
-divvy>=0.5.0
 eido>=0.2.1
 jinja2
 logmuse>=0.2.0

tests/divvytests/test_divvy_simple.py

@@ -4,7 +4,7 @@
 from collections import OrderedDict
 
 from yacman import YacAttMap
-from divvy import select_divvy_config
+from looper.divvy import select_divvy_config
 
 # For interactive debugging:
 # import logmuse