pycompss-cli 3.3.3__tar.gz → 3.3.5__tar.gz

{pycompss-cli-3.3.3/pycompss_cli.egg-info → pycompss-cli-3.3.5}/PKG-INFO

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

pycompss-cli-3.3.5/VERSION.txt

@@ -0,0 +1 @@
+3.3.5

{pycompss-cli-3.3.3 → pycompss-cli-3.3.5}/pycompss_cli/__init__.py

@@ -1,6 +1,6 @@
-#!/usr/bin/python
+#!/usr/bin/env python3
 #
-#  Copyright 2002-2023 Barcelona Supercomputing Center (www.bsc.es)
+#  Copyright 2002-2024 Barcelona Supercomputing Center (www.bsc.es)
 #
 #  Licensed under the Apache License, Version 2.0 (the "License");
 #  you may not use this file except in compliance with the License.

{pycompss-cli-3.3.3 → pycompss-cli-3.3.5}/pycompss_cli/assets/__init__.py

@@ -1,6 +1,6 @@
-#!/usr/bin/python
+#!/usr/bin/env python3
 #
-#  Copyright 2002-2023 Barcelona Supercomputing Center (www.bsc.es)
+#  Copyright 2002-2024 Barcelona Supercomputing Center (www.bsc.es)
 #
 #  Licensed under the Apache License, Version 2.0 (the "License");
 #  you may not use this file except in compliance with the License.

{pycompss-cli-3.3.3 → pycompss-cli-3.3.5}/pycompss_cli/cli/__init__.py

@@ -1,6 +1,6 @@
-#!/usr/bin/python
+#!/usr/bin/env python3
 #
-#  Copyright 2002-2023 Barcelona Supercomputing Center (www.bsc.es)
+#  Copyright 2002-2024 Barcelona Supercomputing Center (www.bsc.es)
 #
 #  Licensed under the Apache License, Version 2.0 (the "License");
 #  you may not use this file except in compliance with the License.

{pycompss-cli-3.3.3 → pycompss-cli-3.3.5}/pycompss_cli/cli/compss.py

@@ -1,6 +1,6 @@
-#!/usr/bin/python
+#!/usr/bin/env python3
 #
-#  Copyright 2002-2023 Barcelona Supercomputing Center (www.bsc.es)
+#  Copyright 2002-2024 Barcelona Supercomputing Center (www.bsc.es)
 #
 #  Licensed under the Apache License, Version 2.0 (the "License");
 #  you may not use this file except in compliance with the License.

{pycompss-cli-3.3.3 → pycompss-cli-3.3.5}/pycompss_cli/cli/dislib.py

@@ -1,6 +1,6 @@
-#!/usr/bin/python
+#!/usr/bin/env python3
 #
-#  Copyright 2002-2023 Barcelona Supercomputing Center (www.bsc.es)
+#  Copyright 2002-2024 Barcelona Supercomputing Center (www.bsc.es)
 #
 #  Licensed under the Apache License, Version 2.0 (the "License");
 #  you may not use this file except in compliance with the License.

{pycompss-cli-3.3.3 → pycompss-cli-3.3.5}/pycompss_cli/cli/pycompss.py

@@ -1,6 +1,6 @@
-#!/usr/bin/python
+#!/usr/bin/env python3
 #
-#  Copyright 2002-2023 Barcelona Supercomputing Center (www.bsc.es)
+#  Copyright 2002-2024 Barcelona Supercomputing Center (www.bsc.es)
 #
 #  Licensed under the Apache License, Version 2.0 (the "License");
 #  you may not use this file except in compliance with the License.

{pycompss-cli-3.3.3 → pycompss-cli-3.3.5}/pycompss_cli/core/__init__.py

@@ -1,6 +1,6 @@
-#!/usr/bin/python
+#!/usr/bin/env python3
 #
-#  Copyright 2002-2023 Barcelona Supercomputing Center (www.bsc.es)
+#  Copyright 2002-2024 Barcelona Supercomputing Center (www.bsc.es)
 #
 #  Licensed under the Apache License, Version 2.0 (the "License");
 #  you may not use this file except in compliance with the License.

{pycompss-cli-3.3.3 → pycompss-cli-3.3.5}/pycompss_cli/core/actions.py

@@ -1,6 +1,6 @@
-#!/usr/bin/python
+#!/usr/bin/env python3
 #
-#  Copyright 2002-2023 Barcelona Supercomputing Center (www.bsc.es)
+#  Copyright 2002-2024 Barcelona Supercomputing Center (www.bsc.es)
 #
 #  Licensed under the Apache License, Version 2.0 (the "License");
 #  you may not use this file except in compliance with the License.
@@ -167,3 +167,7 @@ class Actions(ABC):
         
         print(f'Deleting environment `{env_id}`...')
         shutil.rmtree(env_dir_name)
+
+    @abstractmethod
+    def inspect(self):
+        pass

{pycompss-cli-3.3.3 → pycompss-cli-3.3.5}/pycompss_cli/core/actions_dispatcher.py

@@ -1,6 +1,6 @@
-#!/usr/bin/python
+#!/usr/bin/env python3
 #
-#  Copyright 2002-2023 Barcelona Supercomputing Center (www.bsc.es)
+#  Copyright 2002-2024 Barcelona Supercomputing Center (www.bsc.es)
 #
 #  Licensed under the Apache License, Version 2.0 (the "License");
 #  you may not use this file except in compliance with the License.
@@ -40,11 +40,6 @@ class ActionsDispatcher(object):
             if arguments.action == 'environment':
                 if arguments.environment and arguments.environment.startswith('r'):
                     self.__delete_envs(arguments.env_id, arguments)
-                    exit(0)
-
-            if arguments.env_id and arguments.env_id not in list(os.walk(envs_path))[0][1]:
-                print("ERROR: There's no environment named " + arguments.env_id)
-                exit(1)
 
             env_id = arguments.env_id if arguments.env_id else None
                 
@@ -71,6 +66,7 @@ class ActionsDispatcher(object):
             env_arguments.env_id = env_id
             action_cmd = self.__getactions_cmd(env_type, env_arguments, env_conf=env_conf)
             action_cmd.env_remove()
+        exit(0)
 
     def __get_env_type_from_name(self, env_name):
         envs_path = self.home_path + '/.COMPSs/envs'

{pycompss-cli-3.3.3 → pycompss-cli-3.3.5}/pycompss_cli/core/arguments.py

@@ -1,6 +1,6 @@
-#!/usr/bin/python
+#!/usr/bin/env python3
 #
-#  Copyright 2002-2023 Barcelona Supercomputing Center (www.bsc.es)
+#  Copyright 2002-2024 Barcelona Supercomputing Center (www.bsc.es)
 #
 #  Licensed under the Apache License, Version 2.0 (the "License");
 #  you may not use this file except in compliance with the License.
@@ -284,6 +284,19 @@ def parse_sys_argv():
                                             type=str,
                                             help="ID of the environment to remove")  # noqa: E501                                                                           
 
+    # INSPECT
+    parser_environment = subparsers.add_parser("inspect",
+                                               aliases=["ins"],
+                                               help="Inspect an RO-Crate from a COMPSs application run.",  # noqa: E501
+                                               parents=[parent_parser],
+                                               formatter_class=FORMATTER_CLASS)
+
+    parser_environment.set_defaults(action='inspect')
+
+    parser_environment.add_argument("ro_crate",
+                                 type=str,
+                                 help="Folder or zip file containing the RO-Crate")
+
     # Check if the user does not include any argument
     if len(sys.argv) < 2:
         print(parser.print_help())

{pycompss-cli-3.3.3 → pycompss-cli-3.3.5}/pycompss_cli/core/cmd_helpers.py

@@ -1,6 +1,6 @@
-#!/usr/bin/python
+#!/usr/bin/env python3
 #
-#  Copyright 2002-2023 Barcelona Supercomputing Center (www.bsc.es)
+#  Copyright 2002-2024 Barcelona Supercomputing Center (www.bsc.es)
 #
 #  Licensed under the Apache License, Version 2.0 (the "License");
 #  you may not use this file except in compliance with the License.

pycompss-cli-3.3.5/pycompss_cli/core/docker/__init__.py

@@ -0,0 +1,16 @@
+#!/usr/bin/env python3
+#
+#  Copyright 2002-2024 Barcelona Supercomputing Center (www.bsc.es)
+#
+#  Licensed under the Apache License, Version 2.0 (the "License");
+#  you may not use this file except in compliance with the License.
+#  You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+#  Unless required by applicable law or agreed to in writing, software
+#  distributed under the License is distributed on an "AS IS" BASIS,
+#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#  See the License for the specific language governing permissions and
+#  limitations under the License.
+#

{pycompss-cli-3.3.3 → pycompss-cli-3.3.5}/pycompss_cli/core/docker/actions.py

@@ -1,6 +1,6 @@
-#!/usr/bin/python
+#!/usr/bin/env python3
 #
-#  Copyright 2002-2023 Barcelona Supercomputing Center (www.bsc.es)
+#  Copyright 2002-2024 Barcelona Supercomputing Center (www.bsc.es)
 #
 #  Licensed under the Apache License, Version 2.0 (the "License");
 #  you may not use this file except in compliance with the License.
@@ -189,8 +189,8 @@ class DockerActions(Actions):
 
 
     def gentrace(self):
-        command = f"compss_gentrace " + ' '.join(self.arguments.rest_args)
-        command += f' {self.arguments.trace_dir}'
+        command = f"compss_gentrace {self.arguments.trace_dir} "
+        command += ' '.join(self.arguments.rest_args)
         self.docker_cmd.docker_exec_in_daemon(command)
         if self.arguments.download_dir:
             self.docker_cmd.docker_exec_in_daemon(f'cp {self.arguments.trace_dir}/* {self.arguments.download_dir}/')
@@ -239,3 +239,6 @@ class DockerActions(Actions):
     def job(self):
         print("ERROR: Wrong Environment! Try using a `remote` environment")
         exit(1)
+
+    def inspect(self):
+        pass

{pycompss-cli-3.3.3 → pycompss-cli-3.3.5}/pycompss_cli/core/docker/arguments.py

@@ -1,6 +1,6 @@
-#!/usr/bin/python
+#!/usr/bin/env python3
 #
-#  Copyright 2002-2023 Barcelona Supercomputing Center (www.bsc.es)
+#  Copyright 2002-2024 Barcelona Supercomputing Center (www.bsc.es)
 #
 #  Licensed under the Apache License, Version 2.0 (the "License");
 #  you may not use this file except in compliance with the License.

{pycompss-cli-3.3.3 → pycompss-cli-3.3.5}/pycompss_cli/core/docker/cmd.py

@@ -1,6 +1,6 @@
-#!/usr/bin/python
+#!/usr/bin/env python3
 #
-#  Copyright 2002-2023 Barcelona Supercomputing Center (www.bsc.es)
+#  Copyright 2002-2024 Barcelona Supercomputing Center (www.bsc.es)
 #
 #  Licensed under the Apache License, Version 2.0 (the "License");
 #  you may not use this file except in compliance with the License.
@@ -136,7 +136,7 @@ class DockerCmd(object):
                 "while because it needs to download the docker image. " +
                 "Please be patient.")
             if update_image:
-                subprocess.run(['docker', 'pull', docker_image], stdout=subprocess.PIPE)
+                subprocess.run(f'docker pull {docker_image}', shell=True)
             mounts = self._get_mounts(user_working_dir=working_dir, log_dir=log_dir)
             ports = {"8888/tcp": 8888,  # required for jupyter notebooks
                     "8080/tcp": 8080}  # required for monitor

pycompss-cli-3.3.5/pycompss_cli/core/local/__init__.py

@@ -0,0 +1,16 @@
+#!/usr/bin/env python3
+#
+#  Copyright 2002-2024 Barcelona Supercomputing Center (www.bsc.es)
+#
+#  Licensed under the Apache License, Version 2.0 (the "License");
+#  you may not use this file except in compliance with the License.
+#  You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+#  Unless required by applicable law or agreed to in writing, software
+#  distributed under the License is distributed on an "AS IS" BASIS,
+#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#  See the License for the specific language governing permissions and
+#  limitations under the License.
+#

{pycompss-cli-3.3.3 → pycompss-cli-3.3.5}/pycompss_cli/core/local/actions.py

@@ -1,6 +1,6 @@
-#!/usr/bin/python
+#!/usr/bin/env python3
 #
-#  Copyright 2002-2023 Barcelona Supercomputing Center (www.bsc.es)
+#  Copyright 2002-2024 Barcelona Supercomputing Center (www.bsc.es)
 #
 #  Licensed under the Apache License, Version 2.0 (the "License");
 #  you may not use this file except in compliance with the License.
@@ -35,12 +35,12 @@ from pycompss_cli.core.local.cmd import local_job_list
 from pycompss_cli.core.local.cmd import local_cancel_job
 from pycompss_cli.core.local.cmd import local_job_status
 from pycompss_cli.core.local.cmd import local_app_deploy
+from pycompss_cli.core.local.cmd import local_inspect
 from pycompss_cli.core.actions import Actions
 import pycompss_cli.core.utils as utils
 import os, sys
 
 
-
 class LocalActions(Actions):
     def __init__(self, arguments, debug=False, env_conf=None) -> None:
         super().__init__(arguments, debug=debug, env_conf=env_conf)
@@ -329,3 +329,10 @@ class LocalActions(Actions):
                 apps.append(App(app_dir_name))
         self.apps = apps
         return apps
+
+    def inspect(self):
+        # Code that inspects the RO-Crate
+        local_inspect(self.arguments.ro_crate)
+
+
+

{pycompss-cli-3.3.3 → pycompss-cli-3.3.5}/pycompss_cli/core/local/arguments.py

@@ -1,6 +1,6 @@
-#!/usr/bin/python
+#!/usr/bin/env python3
 #
-#  Copyright 2002-2023 Barcelona Supercomputing Center (www.bsc.es)
+#  Copyright 2002-2024 Barcelona Supercomputing Center (www.bsc.es)
 #
 #  Licensed under the Apache License, Version 2.0 (the "License");
 #  you may not use this file except in compliance with the License.