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

Linting: Remove 'defaults' from conda environment.yml file. #3029

Merged
merged 6 commits into from
Aug 23, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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 CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@

- Fix linting fail on nfcore_external_java_deps if nf_schema is used ([#2976](https://github.com/nf-core/tools/pull/2976))
- Conda module linting: Include package name in log file ([#3014](https://github.com/nf-core/tools/pull/3014))
- Remove defaults from conda `environment.yml` file. ([#3029](https://github.com/nf-core/tools/pull/3029))
- Restructure pipeline tests and move pipeline linting into subfolder ([#3070](https://github.com/nf-core/tools/pull/3070))
- Fix module linting warning for process_high_memory ([#3086](https://github.com/nf-core/tools/issues/3086))

Expand Down
1 change: 0 additions & 1 deletion nf_core/module-template/environment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,5 @@ name: "{{ component_name_underscore }}"
channels:
- conda-forge
- bioconda
- defaults
dependencies:
- "{{ bioconda if bioconda else 'YOUR-TOOL-HERE' }}"
2 changes: 1 addition & 1 deletion nf_core/pipeline-template/modules.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
"nf-core": {
"utils_nextflow_pipeline": {
"branch": "master",
"git_sha": "5caf7640a9ef1d18d765d55339be751bb0969dfa",
"git_sha": "20c03aede5a80ff520a905cea1f8ca121b5bb661",
"installed_by": ["subworkflows"]
},
"utils_nfcore_pipeline": {
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion nf_core/pipeline-template/nextflow.config
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ profiles {
podman.enabled = false
shifter.enabled = false
charliecloud.enabled = false
conda.channels = ['conda-forge', 'bioconda', 'defaults']
conda.channels = ['conda-forge', 'bioconda']
apptainer.enabled = false
}
mamba {
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion nf_core/utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -654,7 +654,7 @@ def anaconda_package(dep, dep_channels=None):
"""

if dep_channels is None:
dep_channels = ["conda-forge", "bioconda", "defaults"]
dep_channels = ["conda-forge", "bioconda"]

# Check if each dependency is the latest available version
if "=" in dep:
Expand Down
2 changes: 1 addition & 1 deletion tests/test_utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ def testload_pipeline_config(self):
# def test_load_conda_env(self):
# """Load the pipeline Conda environment.yml file"""
# self.pipeline_obj._load_conda_environment()
# assert self.pipeline_obj.conda_config["channels"] == ["conda-forge", "bioconda", "defaults"]
# assert self.pipeline_obj.conda_config["channels"] == ["conda-forge", "bioconda"]

def test_list_files_git(self):
"""Test listing pipeline files using `git ls`"""
Expand Down
Loading