-
Notifications
You must be signed in to change notification settings - Fork 2
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'main' into release-prep
- Loading branch information
Showing
14 changed files
with
299 additions
and
44 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Empty file.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,74 @@ | ||
| { | ||
| "executionUnit": { | ||
| "image": "ghcr.io/unity-sds/unity-sps/sps-docker-cwl:2.1.0", | ||
| "type": "docker" | ||
| }, | ||
| "processDescription": { | ||
| "description": "This process executes any CWL workflow.", | ||
| "id": "cwl_dag", | ||
| "inputs": { | ||
| "cwl_args": { | ||
| "description": "The URL of the CWL workflow's YAML parameters file", | ||
| "maxOccurs": 1, | ||
| "minOccurs": 1, | ||
| "schema": { | ||
| "format": "uri", | ||
| "type": "string" | ||
| }, | ||
| "title": "CWL Workflow Parameters URL" | ||
| }, | ||
| "cwl_workflow": { | ||
| "description": "The URL of the CWL workflow", | ||
| "maxOccurs": 1, | ||
| "minOccurs": 1, | ||
| "schema": { | ||
| "format": "uri", | ||
| "type": "string" | ||
| }, | ||
| "title": "CWL Workflow URL" | ||
| }, | ||
| "request_cpu": { | ||
| "description": "The number of CPU cores requested for the job", | ||
| "maxOccurs": 1, | ||
| "minOccurs": 1, | ||
| "schema": { | ||
| "type": "string" | ||
| }, | ||
| "title": "Requested CPU" | ||
| }, | ||
| "request_memory": { | ||
| "default": "8Gi", | ||
| "description": "The amount of memory requested for the job", | ||
| "maxOccurs": 1, | ||
| "minOccurs": 1, | ||
| "schema": { | ||
| "type": "string" | ||
| }, | ||
| "title": "Requested Memory" | ||
| }, | ||
| "request_storage": { | ||
| "description": "The amount of storage requested for the job", | ||
| "maxOccurs": 1, | ||
| "minOccurs": 1, | ||
| "schema": { | ||
| "type": "string" | ||
| }, | ||
| "title": "Requested Storage" | ||
| } | ||
| }, | ||
| "jobControlOptions": [ | ||
| "async-execute" | ||
| ], | ||
| "outputs": { | ||
| "result": { | ||
| "description": "The result of the SBG Preprocess Workflow execution", | ||
| "schema": { | ||
| "$ref": "some-ref" | ||
| }, | ||
| "title": "Process Result" | ||
| } | ||
| }, | ||
| "title": "Generic CWL Process", | ||
| "version": "1.0.0" | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,36 @@ | ||
| { | ||
| "executionUnit": { | ||
| "image": "busybox", | ||
| "type": "docker" | ||
| }, | ||
| "processDescription": { | ||
| "description": "This process tests Karpenter node provisioning with different instance types.", | ||
| "id": "karpenter_test", | ||
| "inputs": { | ||
| "placeholder": { | ||
| "default": 1, | ||
| "description": "A placeholder parameter", | ||
| "maxOccurs": 1, | ||
| "minOccurs": 1, | ||
| "schema": { | ||
| "type": "integer" | ||
| }, | ||
| "title": "Placeholder" | ||
| } | ||
| }, | ||
| "jobControlOptions": [ | ||
| "async-execute" | ||
| ], | ||
| "outputs": { | ||
| "result": { | ||
| "description": "The result of the Karpenter test execution", | ||
| "schema": { | ||
| "$ref": "some-ref" | ||
| }, | ||
| "title": "Process Result" | ||
| } | ||
| }, | ||
| "title": "Karpenter Test Process", | ||
| "version": "1.0.0" | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,48 @@ | ||
| { | ||
| "executionUnit": { | ||
| "image": "ghcr.io/unity-sds/unity-sps/sps-docker-cwl:2.2.0", | ||
| "type": "docker" | ||
| }, | ||
| "processDescription": { | ||
| "description": "This process executes the SBG Preprocess Workflow using CWL.", | ||
| "id": "sbg_preprocess_cwl_dag", | ||
| "inputs": { | ||
| "cwl_args": { | ||
| "default": "https://raw.githubusercontent.com/unity-sds/sbg-workflows/main/preprocess/sbg-preprocess-workflow.dev.yml", | ||
| "description": "The SBG Pre-process YAML parameters URL", | ||
| "maxOccurs": 1, | ||
| "minOccurs": 1, | ||
| "schema": { | ||
| "format": "uri", | ||
| "type": "string" | ||
| }, | ||
| "title": "CWL Workflow Parameters" | ||
| }, | ||
| "cwl_workflow": { | ||
| "default": "https://raw.githubusercontent.com/unity-sds/sbg-workflows/main/preprocess/sbg-preprocess-workflow.cwl", | ||
| "description": "The SBG Pre-process CWL workflow URL", | ||
| "maxOccurs": 1, | ||
| "minOccurs": 1, | ||
| "schema": { | ||
| "format": "uri", | ||
| "type": "string" | ||
| }, | ||
| "title": "CWL Workflow" | ||
| } | ||
| }, | ||
| "jobControlOptions": [ | ||
| "async-execute" | ||
| ], | ||
| "outputs": { | ||
| "result": { | ||
| "description": "The result of the SBG Preprocess Workflow execution", | ||
| "schema": { | ||
| "$ref": "some-ref" | ||
| }, | ||
| "title": "Process Result" | ||
| } | ||
| }, | ||
| "title": "SBG Preprocess CWL Workflow", | ||
| "version": "1.0.0" | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -4,9 +4,12 @@ build-backend = "setuptools.build_meta" | |
|
|
||
| [project] | ||
| name = "unity-sps" | ||
| version = "2.1.0" | ||
| version = "2.2.0" | ||
| authors = [ | ||
| { name = "Drew Meyers", email = "[email protected]" }, | ||
| { name = "Luca Cinquini", email = "[email protected]" }, | ||
| { name = "Nikki Tebaldi", email = "[email protected]" }, | ||
| { name = "Brad Lunsford", email = "[email protected]" } | ||
| ] | ||
| description = "The science processing service area of Unity." | ||
| classifiers = [ | ||
|
|
@@ -37,11 +40,12 @@ test = [ | |
| "pytest-bdd==7.2.0", | ||
| "pytest-mock==3.14.0", | ||
| "requests==2.32.3", | ||
| "apache-airflow==2.9.2", | ||
| "kubernetes==30.1.0", | ||
| "boto3==1.34.143", | ||
| "apache-airflow==2.10.0", | ||
| "kubernetes==29.0.0", | ||
| "boto3==1.34.46", | ||
| "backoff==2.2.1", | ||
| "apache-airflow-providers-cncf-kubernetes==8.4.1" | ||
| "apache-airflow-providers-cncf-kubernetes==8.4.1", | ||
| "unity_sps_ogc_processes_api_python_client @ git+https://github.com/unity-sds/[email protected]" | ||
| ] | ||
| experiment = [] | ||
| lambda-airflow-dag-trigger = [ | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.