Thanks to visit codestin.com
Credit goes to github.com

Skip to content

update gitlab branches #2060

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.

Sign up for GitHub

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

Merged
mashehu merged 1 commit into from
Nov 25, 2022
Merged

update gitlab branches #2060

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion .github/workflows/create-lint-wf.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ jobs:
run: nf-core --log-file log.txt modules install fastqc --dir nf-core-testpipeline/ --force

- name: nf-core modules install gitlab
run: nf-core --log-file log.txt modules --git-remote https://gitlab.com/nf-core/modules-test.git --branch main-restructure install fastqc --force --dir nf-core-testpipeline/
run: nf-core --log-file log.txt modules --git-remote https://gitlab.com/nf-core/modules-test.git --branch main install fastqc --force --dir nf-core-testpipeline/

- name: nf-core modules list local
run: nf-core --log-file log.txt modules list local --dir nf-core-testpipeline/
Expand Down
2 changes: 1 addition & 1 deletion tests/modules/patch.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
FAIL_SHA = "1fc8b0f953d915d66ee40d28bc337ff0998d05bd"
BISMARK_ALIGN = "bismark/align"
REPO_NAME = "nf-core"
PATCH_BRANCH = "patch-tester-restructure"
PATCH_BRANCH = "patch-tester"
REPO_URL = "https://gitlab.com/nf-core/modules-test.git"


Expand Down
8 changes: 4 additions & 4 deletions tests/utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,18 +12,18 @@
OLD_TRIMGALORE_BRANCH = "mimic-old-trimgalore"
GITLAB_URL = "https://gitlab.com/nf-core/modules-test.git"
GITLAB_REPO = "nf-core"
GITLAB_DEFAULT_BRANCH = "main-restructure"
GITLAB_DEFAULT_BRANCH = "main"
GITLAB_SUBWORKFLOWS_BRANCH = "subworkflows"
OLD_SUBWORKFLOWS_SHA = "f3c078809a2513f1c95de14f6633fe1f03572fdb"
# Branch test stuff
GITLAB_BRANCH_TEST_BRANCH = "branch-tester-restructure"
GITLAB_BRANCH_TEST_BRANCH = "branch-tester"
GITLAB_BRANCH_TEST_OLD_SHA = "bce3f17980b8d1beae5e917cfd3c65c0c69e04b5"
GITLAB_BRANCH_TEST_NEW_SHA = "2f5f180f6e705bb81d6e7742dc2f24bf4a0c721e"


def with_temporary_folder(func):
"""
Call the decorated funtion under the tempfile.TemporaryDirectory
Call the decorated function under the tempfile.TemporaryDirectory
context manager. Pass the temporary directory name to the decorated
function
"""
Expand All @@ -38,7 +38,7 @@ def wrapper(*args, **kwargs):

def with_temporary_file(func):
"""
Call the decorated funtion under the tempfile.NamedTemporaryFile
Call the decorated function under the tempfile.NamedTemporaryFile
context manager. Pass the opened file handle to the decorated function
"""

Expand Down