Skip to content

Commit

Permalink
Bump micromamba-1.5.9
Browse files Browse the repository at this point in the history 
Signed-off-by: Paolo Di Tommaso <[email protected]>
  • Loading branch information
@pditommaso
pditommaso committed Sep 6, 2024
1 parent 6b89e0d commit 4e85786
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 12 deletions.
2 changes: 1 addition & 1 deletion wave-api/src/main/java/io/seqera/wave/config/CondaOpts.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
* @author Paolo Di Tommaso <[email protected]>
*/
public class CondaOpts {
final public static String DEFAULT_MAMBA_IMAGE = "mambaorg/micromamba:1.5.8-lunar";
final public static String DEFAULT_MAMBA_IMAGE = "mambaorg/micromamba:1.5.9-lunar";
final public static String DEFAULT_PACKAGES = "conda-forge::procps-ng";

public String mambaImage;
Expand Down
2 changes: 1 addition & 1 deletion wave-api/src/test/groovy/io/seqera/wave/config/CondaOptsTest.groovy
View file
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ class CondaOptsTest extends Specification {
new CondaOpts(OPTS).toString() == EXPECTED
where:
OPTS | EXPECTED
[:] | "CondaOpts(mambaImage=mambaorg/micromamba:1.5.8-lunar; basePackages=conda-forge::procps-ng, commands=null)"
[:] | "CondaOpts(mambaImage=mambaorg/micromamba:1.5.9-lunar; basePackages=conda-forge::procps-ng, commands=null)"
[mambaImage: 'foo:1.0', basePackages: 'this that', commands: ['X','Y']] \
| "CondaOpts(mambaImage=foo:1.0; basePackages=this that, commands=X,Y)"
}
Expand Down
20 changes: 10 additions & 10 deletions wave-utils/src/test/groovy/io/seqera/wave/util/DockerHelperTest.groovy
View file
Original file line number Diff line number Diff line change
Expand Up @@ -370,7 +370,7 @@ class DockerHelperTest extends Specification {

expect:
DockerHelper.condaFileToDockerFile(CONDA_OPTS)== '''\
FROM mambaorg/micromamba:1.5.8-lunar
FROM mambaorg/micromamba:1.5.9-lunar
COPY --chown=$MAMBA_USER:$MAMBA_USER conda.yml /tmp/conda.yml
RUN micromamba install -y -n base -f /tmp/conda.yml \\
&& micromamba install -y -n base foo::bar \\
Expand All @@ -384,7 +384,7 @@ class DockerHelperTest extends Specification {

expect:
DockerHelper.condaFileToDockerFile(new CondaOpts([:]))== '''\
FROM mambaorg/micromamba:1.5.8-lunar
FROM mambaorg/micromamba:1.5.9-lunar
COPY --chown=$MAMBA_USER:$MAMBA_USER conda.yml /tmp/conda.yml
RUN micromamba install -y -n base -f /tmp/conda.yml \\
&& micromamba install -y -n base conda-forge::procps-ng \\
Expand All @@ -401,7 +401,7 @@ class DockerHelperTest extends Specification {
def CHANNELS = ['conda-forge', 'defaults']
expect:
DockerHelper.condaPackagesToDockerFile(PACKAGES, CHANNELS, new CondaOpts([:])) == '''\
FROM mambaorg/micromamba:1.5.8-lunar
FROM mambaorg/micromamba:1.5.9-lunar
RUN \\
micromamba install -y -n base -c conda-forge -c defaults bwa=0.7.15 salmon=1.1.1 \\
&& micromamba install -y -n base conda-forge::procps-ng \\
Expand All @@ -419,7 +419,7 @@ class DockerHelperTest extends Specification {

expect:
DockerHelper.condaPackagesToDockerFile(PACKAGES, CHANNELS, CONDA_OPTS) == '''\
FROM mambaorg/micromamba:1.5.8-lunar
FROM mambaorg/micromamba:1.5.9-lunar
RUN \\
micromamba install -y -n base -c conda-forge -c defaults bwa=0.7.15 salmon=1.1.1 \\
&& micromamba install -y -n base foo::one bar::two \\
Expand All @@ -436,7 +436,7 @@ class DockerHelperTest extends Specification {

expect:
DockerHelper.condaPackagesToDockerFile(PACKAGES, CHANNELS, new CondaOpts([:])) == '''\
FROM mambaorg/micromamba:1.5.8-lunar
FROM mambaorg/micromamba:1.5.9-lunar
RUN \\
micromamba install -y -n base -c foo -c bar bwa=0.7.15 salmon=1.1.1 \\
&& micromamba install -y -n base conda-forge::procps-ng \\
Expand Down Expand Up @@ -792,7 +792,7 @@ class DockerHelperTest extends Specification {
expect:
DockerHelper.condaFileToSingularityFile(CONDA_OPTS)== '''\
BootStrap: docker
From: mambaorg/micromamba:1.5.8-lunar
From: mambaorg/micromamba:1.5.9-lunar
%files
{{wave_context_dir}}/conda.yml /scratch/conda.yml
%post
Expand All @@ -809,7 +809,7 @@ class DockerHelperTest extends Specification {
expect:
DockerHelper.condaFileToSingularityFile(new CondaOpts([:]))== '''\
BootStrap: docker
From: mambaorg/micromamba:1.5.8-lunar
From: mambaorg/micromamba:1.5.9-lunar
%files
{{wave_context_dir}}/conda.yml /scratch/conda.yml
%post
Expand All @@ -829,7 +829,7 @@ class DockerHelperTest extends Specification {
expect:
DockerHelper.condaPackagesToSingularityFile(PACKAGES, CHANNELS, new CondaOpts([:])) == '''\
BootStrap: docker
From: mambaorg/micromamba:1.5.8-lunar
From: mambaorg/micromamba:1.5.9-lunar
%post
micromamba install -y -n base -c conda-forge -c defaults bwa=0.7.15 salmon=1.1.1
micromamba install -y -n base conda-forge::procps-ng
Expand All @@ -848,7 +848,7 @@ class DockerHelperTest extends Specification {
expect:
DockerHelper.condaPackagesToSingularityFile(PACKAGES, CHANNELS, CONDA_OPTS) == '''\
BootStrap: docker
From: mambaorg/micromamba:1.5.8-lunar
From: mambaorg/micromamba:1.5.9-lunar
%post
micromamba install -y -n base -c conda-forge -c defaults bwa=0.7.15 salmon=1.1.1
micromamba install -y -n base foo::one bar::two
Expand All @@ -866,7 +866,7 @@ class DockerHelperTest extends Specification {
expect:
DockerHelper.condaPackagesToSingularityFile(PACKAGES, CHANNELS, new CondaOpts([:])) == '''\
BootStrap: docker
From: mambaorg/micromamba:1.5.8-lunar
From: mambaorg/micromamba:1.5.9-lunar
%post
micromamba install -y -n base -c foo -c bar bwa=0.7.15 salmon=1.1.1
micromamba install -y -n base conda-forge::procps-ng
Expand Down

0 comments on commit 4e85786

Please sign in to comment.