pycompss-cli 3.3__tar.gz → 3.3.2__tar.gz

{pycompss-cli-3.3/pycompss_cli.egg-info → pycompss-cli-3.3.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pycompss-cli
-Version: 3.3
+Version: 3.3.2
 Summary: PyCOMPSs cli
 Home-page: https://compss.bsc.es
 Author: Workflows and Distributed Computing Group (WDC) - Barcelona Supercomputing Center (BSC)

pycompss-cli-3.3.2/VERSION.txt

@@ -0,0 +1 @@
+3.3.2

{pycompss-cli-3.3 → pycompss-cli-3.3.2}/pycompss_cli/core/actions_dispatcher.py

@@ -14,10 +14,6 @@
 #  See the License for the specific language governing permissions and
 #  limitations under the License.
 #
-from pycompss_cli.core.local.actions import LocalActions
-from pycompss_cli.core.docker.actions import DockerActions
-from pycompss_cli.core.remote.actions import RemoteActions
-from pycompss_cli.core.unicore.actions import UnicoreActions
 from pycompss_cli.core import utils
 from copy import deepcopy
 import os
@@ -86,12 +82,16 @@ class ActionsDispatcher(object):
         debug = arguments.debug
 
         if env_type == "local":
+            from pycompss_cli.core.local.actions import LocalActions
             return LocalActions(arguments, debug, env_conf)
         elif env_type == "docker":
+            from pycompss_cli.core.docker.actions import DockerActions
             return DockerActions(arguments, debug, env_conf)
         elif env_type == "remote":
+            from pycompss_cli.core.remote.actions import RemoteActions
             return RemoteActions(arguments, debug, env_conf)
         elif env_type == "unicore":
+            from pycompss_cli.core.unicore.actions import UnicoreActions
             return UnicoreActions(arguments, debug, env_conf)
         else:
             raise NotImplementedError(f"Environment `{env_type}` not implemented")

{pycompss-cli-3.3 → pycompss-cli-3.3.2}/pycompss_cli/core/docker/actions.py

@@ -155,15 +155,13 @@ class DockerActions(Actions):
 
         self.docker_cmd.docker_exec_in_daemon('pkill jupyter')
         
+        cmd = 'notebook'
+        if len(self.arguments.rest_args) > 0:
+            if self.arguments.rest_args[0] == 'lab' or self.arguments.rest_args[0] == 'notebook':
+                cmd = ''
+
         arguments = " ".join(self.arguments.rest_args)
-        working_dir = self.env_conf['working_dir']
-        for arg in self.arguments.rest_args:
-            dir = working_dir + '/' + arg
-            if os.path.isdir(dir):
-                print(f"Opening jupyter server in `{dir}`")
-                break
-
-        jupyter_cmd = "jupyter-notebook " + \
+        jupyter_cmd = f"jupyter {cmd} " + \
                 arguments + " " + \
                 f"--ip={self.env_conf['master_ip']} " + \
                 "--allow-root " + \

{pycompss-cli-3.3 → pycompss-cli-3.3.2}/pycompss_cli/core/local/actions.py

@@ -108,7 +108,11 @@ class LocalActions(Actions):
             working_dir = self.env_conf['working_dir']
 
         jupyter_args = self.arguments.rest_args
-        local_jupyter(working_dir, ' '.join(jupyter_args))
+        if jupyter_args[0] == 'lab':
+            cmd = 'lab'
+        else:
+            cmd = 'notebook'
+        local_jupyter(working_dir, cmd, ' '.join(jupyter_args))
 
     def exec(self):
         command = ' '.join(self.arguments.exec_cmd)

{pycompss-cli-3.3 → pycompss-cli-3.3.2}/pycompss_cli/core/remote/arguments.py

@@ -47,7 +47,6 @@ def remote_init_parser():
                              help="Login info username@remote_hostname")
 
     parser_init.add_argument("-m", "--modules",
-                             nargs='*',
                              help="Module list or file to load in remote environment")
 
     return parser_init

{pycompss-cli-3.3 → pycompss-cli-3.3.2}/pycompss_cli/core/unicore/actions.py

@@ -1,7 +1,5 @@
 
-import re
 from shutil import copyfile
-import tempfile
 import traceback
 from pycompss_cli.core.actions import Actions
 from pycompss_cli.core.unicore import UNICORE_URL_ENVAR

{pycompss-cli-3.3 → pycompss-cli-3.3.2/pycompss_cli.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pycompss-cli
-Version: 3.3
+Version: 3.3.2
 Summary: PyCOMPSs cli
 Home-page: https://compss.bsc.es
 Author: Workflows and Distributed Computing Group (WDC) - Barcelona Supercomputing Center (BSC)

pycompss-cli-3.3/VERSION.txt

@@ -1 +0,0 @@
-3.3