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

Remove seqera from default Conda channels #67

Merged
merged 2 commits into from
May 17, 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: 0 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,6 @@ docker run $container sh -c 'bamtools --version && samtools --version'
cat << EOF > ./conda.yaml
name: my-conda
channels:
- defaults
- bioconda
- conda-forge
dependencies:
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/java/io/seqera/wave/cli/App.java
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,7 @@ public class App implements Runnable {
private List<String> condaRunCommands;

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

@Option(names = {"--spack-file"}, paramLabel = "''", description = "A Spack file used to build the container e.g. /some/path/spack.yaml.")
private String spackFile;
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/java/io/seqera/wave/cli/util/GptHelper.java
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ static protected PackagesSpec jsonToPackageSpec(String json) {
throw new IllegalArgumentException("Unable to resolve packages from json response: " + json);
List<String> channels = (List<String>) object.get("channels");
if( Checkers.isEmpty(channels) )
channels = List.of("bioconda","conda-forge","defaults");
channels = List.of("bioconda","conda-forge");
return new PackagesSpec()
.withType(PackagesSpec.Type.CONDA)
.withEntries(packages)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@ class AppCondaOptsTest extends Specification {
'''.stripIndent(true)
and:
req.packages.condaOpts == new CondaOpts(mambaImage: CondaOpts.DEFAULT_MAMBA_IMAGE, basePackages: CondaOpts.DEFAULT_PACKAGES)
req.packages.channels == ['seqera', 'conda-forge', 'bioconda', 'defaults']
req.packages.channels == ['conda-forge', 'bioconda']
and:
!req.packages.entries
and:
Expand All @@ -166,7 +166,7 @@ class AppCondaOptsTest extends Specification {
req.packages.entries == ['foo']
and:
req.packages.condaOpts == new CondaOpts(mambaImage: CondaOpts.DEFAULT_MAMBA_IMAGE, basePackages: CondaOpts.DEFAULT_PACKAGES)
req.packages.channels == ['seqera', 'conda-forge', 'bioconda', 'defaults']
req.packages.channels == ['conda-forge', 'bioconda']
and:
!req.packages.environment
and:
Expand All @@ -187,7 +187,7 @@ class AppCondaOptsTest extends Specification {
req.packages.entries == ['https://host.com/file-lock.yml']
and:
req.packages.condaOpts == new CondaOpts(mambaImage: CondaOpts.DEFAULT_MAMBA_IMAGE, basePackages: CondaOpts.DEFAULT_PACKAGES)
req.packages.channels == ['seqera', 'conda-forge', 'bioconda', 'defaults']
req.packages.channels == ['conda-forge', 'bioconda']
and:
!req.packages.environment
and:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,6 @@ class GptHelperTest extends Specification {
when:
def spec = GptHelper.grabPackages("Give me a container image for multiqc 1.15")
then:
spec == new PackagesSpec(type: PackagesSpec.Type.CONDA, entries: ['multiqc=1.15'], channels: ['bioconda','conda-forge','defaults'])
spec == new PackagesSpec(type: PackagesSpec.Type.CONDA, entries: ['multiqc=1.15'], channels: ['bioconda','conda-forge'])
}
}