Merge pull request #165 from pyiron/pysqa-use-settings

Pysqa use settings

Author: jan-janssen

pysqa/ext/remote.py

@@ -104,7 +104,7 @@ def get_queue_status(self, user=None):
         else:
             return df[df["user"] == user]
 
-    def get_job_from_remote(self, working_directory, delete_remote=False):
+    def get_job_from_remote(self, working_directory):
         """
         Get the results of the calculation - this is necessary when the calculation was executed on a remote host.
         """
@@ -130,10 +130,10 @@ def get_job_from_remote(self, working_directory, delete_remote=False):
             )
             file_dict[local_file] = f
         self._transfer_files(file_dict=file_dict, sftp=None, transfer_back=True)
-        if delete_remote:
+        if self._ssh_delete_file_on_remote:
             self._execute_remote_command(command="rm -r " + remote_working_directory)
 
-    def transfer_file(self, file, transfer_back=False, delete_remote=False):
+    def transfer_file(self, file, transfer_back=False):
         working_directory = os.path.abspath(os.path.expanduser(file))
         remote_working_directory = self._get_remote_working_dir(
             working_directory=working_directory
@@ -144,7 +144,7 @@ def transfer_file(self, file, transfer_back=False, delete_remote=False):
             sftp=None,
             transfer_back=transfer_back,
         )
-        if delete_remote and transfer_back:
+        if self._ssh_delete_file_on_remote and transfer_back:
             self._execute_remote_command(command="rm " + remote_working_directory)
 
     def __del__(self):

pysqa/utils/basic.py

@@ -270,7 +270,7 @@ def get_status_of_jobs(self, process_id_lst):
                 results_lst.append("finished")
         return results_lst
 
-    def get_job_from_remote(self, working_directory, delete_remote=False):
+    def get_job_from_remote(self, working_directory):
         """
         Get the results of the calculation - this is necessary when the calculation was executed on a remote host.
         """
@@ -279,7 +279,7 @@ def get_job_from_remote(self, working_directory, delete_remote=False):
     def convert_path_to_remote(self, path):
         pass
 
-    def transfer_file(self, file, transfer_back=False, delete_remote=False):
+    def transfer_file(self, file, transfer_back=False):
         pass
 
     def check_queue_parameters(