Skip to content

Commit f80e3d2

Browse files
rcannoodgithub-actions[bot]
authored andcommitted
deploy: 00e7cf1
1 parent 55f8666 commit f80e3d2

File tree

555 files changed

+5816
-1073
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

555 files changed

+5816
-1073
lines changed

.github/workflows/integration-test.yml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -121,6 +121,13 @@ jobs:
121121
- name: Run integration test
122122
timeout-minutes: 120
123123
run: |
124+
# check if stub runs work
125+
export NXF_VER=22.04.5
126+
nextflow run . \
127+
-main-script "target/nextflow/${{matrix.component.namespace}}/${{matrix.component.name}}/main.nf" \
128+
-stub -profile no_publish \
129+
-c src/workflows/utils/integration_tests.config
130+
124131
# todo: replace with viash test command
125132
export NXF_VER=22.04.5
126133
nextflow run . \

.github/workflows/release-build.yml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -109,6 +109,13 @@ jobs:
109109
- name: Run integration test
110110
timeout-minutes: 120
111111
run: |
112+
# check if stub runs work
113+
export NXF_VER=22.04.5
114+
nextflow run . \
115+
-main-script "target/nextflow/${{matrix.component.namespace}}/${{matrix.component.name}}/main.nf" \
116+
-stub -profile no_publish \
117+
-c src/workflows/utils/integration_tests.config
118+
112119
# todo: replace with viash test command
113120
export NXF_VER=22.04.5
114121
nextflow run . \

CHANGELOG.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,8 @@
6464

6565
# BUG FIXES
6666

67+
* Fix `-stub` runs (PR #1000).
68+
6769
* `cluster/leiden`: Fix an issue where insufficient shared memory (size of `/dev/shm`) causes the processing to hang.
6870

6971
* `utils/subset_vars`: Convert .var column used for subsetting of dtype "boolean" to dtype "bool" when it doesn't contain NaN values (PR #959).

src/workflows/annotation/harmony_knn/config.vsh.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,7 @@ dependencies:
175175
- name: workflows/integration/harmony_leiden
176176
alias: harmony_leiden_workflow
177177
- name: labels_transfer/knn
178-
- name: dataflow/split_h5mu
178+
- name: workflows/multiomics/split_h5mu
179179
- name: dataflow/concatenate_h5mu
180180
- name: dimred/pca
181181
- name: feature_annotation/align_query_reference

src/workflows/annotation/harmony_knn/main.nf

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -179,6 +179,14 @@ workflow run_wf {
179179
// map the integrated query and reference datasets back to the state
180180
| map {id, state ->
181181
def outputDir = state.output
182+
if (workflow.stubRun) {
183+
def output_files = outputDir.listFiles()
184+
def new_state = state + [
185+
"input": output_files[0],
186+
"reference": output_files[1],
187+
]
188+
return [id, new_state]
189+
}
182190
def files = readCsv(state.output_files.toUriString())
183191
def query_file = files.findAll{ dat -> dat.name == 'query' }
184192
assert query_file.size() == 1, 'there should only be one query file'

src/workflows/annotation/scanvi_scarches/config.vsh.yaml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,12 @@ authors:
77
- __merge__: /src/authors/weiwei_schultz.yaml
88
roles: [ contributor ]
99

10+
info:
11+
name: "scANVI - scArches workflow"
12+
test_dependencies:
13+
- name: scanvi_scarches_test
14+
namespace: test_workflows/annotation
15+
1016
argument_groups:
1117
- name: Query Input
1218
arguments:

src/workflows/annotation/scanvi_scarches/main.nf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ workflow run_wf {
113113
"obsp_neighbor_connectivities": "scanvi_integration_connectivities",
114114
"obs_cluster": "scanvi_integration_leiden",
115115
"obsm_umap": "X_scanvi_umap"
116-
]
116+
],
117117
toState: [ "output": "output" ]
118118
)
119119
| setState(["output", "output_model"])

src/workflows/annotation/scanvi_scarches/test.nf

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,8 @@ workflow test_wf {
5252
"input": "output"
5353
]
5454
)
55+
56+
output_ch
5557
| toSortedList({a, b -> a[0] <=> b[0]})
5658
| map { output_list ->
5759
assert output_list.size() == 1 : "output channel should contain 1 event"

src/workflows/annotation/scvi_knn/config.vsh.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -203,7 +203,7 @@ dependencies:
203203
- name: workflows/integration/scvi_leiden
204204
alias: scvi_leiden_workflow
205205
- name: labels_transfer/knn
206-
- name: dataflow/split_h5mu
206+
- name: workflows/multiomics/split_h5mu
207207
- name: dataflow/concatenate_h5mu
208208
- name: feature_annotation/align_query_reference
209209
- name: feature_annotation/highly_variable_features_scanpy

src/workflows/annotation/scvi_knn/main.nf

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -182,6 +182,14 @@ workflow run_wf {
182182
// map the integrated query and reference datasets back to the state
183183
| map {id, state ->
184184
def outputDir = state.output
185+
if (workflow.stubRun) {
186+
def output_files = outputDir.listFiles()
187+
def new_state = state + [
188+
"input": output_files[0],
189+
"reference": output_files[1],
190+
]
191+
return [id, new_state]
192+
}
185193
def files = readCsv(state.output_files.toUriString())
186194
def query_file = files.findAll{ dat -> dat.name == 'query' }
187195
assert query_file.size() == 1, 'there should only be one query file'

0 commit comments

Comments
 (0)