Merge pull request #344 from pyiron/refactor

Split into base and wrapper
pyiron · Sep 28, 2024 · 886864f · 886864f
2 parents 6963e9e + 0d22bad
commit 886864f
Show file tree

Hide file tree

Showing 7 changed files with 4 additions and 5 deletions.
diff --git a/pysqa/__main__.py b/pysqa/__main__.py
@@ -1,6 +1,6 @@
 import sys
 
-from pysqa.cmd import command_line
+from pysqa.base.cmd import command_line
 
 if __name__ == "__main__":
     command_line(arguments_lst=sys.argv[1:])
diff --git a/pysqa/cmd.py → pysqa/base/cmd.py b/pysqa/cmd.py → pysqa/base/cmd.py
diff --git a/pysqa/ext/modular.py → pysqa/base/modular.py b/pysqa/ext/modular.py → pysqa/base/modular.py
diff --git a/pysqa/ext/remote.py → pysqa/base/remote.py b/pysqa/ext/remote.py → pysqa/base/remote.py
diff --git a/pysqa/ext/__init__.py b/pysqa/ext/__init__.py
diff --git a/pysqa/queueadapter.py b/pysqa/queueadapter.py
@@ -5,7 +5,7 @@
 
 from pysqa.base.config import QueueAdapterWithConfig, read_config
 from pysqa.base.core import execute_command
-from pysqa.ext.modular import ModularQueueAdapter
+from pysqa.base.modular import ModularQueueAdapter
 
 
 class QueueAdapter(object):
@@ -361,7 +361,7 @@ def set_queue_adapter(
         # The RemoteQueueAdapter has additional dependencies, namely paramiko and tqdm.
         # By moving the import to this line it only fails when the user specifies the
         # RemoteQueueAdapter in their pysqa configuration.
-        from pysqa.ext.remote import RemoteQueueAdapter
+        from pysqa.base.remote import RemoteQueueAdapter
 
         return RemoteQueueAdapter(
             config=config, directory=directory, execute_command=execute_command

diff --git a/tests/test_cmd.py b/tests/test_cmd.py
@@ -1,9 +1,8 @@
 import os
 import io
 import json
-import unittest
 import unittest.mock
-from pysqa.cmd import command_line
+from pysqa.base.cmd import command_line
 
 
 class TestCMD(unittest.TestCase):