Skip to content

Commit

Permalink
reverts commits 8b199f0 and aceca71
Browse files Browse the repository at this point in the history
  • Loading branch information
BWMac committed Jul 7, 2023
1 parent 8b199f0 commit ca3b8d2
Show file tree
Hide file tree
Showing 5 changed files with 5 additions and 9 deletions.
3 changes: 1 addition & 2 deletions .github/ISSUE_TEMPLATE/bug_report.yml
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,7 @@ body:
* Executor _(eg. slurm, local, awsbatch)_
* Container engine: _(e.g. Docker, Singularity, Conda, Podman, Shifter, Charliecloud,
or Apptainer)_
* Container engine: _(e.g. Docker, Singularity, Conda, Podman, Shifter or Charliecloud)_
* OS _(eg. CentOS Linux, macOS, Linux Mint)_
Expand Down
2 changes: 1 addition & 1 deletion .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 == 'sage-bionetworks-workflows/nf-dcqc'
run: |
{ [[ ${{github.event.pull_request.head.repo.full_name }} == sage-bionetworks-workflows/nf-dcqc ]] && [[ $GITHUB_HEAD_REF == "dev" ]]; } || [[ $GITHUB_HEAD_REF == "patch" ]]
{ [[ ${{github.event.pull_request.head.repo.full_name }} == sage-bionetworks-workflows/nf-dcqc ]] && [[ $GITHUB_HEAD_REF = "dev" ]]; } || [[ $GITHUB_HEAD_REF == "patch" ]]
# If the above check failed, post a comment on the PR explaining the failure
# NOTE - this doesn't currently work if the PR is coming from a fork, due to limitations in GitHub actions secrets
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/linting.yml
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ jobs:

- uses: actions/setup-python@v4
with:
python-version: "3.8"
python-version: "3.7"
architecture: "x64"

- name: Install dependencies
Expand Down
3 changes: 1 addition & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -55,13 +55,12 @@ On release, automated continuous integration tests run the pipeline on a full-si
## Special Considerations for Running `nf-dcqc` on Nextflow Tower

`nf-dcqc` leverages the reports feature when executed on Tower. This is done by pointing Tower to the generated `output.csv` file which is saved to `params.outdir` after a successful run. By default, the `outdir` for the workflow is set to a local directory called `results`. This does not work on Nextflow Tower runs, as you will not have access to the `results` directory once the job has completed. Thus, the `outdir` should be set to an S3 bucket location that the Tower workspace you are using has access to. For example, in the `pipeline parameters` for a Tower run, you can provide YAML such as:

```yaml
outdir: s3://example-project-tower-bucket/dcqc_output
```

From the reports tab within your workflow run, you can view and download the generated `output.csv` file.


## Credits

sage/dcqc was originally written by Bruno Grande <[email protected]>.
Expand Down
4 changes: 1 addition & 3 deletions lib/NfcoreSchema.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
// This file holds several functions used to perform JSON parameter validation, help and summary rendering for the nf-core pipeline template.
//

import nextflow.Nextflow
import org.everit.json.schema.Schema
import org.everit.json.schema.loader.SchemaLoader
import org.everit.json.schema.ValidationException
Expand Down Expand Up @@ -84,7 +83,6 @@ class NfcoreSchema {
'stub-run',
'test',
'w',
'with-apptainer',
'with-charliecloud',
'with-conda',
'with-dag',
Expand Down Expand Up @@ -179,7 +177,7 @@ class NfcoreSchema {
}

if (has_error) {
Nextflow.error('Exiting!')
System.exit(1)
}
}

Expand Down

0 comments on commit ca3b8d2

Please sign in to comment.