Re-organize libsubmit subdirectories

Note that libsubmit tests were not being run by travis; I'll open an issue to integrate them separately. For now I've just dumped them in `tests/integration`, which is ignored by pytest.
Parsl · Sep 24, 2018 · ac71c12bf8c7c830cd8a96e445193ca160dfebe7 · ac71c12
1 parent e54c01c
commit ac71c12bf8c7c830cd8a96e445193ca160dfebe7
diff --git a/.gitmodules b/.gitmodules
@@ -1,3 +0,0 @@
-[submodule "parsl/libsubmit"]
-	path = parsl/libsubmit
-	url = https://github.com/Parsl/libsubmit

diff --git a/libsubmit/__init__.py b/libsubmit/__init__.py
diff --git a/libsubmit/error.py b/libsubmit/error.py
diff --git a/libsubmit/tests/setup_path.sh b/libsubmit/tests/setup_path.sh
diff --git a/libsubmit/utils.py b/libsubmit/utils.py
diff --git a/libsubmit/version.py b/libsubmit/version.py
diff --git a/libsubmit/channels/__init__.py → parsl/channels/__init__.py b/libsubmit/channels/__init__.py → parsl/channels/__init__.py
diff --git a/libsubmit/channels/channel_base.py → parsl/channels/channel_base.py b/libsubmit/channels/channel_base.py → parsl/channels/channel_base.py
diff --git a/libsubmit/channels/errors.py → parsl/channels/errors.py b/libsubmit/channels/errors.py → parsl/channels/errors.py
diff --git a/libsubmit/channels/local/__init__.py → parsl/channels/local/__init__.py b/libsubmit/channels/local/__init__.py → parsl/channels/local/__init__.py
diff --git a/libsubmit/channels/local/local.py → parsl/channels/local/local.py b/libsubmit/channels/local/local.py → parsl/channels/local/local.py
diff --git a/libsubmit/channels/ssh/__init__.py → parsl/channels/ssh/__init__.py b/libsubmit/channels/ssh/__init__.py → parsl/channels/ssh/__init__.py
diff --git a/libsubmit/channels/ssh/ssh.py → parsl/channels/ssh/ssh.py b/libsubmit/channels/ssh/ssh.py → parsl/channels/ssh/ssh.py
diff --git a/libsubmit/channels/ssh_il/__init__.py → parsl/channels/ssh_il/__init__.py b/libsubmit/channels/ssh_il/__init__.py → parsl/channels/ssh_il/__init__.py
diff --git a/libsubmit/channels/ssh_il/ssh_il.py → parsl/channels/ssh_il/ssh_il.py b/libsubmit/channels/ssh_il/ssh_il.py → parsl/channels/ssh_il/ssh_il.py
diff --git a/libsubmit/launchers/__init__.py → parsl/launchers/__init__.py b/libsubmit/launchers/__init__.py → parsl/launchers/__init__.py
diff --git a/libsubmit/launchers/launchers.py → parsl/launchers/launchers.py b/libsubmit/launchers/launchers.py → parsl/launchers/launchers.py
diff --git a/parsl/libsubmit b/parsl/libsubmit
diff --git a/libsubmit/providers/__init__.py → parsl/providers/__init__.py b/libsubmit/providers/__init__.py → parsl/providers/__init__.py
diff --git a/libsubmit/providers/aws/__init__.py → parsl/providers/aws/__init__.py b/libsubmit/providers/aws/__init__.py → parsl/providers/aws/__init__.py
diff --git a/libsubmit/providers/aws/aws.py → parsl/providers/aws/aws.py b/libsubmit/providers/aws/aws.py → parsl/providers/aws/aws.py
diff --git a/libsubmit/providers/aws/template.py → parsl/providers/aws/template.py b/libsubmit/providers/aws/template.py → parsl/providers/aws/template.py
diff --git a/libsubmit/providers/azure/__init__.py → parsl/providers/azure/__init__.py b/libsubmit/providers/azure/__init__.py → parsl/providers/azure/__init__.py
diff --git a/libsubmit/providers/azure/azure.py → parsl/providers/azure/azure.py b/libsubmit/providers/azure/azure.py → parsl/providers/azure/azure.py
diff --git a/libsubmit/providers/azure/azureconf.json → parsl/providers/azure/azureconf.json b/libsubmit/providers/azure/azureconf.json → parsl/providers/azure/azureconf.json
diff --git a/libsubmit/providers/azure/deployer.py → parsl/providers/azure/deployer.py b/libsubmit/providers/azure/deployer.py → parsl/providers/azure/deployer.py
diff --git a/libsubmit/providers/cluster_provider.py → parsl/providers/cluster_provider.py b/libsubmit/providers/cluster_provider.py → parsl/providers/cluster_provider.py
diff --git a/libsubmit/providers/cobalt/__init__.py → parsl/providers/cobalt/__init__.py b/libsubmit/providers/cobalt/__init__.py → parsl/providers/cobalt/__init__.py
diff --git a/libsubmit/providers/cobalt/cobalt.py → parsl/providers/cobalt/cobalt.py b/libsubmit/providers/cobalt/cobalt.py → parsl/providers/cobalt/cobalt.py
diff --git a/libsubmit/providers/cobalt/template.py → parsl/providers/cobalt/template.py b/libsubmit/providers/cobalt/template.py → parsl/providers/cobalt/template.py
diff --git a/libsubmit/providers/condor/__init__.py → parsl/providers/condor/__init__.py b/libsubmit/providers/condor/__init__.py → parsl/providers/condor/__init__.py
diff --git a/libsubmit/providers/condor/condor.py → parsl/providers/condor/condor.py b/libsubmit/providers/condor/condor.py → parsl/providers/condor/condor.py
diff --git a/libsubmit/providers/condor/template.py → parsl/providers/condor/template.py b/libsubmit/providers/condor/template.py → parsl/providers/condor/template.py
diff --git a/libsubmit/providers/googlecloud/__init__.py → parsl/providers/googlecloud/__init__.py b/libsubmit/providers/googlecloud/__init__.py → parsl/providers/googlecloud/__init__.py
diff --git a/...bmit/providers/googlecloud/googlecloud.py → parsl/providers/googlecloud/googlecloud.py b/...bmit/providers/googlecloud/googlecloud.py → parsl/providers/googlecloud/googlecloud.py
diff --git a/libsubmit/providers/grid_engine/__init__.py → parsl/providers/grid_engine/__init__.py b/libsubmit/providers/grid_engine/__init__.py → parsl/providers/grid_engine/__init__.py
diff --git a/...bmit/providers/grid_engine/grid_engine.py → parsl/providers/grid_engine/grid_engine.py b/...bmit/providers/grid_engine/grid_engine.py → parsl/providers/grid_engine/grid_engine.py
diff --git a/libsubmit/providers/grid_engine/template.py → parsl/providers/grid_engine/template.py b/libsubmit/providers/grid_engine/template.py → parsl/providers/grid_engine/template.py
diff --git a/libsubmit/providers/jetstream/__init__.py → parsl/providers/jetstream/__init__.py b/libsubmit/providers/jetstream/__init__.py → parsl/providers/jetstream/__init__.py
diff --git a/libsubmit/providers/jetstream/jetstream.py → parsl/providers/jetstream/jetstream.py b/libsubmit/providers/jetstream/jetstream.py → parsl/providers/jetstream/jetstream.py
diff --git a/...t/providers/jetstream/setup_first_time.sh → ...l/providers/jetstream/setup_first_time.sh b/...t/providers/jetstream/setup_first_time.sh → ...l/providers/jetstream/setup_first_time.sh
diff --git a/libsubmit/providers/kubernetes/__init__.py → parsl/providers/kubernetes/__init__.py b/libsubmit/providers/kubernetes/__init__.py → parsl/providers/kubernetes/__init__.py
diff --git a/libsubmit/providers/kubernetes/kube.py → parsl/providers/kubernetes/kube.py b/libsubmit/providers/kubernetes/kube.py → parsl/providers/kubernetes/kube.py
diff --git a/libsubmit/providers/kubernetes/template.py → parsl/providers/kubernetes/template.py b/libsubmit/providers/kubernetes/template.py → parsl/providers/kubernetes/template.py
diff --git a/libsubmit/providers/local/__init__.py → parsl/providers/local/__init__.py b/libsubmit/providers/local/__init__.py → parsl/providers/local/__init__.py
diff --git a/libsubmit/providers/local/local.py → parsl/providers/local/local.py b/libsubmit/providers/local/local.py → parsl/providers/local/local.py
diff --git a/libsubmit/providers/provider_base.py → parsl/providers/provider_base.py b/libsubmit/providers/provider_base.py → parsl/providers/provider_base.py
diff --git a/libsubmit/providers/slurm/__init__.py → parsl/providers/slurm/__init__.py b/libsubmit/providers/slurm/__init__.py → parsl/providers/slurm/__init__.py
diff --git a/libsubmit/providers/slurm/slurm.py → parsl/providers/slurm/slurm.py b/libsubmit/providers/slurm/slurm.py → parsl/providers/slurm/slurm.py
diff --git a/libsubmit/providers/slurm/template.py → parsl/providers/slurm/template.py b/libsubmit/providers/slurm/template.py → parsl/providers/slurm/template.py
diff --git a/libsubmit/providers/torque/__init__.py → parsl/providers/torque/__init__.py b/libsubmit/providers/torque/__init__.py → parsl/providers/torque/__init__.py
diff --git a/libsubmit/providers/torque/template.py → parsl/providers/torque/template.py b/libsubmit/providers/torque/template.py → parsl/providers/torque/template.py
diff --git a/libsubmit/providers/torque/torque.py → parsl/providers/torque/torque.py b/libsubmit/providers/torque/torque.py → parsl/providers/torque/torque.py
diff --git a/libsubmit/tests/test_channels/remote_run.sh → ...s/integration/test_channels/remote_run.sh b/libsubmit/tests/test_channels/remote_run.sh → ...s/integration/test_channels/remote_run.sh
diff --git a/...bmit/tests/test_channels/test_channels.py → ...ntegration/test_channels/test_channels.py b/...bmit/tests/test_channels/test_channels.py → ...ntegration/test_channels/test_channels.py
diff --git a/...tests/test_channels/test_local_channel.py → ...ation/test_channels/test_local_channel.py b/...tests/test_channels/test_local_channel.py → ...ation/test_channels/test_local_channel.py
diff --git a/libsubmit/tests/test_channels/test_scp_1.py → ...s/integration/test_channels/test_scp_1.py b/libsubmit/tests/test_channels/test_scp_1.py → ...s/integration/test_channels/test_scp_1.py
diff --git a/libsubmit/tests/test_channels/test_ssh_1.py → ...s/integration/test_channels/test_ssh_1.py b/libsubmit/tests/test_channels/test_ssh_1.py → ...s/integration/test_channels/test_ssh_1.py
diff --git a/...it/tests/test_channels/test_ssh_errors.py → ...egration/test_channels/test_ssh_errors.py b/...it/tests/test_channels/test_ssh_errors.py → ...egration/test_channels/test_ssh_errors.py
diff --git a/.../test_channels/test_ssh_file_transport.py → .../test_channels/test_ssh_file_transport.py b/.../test_channels/test_ssh_file_transport.py → .../test_channels/test_ssh_file_transport.py
diff --git a/...sts/test_channels/test_ssh_interactive.py → ...ion/test_channels/test_ssh_interactive.py b/...sts/test_channels/test_ssh_interactive.py → ...ion/test_channels/test_ssh_interactive.py
diff --git a/...t_integration/test_ssh/test_ssh_beagle.py → ...t_integration/test_ssh/test_ssh_beagle.py b/...t_integration/test_ssh/test_ssh_beagle.py → ...t_integration/test_ssh/test_ssh_beagle.py
diff --git a/...gration/test_ssh/test_ssh_condor_earth.py → ...gration/test_ssh/test_ssh_condor_earth.py b/...gration/test_ssh/test_ssh_condor_earth.py → ...gration/test_ssh/test_ssh_condor_earth.py
diff --git a/...est_integration/test_ssh/test_ssh_cori.py → ...est_integration/test_ssh/test_ssh_cori.py b/...est_integration/test_ssh/test_ssh_cori.py → ...est_integration/test_ssh/test_ssh_cori.py
diff --git a/...est_integration/test_ssh/test_ssh_swan.py → ...est_integration/test_ssh/test_ssh_swan.py b/...est_integration/test_ssh/test_ssh_swan.py → ...est_integration/test_ssh/test_ssh_swan.py
diff --git a/...bmit/tests/test_providers/ec2/test_ec2.py → ...ntegration/test_providers/ec2/test_ec2.py b/...bmit/tests/test_providers/ec2/test_ec2.py → ...ntegration/test_providers/ec2/test_ec2.py
diff --git a/parsl/utils.py b/parsl/utils.py
@@ -1,3 +1,4 @@
+import inspect
 import logging
 import os
 import shlex
@@ -127,3 +128,84 @@ def time_limited_open(path, mode, seconds=1):
     f = open(path, mode)
     yield f
     f.close()
+
+def wtime_to_minutes(time_string):
+    ''' wtime_to_minutes
+
+    Convert standard wallclock time string to minutes.
+
+    Args:
+        - Time_string in HH:MM:SS format
+
+    Returns:
+        (int) minutes
+
+    '''
+    hours, mins, seconds = time_string.split(':')
+    return int(hours) * 60 + int(mins) + 1
+
+
+class RepresentationMixin(object):
+    """A mixin class for adding a __repr__ method.
+
+    The __repr__ method will return a string equivalent to the code used to instantiate
+    the child class, with any defaults included explicitly. The __max_width__ class variable
+    controls the maximum width of the representation string. If this width is exceeded,
+    the representation string will be split up, with one argument or keyword argument per line.
+
+    Any arguments or keyword arguments in the constructor must be defined as attributes, or
+    an AttributeError will be raised.
+
+    Examples
+    --------
+    >>> from libsubmit.utils import RepresentationMixin
+    >>> class Foo(RepresentationMixin):
+            def __init__(self, first, second, third='three', fourth='fourth'):
+                self.first = first
+                self.second = second
+                self.third = third
+                self.fourth = fourth
+    >>> bar = Foo(1, 'two', fourth='baz')
+    >>> bar
+    Foo(1, 'two', third='three', fourth='baz')
+    """
+    __max_width__ = 80
+
+    def __repr__(self):
+        argspec = inspect.getargspec(self.__init__)
+        if len(argspec.args) > 1:
+            defaults = dict(zip(reversed(argspec.args), reversed(argspec.defaults)))
+        else:
+            defaults = []
+
+        for arg in argspec.args[1:]:
+            if not hasattr(self, arg):
+                template = 'class {} uses {} in the constructor, but does not define it as an attribute'
+                raise AttributeError(template.format(self.__class__.__name__, arg))
+
+        args = [getattr(self, a) for a in argspec.args[1:-len(defaults)]]
+        kwargs = {key: getattr(self, key) for key in defaults}
+
+        def assemble_multiline(args, kwargs):
+            def indent(text):
+                lines = text.splitlines()
+                if len(lines) <= 1:
+                    return text
+                return "\n".join("    " + l for l in lines).strip()
+            args = ["\n    {},".format(indent(repr(a))) for a in args]
+            kwargs = ["\n    {}={}".format(k, indent(repr(v)))
+                      for k, v in sorted(kwargs.items())]
+
+            info = "".join(args) + ", ".join(kwargs)
+            return self.__class__.__name__ + "({}\n)".format(info)
+
+        def assemble_line(args, kwargs):
+            kwargs = ['{}={}'.format(k, repr(v)) for k, v in sorted(kwargs.items())]
+
+            info = ", ".join([repr(a) for a in args] + kwargs)
+            return self.__class__.__name__ + "({})".format(info)
+
+        if len(assemble_line(args, kwargs)) <= self.__class__.__max_width__:
+            return assemble_line(args, kwargs)
+        else:
+            return assemble_multiline(args, kwargs)