Skip to content

Commit d7b1289

Browse files
authored
Remove seqera from default Conda channels (#67)
Signed-off-by: Paolo Di Tommaso <[email protected]>
1 parent ae79c6f commit d7b1289

File tree

5 files changed

+6
-7
lines changed

5 files changed

+6
-7
lines changed

README.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,6 @@ docker run $container sh -c 'bamtools --version && samtools --version'
117117
cat << EOF > ./conda.yaml
118118
name: my-conda
119119
channels:
120-
- defaults
121120
- bioconda
122121
- conda-forge
123122
dependencies:

app/src/main/java/io/seqera/wave/cli/App.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@ public class App implements Runnable {
158158
private List<String> condaRunCommands;
159159

160160
@Option(names = {"--conda-channels"}, paramLabel = "''", description = "Conda channels used to build the container (default: ${DEFAULT-VALUE}).")
161-
private String condaChannels = "seqera,conda-forge,bioconda,defaults";
161+
private String condaChannels = "conda-forge,bioconda";
162162

163163
@Option(names = {"--spack-file"}, paramLabel = "''", description = "A Spack file used to build the container e.g. /some/path/spack.yaml.")
164164
private String spackFile;

app/src/main/java/io/seqera/wave/cli/util/GptHelper.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ static protected PackagesSpec jsonToPackageSpec(String json) {
117117
throw new IllegalArgumentException("Unable to resolve packages from json response: " + json);
118118
List<String> channels = (List<String>) object.get("channels");
119119
if( Checkers.isEmpty(channels) )
120-
channels = List.of("bioconda","conda-forge","defaults");
120+
channels = List.of("bioconda","conda-forge");
121121
return new PackagesSpec()
122122
.withType(PackagesSpec.Type.CONDA)
123123
.withEntries(packages)

app/src/test/groovy/io/seqera/wave/cli/AppCondaOptsTest.groovy

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ class AppCondaOptsTest extends Specification {
141141
'''.stripIndent(true)
142142
and:
143143
req.packages.condaOpts == new CondaOpts(mambaImage: CondaOpts.DEFAULT_MAMBA_IMAGE, basePackages: CondaOpts.DEFAULT_PACKAGES)
144-
req.packages.channels == ['seqera', 'conda-forge', 'bioconda', 'defaults']
144+
req.packages.channels == ['conda-forge', 'bioconda']
145145
and:
146146
!req.packages.entries
147147
and:
@@ -166,7 +166,7 @@ class AppCondaOptsTest extends Specification {
166166
req.packages.entries == ['foo']
167167
and:
168168
req.packages.condaOpts == new CondaOpts(mambaImage: CondaOpts.DEFAULT_MAMBA_IMAGE, basePackages: CondaOpts.DEFAULT_PACKAGES)
169-
req.packages.channels == ['seqera', 'conda-forge', 'bioconda', 'defaults']
169+
req.packages.channels == ['conda-forge', 'bioconda']
170170
and:
171171
!req.packages.environment
172172
and:
@@ -187,7 +187,7 @@ class AppCondaOptsTest extends Specification {
187187
req.packages.entries == ['https://host.com/file-lock.yml']
188188
and:
189189
req.packages.condaOpts == new CondaOpts(mambaImage: CondaOpts.DEFAULT_MAMBA_IMAGE, basePackages: CondaOpts.DEFAULT_PACKAGES)
190-
req.packages.channels == ['seqera', 'conda-forge', 'bioconda', 'defaults']
190+
req.packages.channels == ['conda-forge', 'bioconda']
191191
and:
192192
!req.packages.environment
193193
and:

app/src/test/groovy/io/seqera/wave/cli/util/GptHelperTest.groovy

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,6 @@ class GptHelperTest extends Specification {
4545
when:
4646
def spec = GptHelper.grabPackages("Give me a container image for multiqc 1.15")
4747
then:
48-
spec == new PackagesSpec(type: PackagesSpec.Type.CONDA, entries: ['multiqc=1.15'], channels: ['bioconda','conda-forge','defaults'])
48+
spec == new PackagesSpec(type: PackagesSpec.Type.CONDA, entries: ['multiqc=1.15'], channels: ['bioconda','conda-forge'])
4949
}
5050
}

0 commit comments

Comments
 (0)