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

Pseudo PR - DO NOT MERGE #19

Closed
wants to merge 217 commits into from
Closed
Show file tree
Hide file tree
Changes from 135 commits
Commits
Show all changes
217 commits
Select commit Hold shift + click to select a range
78a2c83
change README
ypriverol Jan 19, 2021
6d7b52b
Merge pull request #1 from bigbio/master
ypriverol Jan 19, 2021
e7c0c45
configuration files added.
ypriverol Jan 19, 2021
5618bde
Updated the README.md
ypriverol Jan 19, 2021
e37e167
Merge branch 'dev' of https://github.com/bigbio/pgdb into dev
ypriverol Jan 19, 2021
f1cb026
Updated the README.md
ypriverol Jan 19, 2021
9a278c3
Updated the README.md
ypriverol Jan 19, 2021
f3de69f
increase the version of the pipeline.
ypriverol Jan 19, 2021
8eec9e1
increase the version of the pipeline.
ypriverol Jan 20, 2021
7653d86
config paths solved
ypriverol Jan 20, 2021
87ece60
updated the .githubignore
ypriverol Jan 20, 2021
14246ce
change the biotypes to params -> bug fixed
ypriverol Jan 20, 2021
5b06e8b
decoy = false
ypriverol Jan 20, 2021
82891a5
change .gitignore
ypriverol Jan 20, 2021
049713d
change .gitignore
ypriverol Jan 20, 2021
ff97aab
fix error with nextflow get_software_versions
ypriverol Jan 21, 2021
f365b1c
Merge pull request #2 from nf-core/dev
ypriverol Jan 21, 2021
ac90b87
new ci example
ypriverol Jan 21, 2021
22bd0db
new ci example cosmic variants
ypriverol Jan 21, 2021
90a50b4
new ci example cosmic variants
ypriverol Jan 21, 2021
d3adc43
small change in ci
ypriverol Jan 21, 2021
e1d77db
small change in ci
ypriverol Jan 21, 2021
2215a46
small change in ci
ypriverol Jan 21, 2021
69cd53c
update package version. -> 0.0.10
ypriverol Feb 5, 2021
5ff76fc
Merge pull request #3 from nf-core/dev
ypriverol Feb 5, 2021
e964076
fix bug in cosmic
ypriverol Feb 5, 2021
54ddc23
disable cosmic tests, to big in files
ypriverol Feb 5, 2021
fe93d19
Process cosmic cell line data properly
husensofteng Feb 7, 2021
a4f2b3d
update in py-pgatk version -> 0.0.11
ypriverol Feb 7, 2021
7a84202
update usage
ypriverol Feb 8, 2021
27b776b
update usage
ypriverol Feb 8, 2021
221b9aa
Merge branch 'dev' of https://github.com/bigbio/pgdb into dev
ypriverol Feb 8, 2021
6ad493a
add decoy to tests
ypriverol Feb 8, 2021
b937b13
decoy added
ypriverol Feb 8, 2021
7fa492b
improved help message and formatting
husensofteng Feb 8, 2021
619cf35
Merge branch 'dev' of https://github.com/nf-core/pgdb into dev
husensofteng Feb 8, 2021
e285fea
clean database step added including stop codons processing.
ypriverol Feb 9, 2021
1bfc2af
Merge remote-tracking branch 'origin/dev' into dev
ypriverol Feb 9, 2021
c9c4c90
clean database step added including stop codons processing.
ypriverol Feb 9, 2021
4cf4878
removed --split_by_filter_column, issue #6
husensofteng Feb 9, 2021
b60c536
fixed type
husensofteng Feb 9, 2021
49a3c71
changed default filter_column for cosmic mutations to Histology subty…
husensofteng Feb 9, 2021
34e0d91
clean database step added including stop codons processing.
ypriverol Feb 9, 2021
855c4b6
Merge remote-tracking branch 'origin/dev' into dev
ypriverol Feb 9, 2021
8cbf964
changed cosmic_tissue_type to cosmic_tissue_type param
husensofteng Feb 10, 2021
31849dd
merge download and gunzip in same process
ypriverol Feb 10, 2021
f295aa5
Merge remote-tracking branch 'origin/dev' into dev
ypriverol Feb 10, 2021
15debbf
increase of version, protein_final_name used
ypriverol Feb 11, 2021
654ae4e
support to download a particulr study from cbio"
husensofteng Feb 13, 2021
318ccf5
fixed issue in dowloading study from a particular cbiportal study
husensofteng Feb 15, 2021
34ced91
added param to select columnn in cbioportal
husensofteng Feb 15, 2021
9ec7b1c
increased version.
ypriverol Feb 15, 2021
3007ff8
Merge remote-tracking branch 'origin/dev' into dev
ypriverol Feb 15, 2021
0903afb
increased version.
ypriverol Feb 15, 2021
5a07483
increased version.
ypriverol Feb 19, 2021
7ddf11b
added task to generate proteinDB for custom vcf files
husensofteng Mar 5, 2021
6434e34
download dna fasta
husensofteng Mar 5, 2021
311d2db
increased py-pgatk ->0.0.16.
ypriverol Mar 8, 2021
9df2a1d
decoy options extended
ypriverol Mar 8, 2021
98a24d4
decoy options extended
ypriverol Mar 8, 2021
db6bef0
decoy options extended
ypriverol Mar 8, 2021
b9b9859
decoy options extended
ypriverol Mar 8, 2021
483b927
decoy options extended
ypriverol Mar 8, 2021
224e7c9
decoy options extended
ypriverol Mar 8, 2021
a86886b
versions added
ypriverol Mar 8, 2021
553cec9
fix vcf params
husensofteng Mar 11, 2021
5bada45
fixed vcf error
husensofteng Mar 11, 2021
10fe8ff
changed test and decoy conf
husensofteng Mar 12, 2021
6290788
change results output
ypriverol Mar 12, 2021
7977f93
update version
ypriverol Mar 12, 2021
9d8727e
check if the gz files are ok.
ypriverol Mar 13, 2021
b1da04c
check if the gz files are ok.
ypriverol Mar 13, 2021
aa93946
check if the gz files are ok.
ypriverol Mar 13, 2021
98b5695
check if the gz files are ok.
ypriverol Mar 13, 2021
8f108a7
check if the gz files are ok.
ypriverol Mar 13, 2021
29a0815
change in vfc convert
ypriverol Mar 14, 2021
8b78315
Template update for nf-core/tools version 1.13
nf-core-bot Mar 18, 2021
7809e6e
Template update for nf-core/tools version 1.13.1
nf-core-bot Mar 19, 2021
e67f2a4
Template update for nf-core/tools version 1.13.2
nf-core-bot Mar 23, 2021
ed6dc7c
Template update for nf-core/tools version 1.13.3
nf-core-bot Mar 25, 2021
b24852d
fixed chromosme names and af_field in vcf
husensofteng Mar 30, 2021
b843dba
fixed chrM naming
husensofteng Mar 30, 2021
cb3cc4a
fixed escape char in awk
husensofteng Mar 30, 2021
eb31065
Skipped gunzip of ensembl downloads because it is done by py-pgatk now
husensofteng Mar 31, 2021
d7f9e46
fixed ensembl-vcf download and code enhancement
husensofteng Mar 31, 2021
035533a
updated pypgatk version in yml
husensofteng Mar 31, 2021
66946e0
updated yml
husensofteng Mar 31, 2021
e32ee65
update the the enviroment
ypriverol Apr 7, 2021
8f99b8d
preparing for release 1.0.0
ypriverol Apr 7, 2021
97fcb51
preparing for release 1.0.0
ypriverol Apr 7, 2021
a0389d6
preparing for release 1.0.0
ypriverol Apr 7, 2021
40bdb1c
preparing for release 1.0.0
ypriverol Apr 7, 2021
ee0bfbf
preparing for release 1.0.0
ypriverol Apr 7, 2021
f2bdba2
preparing for release 1.0.0
ypriverol Apr 7, 2021
6a6e337
preparing for release 1.0.0
ypriverol Apr 7, 2021
7ed87b3
preparing for release 1.0.0
ypriverol Apr 7, 2021
20cd604
preparing for release 1.0.0
ypriverol Apr 7, 2021
04498a0
preparing for release 1.0.0
ypriverol Apr 7, 2021
197fbfb
preparing for release 1.0.0
ypriverol Apr 7, 2021
9023390
preparing for release 1.0.0
ypriverol Apr 7, 2021
4cf5216
preparing for release 1.0.0
ypriverol Apr 7, 2021
3a345f6
preparing for release 1.0.0
ypriverol Apr 7, 2021
d4550c5
preparing for release 1.0.0
ypriverol Apr 8, 2021
c17e70e
preparing for release 1.0.0
ypriverol Apr 8, 2021
ceae3eb
preparing for release 1.0.0
ypriverol Apr 8, 2021
c6fe5b3
preparing for release 1.0.0
ypriverol Apr 8, 2021
cc19123
preparing for release 1.0.0
ypriverol Apr 8, 2021
fb517be
preparing for release 1.0.0
ypriverol Apr 8, 2021
2259ba7
preparing for release 1.0.0
ypriverol Apr 8, 2021
b04e03f
update json schema
ypriverol Apr 8, 2021
8660d13
update json schema
ypriverol Apr 8, 2021
9833b05
update json schema
ypriverol Apr 8, 2021
cf8db37
update json schema
ypriverol Apr 8, 2021
038eb52
update json schema
ypriverol Apr 8, 2021
d07c159
fixing bugs
ypriverol Apr 8, 2021
cefb883
Merge pull request #18 from ypriverol/dev
ypriverol Apr 8, 2021
a3a70ef
changes for review release
ypriverol Apr 8, 2021
c1b1ac9
Update main.nf
ypriverol Apr 8, 2021
d734869
Update main.nf
ypriverol Apr 8, 2021
4563a05
Update main.nf
ypriverol Apr 8, 2021
e0c3534
Update README.md
ypriverol Apr 8, 2021
cfc0388
Update CHANGELOG.md
ypriverol Apr 8, 2021
85f49ae
Merge branch 'dev' of https://github.com/nf-core/pgdb into dev
ypriverol Apr 8, 2021
f3e6597
changes for review release
ypriverol Apr 9, 2021
3ff85ec
Better examples added.
ypriverol Apr 9, 2021
367d6c0
Better examples added.
ypriverol Apr 9, 2021
540465d
Better examples added.
ypriverol Apr 9, 2021
6774aeb
Better examples added.
ypriverol Apr 9, 2021
2ab8a0f
Better examples added.
ypriverol Apr 9, 2021
7fca92a
Better examples added.
ypriverol Apr 9, 2021
1aba5fb
Better examples added.
ypriverol Apr 9, 2021
79046ab
Better examples added.
ypriverol Apr 9, 2021
1fa879c
Better examples added.
ypriverol Apr 9, 2021
5877048
update for the PR review
ypriverol Apr 9, 2021
6ab6f8a
update for the PR review
ypriverol Apr 9, 2021
e72fd2e
identation solved
ypriverol Apr 9, 2021
6bb7926
adding more citations
ypriverol Apr 9, 2021
707a416
adding more citations
ypriverol Apr 9, 2021
415a082
Merge pull request #20 from ypriverol/dev
ypriverol Apr 9, 2021
4879156
Update docs/usage.md
ypriverol Apr 12, 2021
20370c3
schema changed
ypriverol Apr 12, 2021
ffac7f4
Merge branch 'dev' of https://github.com/nf-core/pgdb into dev
ypriverol Apr 12, 2021
a3c4f39
Update nextflow.config
ypriverol Apr 12, 2021
5d8b0d6
Update nextflow.config
ypriverol Apr 12, 2021
3e52a64
Update nextflow.config
ypriverol Apr 12, 2021
b477229
Merge pull request #21 from ypriverol/dev
ypriverol Apr 12, 2021
b151f8a
Update nextflow.config
ypriverol Apr 12, 2021
30bc95a
Update nextflow.config
ypriverol Apr 12, 2021
9784f16
Update nextflow.config
ypriverol Apr 12, 2021
4a6eadb
Update nextflow.config
ypriverol Apr 12, 2021
05439db
Update nextflow.config
ypriverol Apr 12, 2021
646fbe3
change in the config file
ypriverol Apr 12, 2021
04fc647
Merge branch 'dev' of https://github.com/nf-core/pgdb into dev
ypriverol Apr 12, 2021
6313940
remove unused flags
ypriverol Apr 12, 2021
59e3619
remove unused flags
ypriverol Apr 12, 2021
d102698
Merge pull request #22 from ypriverol/dev
ypriverol Apr 12, 2021
e5ff908
remove unused flags
ypriverol Apr 12, 2021
ed29910
remove unused flags
ypriverol Apr 12, 2021
7072e72
Merge pull request #23 from ypriverol/dev
ypriverol Apr 12, 2021
59f7e02
schema changed
ypriverol Apr 13, 2021
d60b356
Merge pull request #24 from ypriverol/dev
ypriverol Apr 13, 2021
cd45012
ignore biotypes in the schema
ypriverol Apr 13, 2021
b4c61ae
Merge pull request #25 from ypriverol/dev
ypriverol Apr 13, 2021
70bc42a
ignore biotypes in the schema
ypriverol Apr 13, 2021
45d8421
Merge branch 'dev' of https://github.com/nf-core/pgdb into dev
ypriverol Apr 13, 2021
de8ba0a
ignore biotypes in the schema
ypriverol Apr 13, 2021
ca87de9
ignore biotypes in the schema
ypriverol Apr 13, 2021
fe71078
hide the input file parameter
ypriverol Apr 13, 2021
552cdee
Merge pull request #26 from ypriverol/dev
ypriverol Apr 13, 2021
d9165e2
hide the input file parameter
ypriverol Apr 13, 2021
0ef1e6b
hide the input file parameter
ypriverol Apr 13, 2021
c40bbe7
Merge branch 'dev' of https://github.com/nf-core/pgdb into dev
ypriverol Apr 13, 2021
a4bb679
Merge pull request #27 from ypriverol/dev
ypriverol Apr 13, 2021
ce60b1b
Update docs/usage.md
ypriverol Apr 14, 2021
b1e4cbe
Update main.nf
ypriverol Apr 14, 2021
d137baa
Update main.nf
ypriverol Apr 14, 2021
e6717dd
Update nextflow.config
ypriverol Apr 14, 2021
0ae3b41
Update main.nf
ypriverol Apr 14, 2021
293f233
remove input.
ypriverol Apr 14, 2021
b034ece
ZCAT removed
ypriverol Apr 14, 2021
41ed3ac
Tabs to spaces
ewels Apr 14, 2021
1442057
Sort out indentation in main.nf
ewels Apr 14, 2021
ccb1053
Remove double-header, move summary to top of main.nf
ewels Apr 14, 2021
80a2ea7
Remove unused ZCAT, clone into cwd
ewels Apr 14, 2021
8a2bc98
Strip {} from lots of variables
ewels Apr 14, 2021
d6b5e02
nextflow.config whitespace, config_profile_name
ewels Apr 14, 2021
48e4078
Don't limit resources for test_full, drop single_end
ewels Apr 14, 2021
d9e93ab
baseDir -> projectDir
ewels Apr 14, 2021
015f767
Added missing config_profile_name to schema
ewels Apr 14, 2021
8c0893b
Move params.cbioportal_study_id initialisation into nextflow.config
ewels Apr 14, 2021
e843382
Space after // comment
ewels Apr 14, 2021
6d08b56
Drop duplicate .Rprofile creation from Dockerfile
ewels Apr 14, 2021
37b2fd6
--taxonomy not used anywhere, replaced in schema and nextflow.config …
ewels Apr 14, 2021
bb32a88
Finish stripping custom_runName
ewels Apr 14, 2021
04e34f0
Use the pipeline summary from the schema
ewels Apr 14, 2021
9607a8e
Merge pull request #28 from ewels/main-nf-whitespace
ypriverol Apr 15, 2021
bd21676
Merge branch 'dev' of https://github.com/nf-core/pgdb into dev
ypriverol Apr 15, 2021
b3a4075
small changes
ypriverol Apr 15, 2021
f8ea73f
small changes
ypriverol Apr 15, 2021
4f65b9f
small changes
ypriverol Apr 15, 2021
39a11a5
input skip test
ypriverol Apr 15, 2021
9414d02
remove the intermedia files
ypriverol Apr 15, 2021
b2e80c9
remove the intermedia files
ypriverol Apr 15, 2021
137f9e1
remove the intermedia files
ypriverol Apr 15, 2021
f0a76d0
Merge pull request #29 from ypriverol/dev
ypriverol Apr 15, 2021
169537c
Merged changes from nf-core template
ErikDanielsson Apr 16, 2021
11ab4ae
Merge pull request #31 from ErikDanielsson/merging-template-updates
ypriverol Apr 21, 2021
7b66698
feat: remove social preview image to use GitHub OpenGraph
maxulysse Apr 26, 2021
dc85bd2
Merge pull request #33 from maxulysse/dev
ewels Apr 26, 2021
dbeb5d8
Fix up markdown in output.md for cleaner rendering & ToC.
ewels Apr 26, 2021
defbeda
Remove COSMIC user details from test ci.yml
ewels Apr 26, 2021
b06ebf4
Merge pull request #34 from ewels/master
ypriverol Apr 26, 2021
affcf2d
Refactor to use publishDir to save final output files instead of manu…
ewels Apr 26, 2021
d73aeb2
Use closure for decoy publishDir
ewels Apr 26, 2021
cccb6e8
Merge pull request #35 from ewels/master
ypriverol Apr 26, 2021
2bc2d17
Remove params.push_s3, minor typos
ewels Apr 26, 2021
25eb864
Merge pull request #36 from ewels/master
ypriverol Apr 26, 2021
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .github/.dockstore.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,4 @@ version: 1.2
workflows:
- subclass: nfl
primaryDescriptorPath: /nextflow.config
publish: True
4 changes: 2 additions & 2 deletions .github/CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ If you wish to contribute a new step, please use the following coding standards:
2. Write the process block (see below).
3. Define the output channel if needed (see below).
4. Add any new flags/options to `nextflow.config` with a default (see below).
5. Add any new flags/options to `nextflow_schema.json` with help text (with `nf-core schema build .`)
5. Add any new flags/options to `nextflow_schema.json` with help text (with `nf-core schema build .`).
6. Add any new flags/options to the help message (for integer/text parameters, print to help the corresponding `nextflow.config` parameter).
7. Add sanity checks for all relevant parameters.
8. Add any new software to the `scrape_software_versions.py` script in `bin/` and the version command to the `scrape_software_versions` process in `main.nf`.
Expand All @@ -87,7 +87,7 @@ Once there, use `nf-core schema build .` to add to `nextflow_schema.json`.

### Default processes resource requirements

Sensible defaults for process resource requirements (CPUs / memory / time) for a process should be defined in `conf/base.config`. These should generally be specified generic with `withLabel:` selectors so they can be shared across multiple processes/steps of the pipeline. A nf-core standard set of labels that should be followed where possible can be seen in the [nf-core pipeline template](https://github.com/nf-core/tools/blob/master/nf_core/pipeline-template/%7B%7Bcookiecutter.name_noslash%7D%7D/conf/base.config), which has the default process as a single core-process, and then different levels of multi-core configurations for increasingly large memory requirements defined with standardised labels.
Sensible defaults for process resource requirements (CPUs / memory / time) for a process should be defined in `conf/base.config`. These should generally be specified generic with `withLabel:` selectors so they can be shared across multiple processes/steps of the pipeline. A nf-core standard set of labels that should be followed where possible can be seen in the [nf-core pipeline template](https://github.com/nf-core/tools/blob/master/nf_core/pipeline-template/conf/base.config), which has the default process as a single core-process, and then different levels of multi-core configurations for increasingly large memory requirements defined with standardised labels.

The process resources can be passed on to the tool dynamically within the process with the `${task.cpu}` and `${task.memory}` variables in the `script:` block.

Expand Down
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/bug_report.md
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ Have you provided the following extra information/files:

## Container engine

- Engine: <!-- [e.g. Conda, Docker, Singularity or Podman] -->
- Engine: <!-- [e.g. Conda, Docker, Singularity, Podman, Shifter or Charliecloud] -->
- version: <!-- [e.g. 1.0.0] -->
- Image tag: <!-- [e.g. nfcore/pgdb:1.0.0] -->

Expand Down
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/feature_request.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
---
name: Feature request
about: Suggest an idea for the nf-core website
about: Suggest an idea for the nf-core/pgdb pipeline
labels: enhancement
---

Expand Down
6 changes: 3 additions & 3 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@ Learn more about contributing: [CONTRIBUTING.md](https://github.com/nf-core/pgdb

- [ ] This comment contains a description of changes (with reason).
- [ ] If you've fixed a bug or added code that should be tested, add tests!
- [ ] If you've added a new tool - add to the software_versions process and a regex to `scrape_software_versions.py`
- [ ] If you've added a new tool - have you followed the pipeline conventions in the [contribution docs](https://github.com/nf-core/pgdb/tree/master/.github/CONTRIBUTING.md)
- [ ] If necessary, also make a PR on the nf-core/pgdb _branch_ on the [nf-core/test-datasets](https://github.com/nf-core/test-datasets) repository.
- [ ] If you've added a new tool - add to the software_versions process and a regex to `scrape_software_versions.py`
- [ ] If you've added a new tool - have you followed the pipeline conventions in the [contribution docs](https://github.com/nf-core/pgdb/tree/master/.github/CONTRIBUTING.md)
- [ ] If necessary, also make a PR on the nf-core/pgdb _branch_ on the [nf-core/test-datasets](https://github.com/nf-core/test-datasets) repository.
- [ ] Make sure your code lints (`nf-core lint .`).
- [ ] Ensure the test suite passes (`nextflow run . -profile test,docker`).
- [ ] Usage Documentation in `docs/usage.md` is updated.
Expand Down
3 changes: 1 addition & 2 deletions .github/workflows/awsfulltest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ jobs:
- name: Install awscli
run: conda install -c conda-forge awscli
- name: Start AWS batch job
# TODO nf-core: You can customise AWS full pipeline tests as required
# Add full size test data (but still relatively small datasets for few samples)
# on the `test_full.config` test runs with only one set of parameters
# Then specify `-profile test_full` instead of `-profile test` on the AWS batch command
Expand All @@ -40,4 +39,4 @@ jobs:
--job-name nf-core-pgdb \
--job-queue $AWS_JOB_QUEUE \
--job-definition $AWS_JOB_DEFINITION \
--container-overrides '{"command": ["nf-core/pgdb", "-r '"${GITHUB_SHA}"' -profile test --outdir s3://'"${AWS_S3_BUCKET}"'/pgdb/results-'"${GITHUB_SHA}"' -w s3://'"${AWS_S3_BUCKET}"'/pgdb/work-'"${GITHUB_SHA}"' -with-tower"], "environment": [{"name": "TOWER_ACCESS_TOKEN", "value": "'"$TOWER_ACCESS_TOKEN"'"}]}'
--container-overrides '{"command": ["nf-core/pgdb", "-r '"${GITHUB_SHA}"' -profile test_full --outdir s3://'"${AWS_S3_BUCKET}"'/pgdb/results-'"${GITHUB_SHA}"' -w s3://'"${AWS_S3_BUCKET}"'/pgdb/work-'"${GITHUB_SHA}"' -with-tower"], "environment": [{"name": "TOWER_ACCESS_TOKEN", "value": "'"$TOWER_ACCESS_TOKEN"'"}]}'
1 change: 0 additions & 1 deletion .github/workflows/awstest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ jobs:
- name: Install awscli
run: conda install -c conda-forge awscli
- name: Start AWS batch job
# TODO nf-core: You can customise CI pipeline run tests as required
# For example: adding multiple test runs with different parameters
# Remember that you can parallelise this by using strategy.matrix
env:
Expand Down
15 changes: 12 additions & 3 deletions .github/workflows/branch.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
- name: Check PRs
if: github.repository == 'nf-core/pgdb'
run: |
{ [[ ${{github.event.pull_request.head.repo.full_name}} == nf-core/pgdb ]] && [[ $GITHUB_HEAD_REF = "dev" ]]; } || [[ $GITHUB_HEAD_REF == "patch" ]]
{ [[ ${{github.event.pull_request.head.repo.full_name }} == nf-core/pgdb ]] && [[ $GITHUB_HEAD_REF = "dev" ]]; } || [[ $GITHUB_HEAD_REF == "patch" ]]


# If the above check failed, post a comment on the PR explaining the failure
Expand All @@ -23,13 +23,22 @@ jobs:
uses: mshick/add-pr-comment@v1
with:
message: |
## This PR is against the `master` branch :x:

* Do not close this PR
* Click _Edit_ and change the `base` to `dev`
* This CI test will remain failed until you push a new commit

---

Hi @${{ github.event.pull_request.user.login }},

It looks like this pull-request is has been made against the ${{github.event.pull_request.head.repo.full_name}} `master` branch.
It looks like this pull-request is has been made against the [${{github.event.pull_request.head.repo.full_name }}](https://github.com/${{github.event.pull_request.head.repo.full_name }}) `master` branch.
The `master` branch on nf-core repositories should always contain code from the latest release.
Because of this, PRs to `master` are only allowed if they come from the ${{github.event.pull_request.head.repo.full_name}} `dev` branch.
Because of this, PRs to `master` are only allowed if they come from the [${{github.event.pull_request.head.repo.full_name }}](https://github.com/${{github.event.pull_request.head.repo.full_name }}) `dev` branch.

You do not need to close this PR, you can change the target branch to `dev` by clicking the _"Edit"_ button at the top of this page.
Note that even after this, the test will continue to show as failing until you push a new commit.

Thanks again for your contribution!
repo-token: ${{ secrets.GITHUB_TOKEN }}
Expand Down
16 changes: 6 additions & 10 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,41 +17,37 @@ jobs:
env:
NXF_VER: ${{ matrix.nxf_ver }}
NXF_ANSI_LOG: false
COSMIC_USERNAME: ${{ secrets.COSMIC_USERNAME }}
COSMIC_PASSWORD: ${{ secrets.COSMIC_PASSWORD }}

strategy:
matrix:
# Nextflow versions: check pipeline minimum and current latest
nxf_ver: ['20.04.0', '']
steps:
- name: Check out pipeline code
uses: actions/checkout@v2

- name: Check if Dockerfile or Conda environment changed
uses: technote-space/get-diff-action@v4
with:
FILES: |
Dockerfile
environment.yml

- name: Build new docker image
if: env.MATCHED_FILES
run: docker build --no-cache . -t nfcore/pgdb:dev

run: docker build --no-cache . -t nfcore/pgdb:1.0.0
- name: Pull docker image
if: ${{ !env.MATCHED_FILES }}
run: |
docker pull nfcore/pgdb:dev
docker tag nfcore/pgdb:dev nfcore/pgdb:dev

docker tag nfcore/pgdb:dev nfcore/pgdb:1.0.0
- name: Install Nextflow
env:
CAPSULE_LOG: none
run: |
wget -qO- get.nextflow.io | bash
sudo mv nextflow /usr/local/bin/

- name: Run pipeline with test data
# TODO nf-core: You can customise CI pipeline run tests as required
# For example: adding multiple test runs with different parameters
# Remember that you can parallelise this by using strategy.matrix
run: |
nextflow run ${GITHUB_WORKSPACE} -profile test,docker
run: nextflow run ${GITHUB_WORKSPACE} -profile test,docker
59 changes: 57 additions & 2 deletions .github/workflows/linting.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,34 @@ jobs:
run: npm install -g markdownlint-cli
- name: Run Markdownlint
run: markdownlint ${GITHUB_WORKSPACE} -c ${GITHUB_WORKSPACE}/.github/markdownlint.yml

# If the above check failed, post a comment on the PR explaining the failure
- name: Post PR comment
if: failure()
uses: mshick/add-pr-comment@v1
with:
message: |
## Markdown linting is failing

To keep the code consistent with lots of contributors, we run automated code consistency checks.
To fix this CI test, please run:

* Install `markdownlint-cli`
* On Mac: `brew install markdownlint-cli`
* Everything else: [Install `npm`](https://www.npmjs.com/get-npm) then [install `markdownlint-cli`](https://www.npmjs.com/package/markdownlint-cli) (`npm install -g markdownlint-cli`)
* Fix the markdown errors
* Automatically: `markdownlint . --config .github/markdownlint.yml --fix`
* Manually resolve anything left from `markdownlint . --config .github/markdownlint.yml`

Once you push these changes the test should pass, and you can hide this comment :+1:

We highly recommend setting up markdownlint in your code editor so that this formatting is done automatically on save. Ask about it on Slack for help!

Thanks again for your contribution!
repo-token: ${{ secrets.GITHUB_TOKEN }}
allow-repeats: false


YAML:
runs-on: ubuntu-latest
steps:
Expand All @@ -29,7 +57,34 @@ jobs:
- name: Install yaml-lint
run: npm install -g yaml-lint
- name: Run yaml-lint
run: yamllint $(find ${GITHUB_WORKSPACE} -type f -name "*.yml")
run: yamllint $(find ${GITHUB_WORKSPACE} -type f -name "*.yml" -o -name "*.yaml")

# If the above check failed, post a comment on the PR explaining the failure
- name: Post PR comment
if: failure()
uses: mshick/add-pr-comment@v1
with:
message: |
## YAML linting is failing

To keep the code consistent with lots of contributors, we run automated code consistency checks.
To fix this CI test, please run:

* Install `yaml-lint`
* [Install `npm`](https://www.npmjs.com/get-npm) then [install `yaml-lint`](https://www.npmjs.com/package/yaml-lint) (`npm install -g yaml-lint`)
* Fix the markdown errors
* Run the test locally: `yamllint $(find . -type f -name "*.yml" -o -name "*.yaml")`
* Fix any reported errors in your YAML files

Once you push these changes the test should pass, and you can hide this comment :+1:

We highly recommend setting up yaml-lint in your code editor so that this formatting is done automatically on save. Ask about it on Slack for help!

Thanks again for your contribution!
repo-token: ${{ secrets.GITHUB_TOKEN }}
allow-repeats: false


nf-core:
runs-on: ubuntu-latest
steps:
Expand Down Expand Up @@ -69,7 +124,7 @@ jobs:
if: ${{ always() }}
uses: actions/upload-artifact@v2
with:
name: linting-log-file
name: linting-logs
path: |
lint_log.txt
lint_results.md
Expand Down
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -7,3 +7,5 @@ tests/
testing/
testing*
*.pyc

.idea/
13 changes: 12 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,23 @@
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

## v1.0dev - [date]
## 1.0.0

Initial release of nf-core/pgdb, created with the [nf-core](https://nf-co.re/) template.

### `Added`

The initial version of the pipeline features the following steps:

- (optional) ENSEMBL Reference proteomes included in final proteome
- Convert a Variant genome database like COSMIC or CBioPortal to proteomes
- Convert provided VCF to proteome database
- (optional) Generate the decoy database and attach it to the final proteome

### `Known issues`

If you experience nextflow running forever after a failed step, try settings errorStrategy = terminate. See the corresponding [nextflow issue](https://github.com/nextflow-io/nextflow/issues/1457).

### `Fixed`

### `Dependencies`
Expand Down
34 changes: 34 additions & 0 deletions CITATIONS.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
# nf-core/pgdb: Citations

## Pipeline tools

* [Nextflow](https://www.ncbi.nlm.nih.gov/pubmed/28398311/)
> Di Tommaso P, Chatzou M, Floden EW, Barja PP, Palumbo E, Notredame C. Nextflow enables reproducible computational workflows. Nat Biotechnol. 2017 Apr 11;35(4):316-319. doi: 10.1038/nbt.3820. PubMed PMID: 28398311.

* [pypgatk](https://zenodo.org/record/4651319)
> Yasset Perez-Riverol, & Husen M. Umer. (2021, March 31). py-pgatk: Pre-release v0.0.19 (Version v0.0.19). Zenodo.

## Data sources

* [ENSEMBL](https://pubmed.ncbi.nlm.nih.gov/31691826/)
> Yates, A. D., Achuthan, P., Akanni, W., Allen, J., Allen, J., Alvarez-Jarreta, J., ... & Flicek, P. (2020). Ensembl 2020. Nucleic acids research, 48(D1), D682-D688.

* [COSMIC](https://pubmed.ncbi.nlm.nih.gov/15188009/)
> Bamford, S., Dawson, E., Forbes, S., Clements, J., Pettett, R., Dogan, A., ... & Wooster, R. (2004). The COSMIC (Catalogue of Somatic Mutations in Cancer) database and website. British journal of cancer, 91(2), 355-358.

* [cBioPortal](https://pubmed.ncbi.nlm.nih.gov/23550210/)
> Gao, J., Aksoy, B. A., Dogrusoz, U., Dresdner, G., Gross, B., Sumer, S. O., ... & Schultz, N. (2013). Integrative analysis of complex cancer genomics and clinical profiles using the cBioPortal. Science signaling, 6(269), pl1-pl1.

## Software packaging/containerisation tools

* [BioContainers](https://www.ncbi.nlm.nih.gov/pubmed/28379341/)
> da Veiga Leprevost F, Grüning BA, Alves Aflitos S, Röst HL, Uszkoreit J, Barsnes H, Vaudel M, Moreno P, Gatto L, Weber J, Bai M, Jimenez RC, Sachsenberg T, Pfeuffer J, Vera Alvarez R, Griss J, Nesvizhskii AI, Perez-Riverol Y. BioContainers: an open-source and community-driven framework for software standardization. Bioinformatics. 2017 Aug 15;33(16):2580-2582. doi: 10.1093/bioinformatics/btx192. PubMed PMID: 28379341.

* [Singularity](https://www.ncbi.nlm.nih.gov/pubmed/28494014/)
> Kurtzer GM, Sochat V, Bauer MW. Singularity: Scientific containers for mobility of compute. PLoS One. 2017 May 11;12(5):e0177459. doi: 10.1371/journal.pone.0177459. eCollection 2017. PubMed PMID: 28494014; PubMed Central PMCID: PMC5426675.

* [Conda](https://www.ncbi.nlm.nih.gov/pubmed/29967506/)
> Grüning B., Dale R., Sjödin A., Chapman BA., Rowe J., Tomkins-Tinch CH., Valieris R., Köster J., Bioconda Team (2018). Bioconda: sustainable and comprehensive software distribution for the life sciences. Nature methods, 15(7), 475–476. doi: 10.1038/s41592-018-0046-7. PubMed PMID: 29967506.

* [Docker](https://www.docker.com/)
> Merkel D. (2014). Docker: lightweight Linux containers for consistent development and deployment. Linux journal, 2014(239), 2.
Loading