Skip to content

Commit

Permalink
Conda remove defaults channel - structural changes (#5847)
Browse files Browse the repository at this point in the history
  • Loading branch information
ewels authored Aug 15, 2024
1 parent be84844 commit fb8761a
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 8 deletions.
1 change: 0 additions & 1 deletion .github/env-template.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
channels:
- conda-forge
- bioconda
- defaults
4 changes: 2 additions & 2 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -452,7 +452,7 @@ jobs:
uses: conda-incubator/setup-miniconda@a4260408e20b96e80095f42ff7f1a15b27dd94ca # v3
with:
miniconda-version: "latest"
channels: conda-forge,bioconda,defaults
channels: conda-forge,bioconda
python-version: ${{ matrix.python-version }}

- name: Conda setup
Expand Down Expand Up @@ -693,7 +693,7 @@ jobs:
with:
miniconda-version: "latest"
auto-update-conda: true
channels: conda-forge,bioconda,defaults
channels: conda-forge,bioconda

- name: Conda setup
run: |
Expand Down
5 changes: 1 addition & 4 deletions modules/environment-schema.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,9 @@
},
{
"enum": ["bioconda"]
},
{
"enum": ["defaults"]
}
],
"minItems": 3
"minItems": 2
},
"dependencies": {
"type": "array",
Expand Down
2 changes: 1 addition & 1 deletion subworkflows/nf-core/utils_nextflow_pipeline/main.nf
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ def checkCondaChannels() {

// Check that all channels are present
// This channel list is ordered by required channel priority.
def required_channels_in_order = ['conda-forge', 'bioconda', 'defaults']
def required_channels_in_order = ['conda-forge', 'bioconda']
def channels_missing = ((required_channels_in_order as Set) - (channels as Set)) as Boolean

// Check that they are in the right order
Expand Down

0 comments on commit fb8761a

Please sign in to comment.