Skip to content

Commit b7f526c

Browse files
Edited app-panel.json, nextflow.json, pipeline-layout.json, main.nf; and changes in 1 other files
1 parent 55f1919 commit b7f526c

5 files changed

Lines changed: 38 additions & 15 deletions

File tree

.codeocean/app-panel.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
{
22
"version": 1,
33
"processes": [
4-
"capsule_mosuite_create_2"
4+
"capsule_mosuite_create_2",
5+
"capsule_mosuite_clean_1"
56
]
67
}

.codeocean/datasets.json

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
{
2+
"version": 1,
3+
"attached_datasets": [
4+
{
5+
"id": "4ea90259-b1ac-491b-8571-5c25a8a98529",
6+
"mount": "moo-create"
7+
}
8+
]
9+
}

.codeocean/nextflow.json

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
"id": "ab07963e-d9e0-489e-b776-70f6ef2ef73b",
88
"name": "MOSuite-clean",
99
"slug": "5801113",
10-
"version": 1,
10+
"version": 2,
1111
"app_panel": true
1212
},
1313
"resources": {
@@ -16,20 +16,23 @@
1616
},
1717
"inputs": [
1818
{
19-
"id": "uqbFE30XQBTDxBxR",
19+
"id": "NLgJ8e32jH3YibWL",
2020
"source_id": "capsule_mosuite_create_2",
2121
"type": "capsule",
2222
"name": "MOSuite-create"
2323
}
24-
]
24+
],
25+
"results": {
26+
"id": "ab07963e-d9e0-489e-b776-70f6ef2ef73b"
27+
}
2528
},
2629
{
2730
"name": "capsule_mosuite_create_2",
2831
"capsule": {
2932
"id": "5ce5f88d-980d-4e61-b3a4-ef4a0ce48030",
3033
"name": "MOSuite-create",
3134
"slug": "6541445",
32-
"version": 2,
35+
"version": 3,
3336
"app_panel": true
3437
},
3538
"resources": {

.codeocean/pipeline-layout.json

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,11 @@
44
"id": "xy-edge__capsule_mosuite_create_2-capsule_mosuite_clean_1",
55
"source": "capsule_mosuite_create_2",
66
"target": "capsule_mosuite_clean_1"
7+
},
8+
{
9+
"id": "xy-edge__capsule_mosuite_clean_1-results",
10+
"source": "capsule_mosuite_clean_1",
11+
"target": "results"
712
}
813
],
914
"nodes": [
@@ -16,7 +21,7 @@
1621
"x": 842.6666666666667,
1722
"y": 270
1823
},
19-
"selected": false,
24+
"selected": true,
2025
"type": "capsule"
2126
},
2227
{
@@ -36,11 +41,11 @@
3641
"x": 718.6666666666666,
3742
"y": 31.333333333333343
3843
},
39-
"selected": true,
44+
"selected": false,
4045
"type": "capsule"
4146
}
4247
],
43-
"timestamp": 1769554760195,
48+
"timestamp": 1769626304514,
4449
"viewport": {
4550
"x": 6,
4651
"y": 87,

pipeline/main.nf

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
#!/usr/bin/env nextflow
2-
// hash:sha256:e60c74eb0db9870da170bd3833dbe435cba6b383333fc48223204b0a17b1e6f0
2+
// hash:sha256:9b16fd2671702fcc56078aa8b25ef1fb8c069f03988557476eb9af8fad550618
33

44
// capsule - MOSuite-create
55
process capsule_mosuite_create_2 {
66
tag 'capsule-6541445'
7-
container "$REGISTRY_HOST/published/5ce5f88d-980d-4e61-b3a4-ef4a0ce48030:v2"
7+
container "$REGISTRY_HOST/published/5ce5f88d-980d-4e61-b3a4-ef4a0ce48030:v3"
88

99
cpus 1
1010
memory '7.5 GB'
@@ -28,9 +28,9 @@ process capsule_mosuite_create_2 {
2828
2929
echo "[${task.tag}] cloning git repo..."
3030
if [[ "\$(printf '%s\n' "2.20.0" "\$(git version | awk '{print \$3}')" | sort -V | head -n1)" = "2.20.0" ]]; then
31-
git clone --filter=tree:0 --branch v2.0 "https://\$GIT_ACCESS_TOKEN@\$GIT_HOST/capsule-6541445.git" capsule-repo
31+
git clone --filter=tree:0 --branch v3.0 "https://\$GIT_ACCESS_TOKEN@\$GIT_HOST/capsule-6541445.git" capsule-repo
3232
else
33-
git clone --branch v2.0 "https://\$GIT_ACCESS_TOKEN@\$GIT_HOST/capsule-6541445.git" capsule-repo
33+
git clone --branch v3.0 "https://\$GIT_ACCESS_TOKEN@\$GIT_HOST/capsule-6541445.git" capsule-repo
3434
fi
3535
mv capsule-repo/code capsule/code && ln -s \$PWD/capsule/code /code
3636
rm -rf capsule-repo
@@ -47,14 +47,19 @@ process capsule_mosuite_create_2 {
4747
// capsule - MOSuite-clean
4848
process capsule_mosuite_clean_1 {
4949
tag 'capsule-5801113'
50-
container "$REGISTRY_HOST/published/ab07963e-d9e0-489e-b776-70f6ef2ef73b:v1"
50+
container "$REGISTRY_HOST/published/ab07963e-d9e0-489e-b776-70f6ef2ef73b:v2"
5151

5252
cpus 1
5353
memory '7.5 GB'
5454

55+
publishDir "$RESULTS_PATH", saveAs: { filename -> new File(filename).getName() }
56+
5557
input:
5658
path 'capsule/data/'
5759

60+
output:
61+
path 'capsule/results/*'
62+
5863
script:
5964
"""
6065
#!/usr/bin/env bash
@@ -71,9 +76,9 @@ process capsule_mosuite_clean_1 {
7176
7277
echo "[${task.tag}] cloning git repo..."
7378
if [[ "\$(printf '%s\n' "2.20.0" "\$(git version | awk '{print \$3}')" | sort -V | head -n1)" = "2.20.0" ]]; then
74-
git clone --filter=tree:0 --branch v1.0 "https://\$GIT_ACCESS_TOKEN@\$GIT_HOST/capsule-5801113.git" capsule-repo
79+
git clone --filter=tree:0 --branch v2.0 "https://\$GIT_ACCESS_TOKEN@\$GIT_HOST/capsule-5801113.git" capsule-repo
7580
else
76-
git clone --branch v1.0 "https://\$GIT_ACCESS_TOKEN@\$GIT_HOST/capsule-5801113.git" capsule-repo
81+
git clone --branch v2.0 "https://\$GIT_ACCESS_TOKEN@\$GIT_HOST/capsule-5801113.git" capsule-repo
7782
fi
7883
mv capsule-repo/code capsule/code && ln -s \$PWD/capsule/code /code
7984
rm -rf capsule-repo

0 commit comments

Comments
 (0)