Remove Spack from Wave (2nd)

Signed-off-by: Paolo Di Tommaso <[email protected]>

Author: pditommaso

plugins/nf-wave/build.gradle

@@ -37,8 +37,8 @@ dependencies {
     api 'org.apache.commons:commons-lang3:3.12.0'
     api 'com.google.code.gson:gson:2.10.1'
     api 'org.yaml:snakeyaml:2.2'
-    api 'io.seqera:wave-api:0.14.0'
-    api 'io.seqera:wave-utils:0.15.0'
+    api 'io.seqera:wave-api:0.15.1'
+    api 'io.seqera:wave-utils:0.15.1'
 
     testImplementation(testFixtures(project(":nextflow")))
     testImplementation "org.apache.groovy:groovy:4.0.26"

plugins/nf-wave/src/main/io/seqera/wave/plugin/SubmitContainerTokenRequest.groovy

@@ -77,12 +77,6 @@ class SubmitContainerTokenRequest {
     @Deprecated
     String condaFile
 
-    /**
-     * Spack recipe file used to build the container
-     */
-    @Deprecated
-    String spackFile
-
     /**
      * The request container platform
      */

plugins/nf-wave/src/main/io/seqera/wave/plugin/config/WaveConfig.groovy

@@ -35,7 +35,7 @@ import nextflow.util.Duration
 @CompileStatic
 class WaveConfig {
     final private static String DEF_ENDPOINT = 'https://wave.seqera.io'
-    final private static List<String> DEF_STRATEGIES = List.of('container','dockerfile','conda', 'spack')
+    final private static List<String> DEF_STRATEGIES = List.of('container','dockerfile','conda')
     final private Boolean enabled
     final private String endpoint
     final private List<URL> containerConfigUrl

plugins/nf-wave/src/main/io/seqera/wave/plugin/resolver/WaveContainerResolver.groovy

@@ -131,7 +131,7 @@ class WaveContainerResolver implements ContainerResolver {
      *      An instance of {@link TaskRun} task representing the current task
      * @param container
      *      The container image name specified by the task. Can be {@code null} if the task
-     *      provides a Dockerfile or a Conda recipe or a Spack recipe
+     *      provides a Dockerfile or a Conda recipe
      * @return
      *      The container image name returned by the Wave backend or {@code null}
      *      when the task does not request any container or dockerfile to build

plugins/nf-wave/src/test/io/seqera/wave/plugin/WaveClientTest.groovy

@@ -204,7 +204,6 @@ class WaveClientTest extends Specification {
         !req.containerPlatform
         !req.containerFile
         !req.condaFile
-        !req.spackFile
         !req.containerConfig.layers
         !req.freeze
         !req.dryRun
@@ -226,7 +225,6 @@ class WaveClientTest extends Specification {
         !req.containerPlatform
         !req.containerFile
         !req.condaFile
-        !req.spackFile
         !req.containerConfig.layers
         !req.mirror
         and:
@@ -249,7 +247,6 @@ class WaveClientTest extends Specification {
         !req.containerPlatform
         !req.containerFile
         !req.condaFile
-        !req.spackFile
         !req.containerConfig.layers
         !req.freeze
         and:
@@ -273,7 +270,6 @@ class WaveClientTest extends Specification {
         !req.containerPlatform
         !req.containerFile
         !req.condaFile
-        !req.spackFile
         !req.containerConfig.layers
         and:
         req.scanMode == ScanMode.required
@@ -297,7 +293,6 @@ class WaveClientTest extends Specification {
         !req.containerPlatform
         !req.containerFile
         !req.condaFile
-        !req.spackFile
         !req.containerConfig.layers
         and:
         req.dryRun
@@ -324,7 +319,6 @@ class WaveClientTest extends Specification {
         and:
         !req.containerFile
         !req.condaFile
-        !req.spackFile
         !req.containerConfig.layers
         and:
         req.fingerprint == 'd31044e6594126479585c0cdca15c15e'
@@ -343,7 +337,6 @@ class WaveClientTest extends Specification {
         !req.containerImage
         new String(req.containerFile.decodeBase64()) == DOCKERFILE
         !req.condaFile
-        !req.spackFile
         !req.containerConfig.layers
     }
 
@@ -367,7 +360,6 @@ class WaveClientTest extends Specification {
         !req.containerImage
         new String(req.containerFile.decodeBase64()) == SINGULARITY_FILE
         !req.condaFile
-        !req.spackFile
         !req.containerConfig.layers
         and:
         req.format == 'sif'
@@ -387,7 +379,6 @@ class WaveClientTest extends Specification {
         !req.containerImage
         new String(req.containerFile.decodeBase64()) == DOCKERFILE
         !req.condaFile
-        !req.spackFile
         !req.containerConfig.layers
     }
 
@@ -763,10 +754,6 @@ class WaveClientTest extends Specification {
         then:
         result == [dockerfile:'x']
 
-        when:
-        result = client.resolveConflicts([spack:'x',container:'z'], ['conda','spack'])
-        then:
-        result == [spack:'x']
     }
 
     def 'should patch strategy for singularity' () {
@@ -780,10 +767,9 @@ class WaveClientTest extends Specification {
 
         where:
         STRATEGY                                            | SING      | EXPECTED
-        ['conda','dockerfile', 'spack']                     | false     | ['conda','dockerfile', 'spack']
-        ['conda','dockerfile', 'spack']                     | true      | ['conda','singularityfile', 'spack']
-        ['conda','dockerfile', 'spack']                     | true      | ['conda','singularityfile', 'spack']
-        ['conda','singularityfile','dockerfile', 'spack']   | true      | ['conda','singularityfile','dockerfile', 'spack']
+        ['conda','dockerfile']                              | false     | ['conda','dockerfile']
+        ['conda','dockerfile']                              | true      | ['conda','singularityfile']
+        ['conda','singularityfile','dockerfile']            | true      | ['conda','singularityfile','dockerfile']
     }
 
     def 'should check conflicts' () {

plugins/nf-wave/src/test/io/seqera/wave/plugin/config/WaveConfigTest.groovy

@@ -118,7 +118,7 @@ class WaveConfigTest extends Specification {
         when:
         def opts = new WaveConfig([:])
         then:
-        opts.strategy() == ['container','dockerfile','conda','spack']
+        opts.strategy() == ['container','dockerfile','conda']
 
         when:
         opts = new WaveConfig([strategy:STRATEGY])
@@ -127,13 +127,12 @@ class WaveConfigTest extends Specification {
 
         where:
         STRATEGY                | EXPECTED
-        null                    | ['container','dockerfile','conda','spack']
+        null                    | ['container','dockerfile','conda']
         'dockerfile'            | ['dockerfile']
         'conda,container'       | ['conda','container']
         'conda , container'     | ['conda','container']
         ['conda','container']   | ['conda','container']
         [' conda',' container'] | ['conda','container']
-        'spack'                 | ['spack']
     }
 
     def 'should fail to set strategy' () {
@@ -186,7 +185,7 @@ class WaveConfigTest extends Specification {
         given:
         def config = new WaveConfig([enabled: true])
         expect:
-        config.toString() == 'WaveConfig(enabled:true, endpoint:https://wave.seqera.io, containerConfigUrl:[], tokensCacheMaxDuration:30m, condaOpts:CondaOpts(mambaImage=mambaorg/micromamba:1.5.10-noble; basePackages=conda-forge::procps-ng, commands=null), spackOpts:SpackOpts(basePackages=null, commands=null), strategy:[container, dockerfile, conda, spack], bundleProjectResources:null, buildRepository:null, cacheRepository:null, retryOpts:RetryOpts(delay:450ms, maxDelay:1m 30s, maxAttempts:10, jitter:0.25), httpClientOpts:HttpOpts(), freezeMode:null, preserveFileTimestamp:null, buildMaxDuration:40m, mirrorMode:null, scanMode:null, scanAllowedLevels:null)'
+        config.toString() == 'WaveConfig(enabled:true, endpoint:https://wave.seqera.io, containerConfigUrl:[], tokensCacheMaxDuration:30m, condaOpts:CondaOpts(mambaImage=mambaorg/micromamba:1.5.10-noble; basePackages=conda-forge::procps-ng, commands=null), strategy:[container, dockerfile, conda], bundleProjectResources:null, buildRepository:null, cacheRepository:null, retryOpts:RetryOpts(delay:450ms, maxDelay:1m 30s, maxAttempts:10, jitter:0.25), httpClientOpts:HttpOpts(), freezeMode:null, preserveFileTimestamp:null, buildMaxDuration:40m, mirrorMode:null, scanMode:null, scanAllowedLevels:null)'
     }
 
     def 'should not allow invalid setting' () {