Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: cleaned up and rewritten execution backend structure #1491

Merged
merged 33 commits into from Mar 21, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
33 commits
Select commit Hold shift + click to select a range
d212337
fix: unified quoting logic for passing args to execution backends
johanneskoester Mar 16, 2022
9b145f5
envvar quoting
johanneskoester Mar 16, 2022
febdb19
Merge branch 'main' into fix/issue860
johanneskoester Mar 16, 2022
1038cad
fix issue #1475
johanneskoester Mar 16, 2022
1e87b79
fix envvar quoting and protect against invalid envvars
johanneskoester Mar 16, 2022
b52770d
further constrain envvars
johanneskoester Mar 16, 2022
4e9f62d
fixes
johanneskoester Mar 16, 2022
34a59ed
further cleanup
johanneskoester Mar 16, 2022
56fb0ff
refactor
johanneskoester Mar 17, 2022
e4b793d
refactoring
johanneskoester Mar 17, 2022
4c2ca00
refactoring
johanneskoester Mar 18, 2022
6bba89b
fixes
johanneskoester Mar 18, 2022
054d753
fix cmd concat
johanneskoester Mar 18, 2022
a3bc8bb
fix arg
johanneskoester Mar 18, 2022
4023aa9
fix job marker references
johanneskoester Mar 18, 2022
f2f621a
verbose tibanna test output
johanneskoester Mar 18, 2022
1859937
fixes
johanneskoester Mar 18, 2022
710f0dd
activate gcloud, kubernetes, and tibanna tests
johanneskoester Mar 18, 2022
332f8b6
fix
johanneskoester Mar 18, 2022
5e00f66
dbg
johanneskoester Mar 18, 2022
f1464e3
fix
johanneskoester Mar 18, 2022
1066a98
fix tibanna config value
johanneskoester Mar 18, 2022
8f7f0f8
automatically use full default resources in cluster or cloud mode
johanneskoester Mar 19, 2022
9ae2a55
dbg
johanneskoester Mar 20, 2022
0a46cee
fix config file path in test case
johanneskoester Mar 20, 2022
c1a9c04
temporarily deactivate tibanna
johanneskoester Mar 20, 2022
4196b96
deactivate workdir setup if not assuming shared FS
johanneskoester Mar 20, 2022
f74b79a
dbg
johanneskoester Mar 20, 2022
cb3c0c5
add some sleep in case of CI
johanneskoester Mar 20, 2022
96a3bad
fix handling of directory existence in google storage
johanneskoester Mar 21, 2022
edb7531
dbg
johanneskoester Mar 21, 2022
d8e0b18
dbg
johanneskoester Mar 21, 2022
4e7fa43
fix key usage
johanneskoester Mar 21, 2022
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
41 changes: 21 additions & 20 deletions .github/workflows/main.yml
Expand Up @@ -114,18 +114,19 @@ jobs:
echo CONTAINER_IMAGE=snakemake/snakemake:$GITHUB_SHA >> $GITHUB_ENV

# TODO reactivate in April (we have no free resources left this month)
# - name: Test Kubernetes execution
# if: env.GCP_AVAILABLE
# env:
# CI: true
# run: |
# # activate conda env
# export PATH="/usr/share/miniconda/bin:$PATH"
# source activate snakemake

# pytest -s -v -x tests/test_kubernetes.py

- name: Test AWS execution
- name: Test Kubernetes execution
if: env.GCP_AVAILABLE
env:
CI: true
run: |
# activate conda env
export PATH="/usr/share/miniconda/bin:$PATH"
source activate snakemake

pytest -s -v -x tests/test_kubernetes.py

# TODO temporarily deactivate and fix in separate PR.
- name: Test Tibanna (AWS) execution
if: env.AWS_AVAILABLE
env:
CI: true
Expand All @@ -134,16 +135,16 @@ jobs:
export PATH="/usr/share/miniconda/bin:$PATH"
source activate snakemake

pytest -v -x tests/test_tibanna.py
# pytest -v -x -s tests/test_tibanna.py

# TODO reactivate in April (we have no free resources left this month)
# - name: Test Google Life Sciences Executor
# if: env.GCP_AVAILABLE
# run: |
# # activate conda env
# export PATH="/usr/share/miniconda/bin:$PATH"
# source activate snakemake
# pytest -s -v -x tests/test_google_lifesciences.py
- name: Test Google Life Sciences Executor
if: env.GCP_AVAILABLE
run: |
# activate conda env
export PATH="/usr/share/miniconda/bin:$PATH"
source activate snakemake
pytest -s -v -x tests/test_google_lifesciences.py

- name: Test GA4GH TES executor
run: |
Expand Down
5 changes: 4 additions & 1 deletion snakemake/__init__.py
Expand Up @@ -436,6 +436,9 @@ def snakemake(
# clean up all previously recorded jobids.
shell.cleanup()
else:
if default_resources is None:
# use full default resources if in cluster or cloud mode
default_resources = DefaultResources(mode="full")
if edit_notebook:
raise WorkflowError(
"Notebook edit mode is only allowed with local execution."
Expand Down Expand Up @@ -599,6 +602,7 @@ def snakemake(
check_envvars=not lint, # for linting, we do not need to check whether requested envvars exist
all_temp=all_temp,
local_groupid=local_groupid,
keep_metadata=keep_metadata,
latency_wait=latency_wait,
)
success = True
Expand Down Expand Up @@ -800,7 +804,6 @@ def snakemake(
export_cwl=export_cwl,
batch=batch,
keepincomplete=keep_incomplete,
keepmetadata=keep_metadata,
)

except BrokenPipeError:
Expand Down