Skip to content

Commit a5411fa

Browse files
authored
Merge pull request #3826 from mirpedrol/update-template-modules
update pipeline template subworkflows
2 parents 15f5bfb + 09f3ac4 commit a5411fa

File tree

5 files changed

+7
-10
lines changed

5 files changed

+7
-10
lines changed

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
- Template: Update nextflow.config to use environment variable for `hook_url` ([#3756](https://github.com/nf-core/tools/pull/3756))
1616
- Update nf-test to 0.9.3 ([#3781](https://github.com/nf-core/tools/pull/3781))
1717
- update release checklist to battle test pipeline template more ([#3788](https://github.com/nf-core/tools/pull/3788))
18+
- update pipeline template subworkflows ([#3826](https://github.com/nf-core/tools/pull/3826))
1819
- fix AWS tests launch action ([#3827](https://github.com/nf-core/tools/pull/3827))
1920

2021
### Linting

nf_core/pipeline-template/modules.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,12 @@
2323
"nf-core": {
2424
"utils_nextflow_pipeline": {
2525
"branch": "master",
26-
"git_sha": "c2b22d85f30a706a3073387f30380704fcae013b",
26+
"git_sha": "05954dab2ff481bcb999f24455da29a5828af08d",
2727
"installed_by": ["subworkflows"]
2828
},
2929
"utils_nfcore_pipeline": {
3030
"branch": "master",
31-
"git_sha": "51ae5406a030d4da1e49e4dab49756844fdd6c7a",
31+
"git_sha": "05954dab2ff481bcb999f24455da29a5828af08d",
3232
"installed_by": ["subworkflows"]
3333
}{% if nf_schema %},
3434
"utils_nfschema_plugin": {

nf_core/pipeline-template/subworkflows/nf-core/utils_nextflow_pipeline/tests/tags.yml

Lines changed: 0 additions & 2 deletions
This file was deleted.

nf_core/pipeline-template/subworkflows/nf-core/utils_nfcore_pipeline/tests/tags.yml

Lines changed: 0 additions & 2 deletions
This file was deleted.

tests/test_utils.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -98,12 +98,12 @@ def test_list_files_no_git(self, tmpdir):
9898
files = pipeline_obj.list_files()
9999
assert tmp_fn in files
100100

101-
@mock.patch("os.path.exists")
102-
@mock.patch("os.makedirs")
103-
def test_request_cant_create_cache(self, mock_mkd, mock_exists):
101+
@mock.patch("pathlib.Path.mkdir")
102+
@mock.patch("pathlib.Path.exists")
103+
def test_request_cant_create_cache(self, mock_exists, mock_mkdir):
104104
"""Test that we don't get an error when we can't create cachedirs"""
105-
mock_mkd.side_effect = PermissionError()
106105
mock_exists.return_value = False
106+
mock_mkdir.side_effect = PermissionError()
107107
nf_core.utils.setup_requests_cachedir()
108108

109109
def test_pip_package_pass(self):

0 commit comments

Comments
 (0)