Merge remote-tracking branch 'origin/master' into benc-remove-channels

Conflicts: docs/userguide/plugins.rst parsl/channels/base.py parsl/channels/local/local.py parsl/tests/test_providers/test_pbspro_template.py parsl/tests/test_providers/test_slurm_template.py
Parsl · Nov 7, 2024 · 5d3b61e · 5d3b61e
2 parents a3fdfaa + b092195
commit 5d3b61e
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
diff --git a/docs/userguide/plugins.rst b/docs/userguide/plugins.rst
@@ -101,5 +101,6 @@ interpreted as a Future.
 Removed interfaces
 ------------------
 
-Parsl had a ``Channel`` interface which was removed in 2024.  See
-`issue 3515 <https://github.com/Parsl/parsl/issues/3515>`_ for further discussion.
+Parsl had a deprecated ``Channel`` abstraction. See
+`issue 3515 <https://github.com/Parsl/parsl/issues/3515>`_
+for further discussion on its removal.
diff --git a/parsl/tests/test_providers/test_pbspro_template.py b/parsl/tests/test_providers/test_pbspro_template.py
@@ -14,6 +14,7 @@ def test_submit_script_basic(tmp_path):
         queue="debug"
     )
     provider.script_dir = tmp_path
+    provider.channel.script_dir = tmp_path
     job_id = str(random.randint(55000, 59000))
     provider.execute_wait = mock.Mock(spec=PBSProProvider.execute_wait)
     provider.execute_wait.return_value = (0, job_id, "")

diff --git a/parsl/tests/test_providers/test_slurm_template.py b/parsl/tests/test_providers/test_slurm_template.py
@@ -15,6 +15,7 @@ def test_submit_script_basic(tmp_path):
         partition="debug"
     )
     provider.script_dir = tmp_path
+    provider.channel.script_dir = tmp_path
     job_id = str(random.randint(55000, 59000))
     provider.execute_wait = mock.MagicMock(spec=SlurmProvider.execute_wait)
     provider.execute_wait.return_value = (0, f"Submitted batch job {job_id}", "")