Move globus-compute-endpoint install to GCE action

Parsl · Oct 14, 2024 · fa6d837 · fa6d837
1 parent 17a726a
commit fa6d837
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 13 deletions.
diff --git a/.github/workflows/gce_test.yaml b/.github/workflows/gce_test.yaml
@@ -60,25 +60,22 @@ jobs:
         make clean_coverage
         # Installing parsl into venv required for GCendpoint
         pip3 install .
+        pip3 install globus-compute-endpoint>=2.27.1
 
     - name: start globus_compute_endpoint
       env:
         GLOBUS_COMPUTE_CLIENT_ID: ${{ secrets.GLOBUS_COMPUTE_CLIENT_ID }}
         GLOBUS_COMPUTE_CLIENT_SECRET: ${{ secrets.GLOBUS_COMPUTE_SECRET_KEY }}
       run: |
-        source .venv/bin/activate
+        source /home/runner/work/parsl/parsl/.venv/bin/activate
         globus-compute-endpoint configure default
         cat << EOF > /home/runner/.globus_compute/default/config.yaml
-        display_name: null
         engine:
-          provider:
-            type: LocalProvider
-            init_blocks: 1
-            max_blocks: 1
-            min_blocks: 0
-            worker_init: source /home/runner/work/parsl/parsl/.venv/bin/activate
-          type: GlobusComputeEngine
+          type: ThreadPoolEngine
+          max_workers: 4
         EOF
+        cat /home/runner/.globus_compute/default/config.yaml
+        mkdir ~/.globus_compute/default/tasks_working_dir
         globus-compute-endpoint start default
         globus-compute-endpoint list
     - name: make test
@@ -104,6 +101,5 @@ jobs:
         path: |
           runinfo/
           .pytest/
-          ~/.globus_compute/default/
           ci_job_info.txt
         compression-level: 9
diff --git a/parsl/executors/globus_compute.py b/parsl/executors/globus_compute.py
@@ -22,8 +22,8 @@ def __init__(
             self,
             endpoint_id: Optional[UUID_LIKE_T] = None,
             task_group_id: Optional[UUID_LIKE_T] = None,
-            resource_specification: Optional[dict[str, Any]] = None,
-            user_endpoint_config: Optional[dict[str, Any]] = None,
+            resource_specification: Optional[Dict[str, Any]] = None,
+            user_endpoint_config: Optional[Dict[str, Any]] = None,
             label: str = "GlobusComputeExecutor",
             batch_size: int = 128,
             amqp_port: Optional[int] = None,

diff --git a/test-requirements.txt b/test-requirements.txt
@@ -14,7 +14,6 @@ types-requests
 types-paramiko
 mpi4py
 globus-compute-sdk>=2.27.1
-globus-compute-endpoint>=2.27.1
 
 # sqlalchemy is needed for typechecking, so it's here
 # as well as at runtime for optional monitoring execution