Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
RNA-seq
Manage
Activity
Members
Labels
Plan
Issues
12
Issue boards
Milestones
Iterations
Wiki
Requirements
Code
Merge requests
0
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Container Registry
Operate
Environments
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
GUDMAP_RBK
RNA-seq
Commits
1d912493
Commit
1d912493
authored
4 years ago
by
Gervaise Henry
Browse files
Options
Downloads
Patches
Plain Diff
Update pytest to utilize params
parent
09dd7af3
Branches
Branches containing commit
Tags
Tags containing commit
2 merge requests
!68
Develop
,
!67
Resolve "Change Single Read to Single End for submitted endness"
Pipeline
#9148
failed with stages
in 4 hours, 2 minutes, and 25 seconds
Changes
3
Pipelines
2
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
.gitlab-ci.yml
+8
-8
8 additions, 8 deletions
.gitlab-ci.yml
conftest.py
+13
-0
13 additions, 0 deletions
conftest.py
workflow/tests/test_completion.py
+3
-4
3 additions, 4 deletions
workflow/tests/test_completion.py
with
24 additions
and
12 deletions
.gitlab-ci.yml
+
8
−
8
View file @
1d912493
before_script
:
-
module load python/3.6.4-anaconda
-
pip install --user attrs==
19.1
.0 pytest-pythonpath==0.7.
1
pytest-cov==2.
5
.1
-
pip install --user attrs==
20.3
.0
pytest==6.2.2
pytest-pythonpath==0.7.
3
pytest-cov==2.
11
.1
-
module load singularity/3.5.3
-
module load nextflow/20.01.0
-
ln -sfn /project/BICF/BICF_Core/shared/gudmap/test_data/* ./test_data/
...
...
@@ -666,7 +666,7 @@ integration_se:
-
ulimit -a
-
nextflow -q run ./workflow/rna-seq.nf --deriva ./test_data/auth/credential.json --bdbag ./test_data/auth/cookies.txt --repRID 16-1ZX4 --source staging --upload
true
-with-dag dag.png --dev
false
--ci
true
-with-report ./SE_report.html
-
find . -type f -name "multiqc_data.json" -exec cp {} ./SE_multiqc_data.json \;
-
pytest -m completion
("
SE_multiqc_data.json
")
-
pytest -m completion
Multiqc --filename
SE_multiqc_data.json
artifacts
:
name
:
"
$CI_JOB_NAME"
when
:
always
...
...
@@ -691,7 +691,7 @@ integration_pe:
-
ulimit -a
-
nextflow -q run ./workflow/rna-seq.nf --deriva ./test_data/auth/credential.json --bdbag ./test_data/auth/cookies.txt --repRID Q-Y5JA --source staging --upload
true
-with-dag dag.png --dev
false
--ci
true
-with-report ./PE_report.html
-
find . -type f -name "multiqc_data.json" -exec cp {} ./PE_multiqc_data.json \;
-
pytest -m completion
("
PE_multiqc_data.json
")
-
pytest -m completion
Multiqc --filename
PE_multiqc_data.json
artifacts
:
name
:
"
$CI_JOB_NAME"
when
:
always
...
...
@@ -793,7 +793,7 @@ override_inputBag:
-
ulimit -a
-
nextflow -q run ./workflow/rna-seq.nf --deriva ./test_data/auth/credential.json --bdbag ./test_data/auth/cookies.txt --repRID Q-Y5F6 --source staging --inputBagForce ./test_data/bag/Q-Y5F6_inputBag_xxxxxxxx.zip --upload
false
--dev
false
--ci
true
-with-report ./inputBagOverride_report.html
-
find . -type f -name "multiqc_data.json" -exec cp {} ./inputBagOverride_PE_multiqc_data.json \;
-
pytest -m completion
("
inputBagOverride_PE_multiqc_data.json
")
-
pytest -m completion
Multiqc --filename
inputBagOverride_PE_multiqc_data.json
artifacts
:
name
:
"
$CI_JOB_NAME"
when
:
always
...
...
@@ -816,7 +816,7 @@ override_fastq:
-
ulimit -a
-
nextflow -q run ./workflow/rna-seq.nf --deriva ./test_data/auth/credential.json --bdbag ./test_data/auth/cookies.txt --repRID Q-Y5F6 --source staging --fastqsForce './test_data/fastq/small/Q-Y5F6_1M.R{1,2}.fastq.gz' --upload
false
--dev
false
--ci
true
-with-report ./fastqOverride_report.html
-
find . -type f -name "multiqc_data.json" -exec cp {} ./fastqOverride_PE_multiqc_data.json \;
-
pytest -m completion
("
fastqOverride_PE_multiqc_data.json
")
-
pytest -m completion
Multiqc --filename
fastqOverride_PE_multiqc_data.json
artifacts
:
name
:
"
$CI_JOB_NAME"
when
:
always
...
...
@@ -839,7 +839,7 @@ override_species:
-
ulimit -a
-
nextflow -q run ./workflow/rna-seq.nf --deriva ./test_data/auth/credential.json --bdbag ./test_data/auth/cookies.txt --repRID Q-Y5ER --source staging --speciesForce 'Homo sapiens' --upload
false
--dev
false
--ci
true
-with-report ./speciesOverride_report.html
-
find . -type f -name "multiqc_data.json" -exec cp {} ./speciesOverride_PE_multiqc_data.json \;
-
pytest -m completion
("
speciesOverride_PE_multiqc_data.json
")
-
pytest -m completion
Multiqc --filename
speciesOverride_PE_multiqc_data.json
artifacts
:
name
:
"
$CI_JOB_NAME"
when
:
always
...
...
@@ -862,7 +862,7 @@ override_stranded:
-
ulimit -a
-
nextflow -q run ./workflow/rna-seq.nf --deriva ./test_data/auth/credential.json --bdbag ./test_data/auth/cookies.txt --repRID Q-Y5ER --source staging --strandedForce unstranded --upload
false
--dev
false
--ci
true
-with-report ./strandedOverride_report.html
-
find . -type f -name "multiqc_data.json" -exec cp {} ./strandedOverride_PE_multiqc_data.json \;
-
pytest -m completion
("
strandedOverride_PE_multiqc_data.json
")
-
pytest -m completion
Multiqc --filename
strandedOverride_PE_multiqc_data.json
artifacts
:
name
:
"
$CI_JOB_NAME"
when
:
always
...
...
@@ -885,7 +885,7 @@ override_spike:
-
ulimit -a
-
nextflow -q run ./workflow/rna-seq.nf --deriva ./test_data/auth/credential.json --bdbag ./test_data/auth/cookies.txt --repRID Q-Y5ER --source staging --spikeForce t --upload
false
--dev
false
--ci
true
-with-report ./spikeOverride_report.html
-
find . -type f -name "multiqc_data.json" -exec cp {} ./spikeOverride_PE_multiqc_data.json \;
-
pytest -m completion
("
spikedOverride_PE_multiqc_data.json
")
-
pytest -m completion
Multiqc --filename
spikedOverride_PE_multiqc_data.json
artifacts
:
name
:
"
$CI_JOB_NAME"
when
:
always
...
...
This diff is collapsed.
Click to expand it.
conftest.py
0 → 100644
+
13
−
0
View file @
1d912493
#!/usr/bin/env python3
import
pytest
def
pytest_addoption
(
parser
):
parser
.
addoption
(
"
--filename
"
,
action
=
"
store
"
)
@pytest.fixture
(
scope
=
'
session
'
)
def
filename
(
request
):
filename_value
=
request
.
config
.
option
.
filename
if
filename_value
is
None
:
pytest
.
skip
()
return
filename_value
\ No newline at end of file
This diff is collapsed.
Click to expand it.
workflow/tests/test_completion.py
+
3
−
4
View file @
1d912493
...
...
@@ -9,8 +9,7 @@ import json
test_output_path
=
os
.
path
.
dirname
(
os
.
path
.
abspath
(
__file__
))
+
\
'
/../../
'
@pytest.mark.completion
def
test_multiqc
(
file_name
):
@pytest.mark.completionMultiqc
def
test_multiqcExist
(
filename
):
assert
os
.
path
.
exists
(
os
.
path
.
join
(
test_output_path
,
file_name
))
\ No newline at end of file
test_output_path
,
filename
))
\ No newline at end of file
This diff is collapsed.
Click to expand it.
Preview
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment