Skip to content

Commit 076c823

Browse files
pditommasopditommaso
committed
Remove Spack from Wave (2nd)
Signed-off-by: Paolo Di Tommaso <[email protected]>
1 parent 29c0cde commit 076c823

File tree

6 files changed

+10
-31
lines changed

6 files changed

+10
-31
lines changed

‎plugins/nf-wave/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,8 @@ dependencies {
3737
api 'org.apache.commons:commons-lang3:3.12.0'
3838
api 'com.google.code.gson:gson:2.10.1'
3939
api 'org.yaml:snakeyaml:2.2'
40-
api 'io.seqera:wave-api:0.14.0'
41-
api 'io.seqera:wave-utils:0.15.0'
40+
api 'io.seqera:wave-api:0.15.1'
41+
api 'io.seqera:wave-utils:0.15.1'
4242

4343
testImplementation(testFixtures(project(":nextflow")))
4444
testImplementation "org.apache.groovy:groovy:4.0.26"

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

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -77,12 +77,6 @@ class SubmitContainerTokenRequest {
7777
@Deprecated
7878
String condaFile
7979

80-
/**
81-
* Spack recipe file used to build the container
82-
*/
83-
@Deprecated
84-
String spackFile
85-
8680
/**
8781
* The request container platform
8882
*/

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ import nextflow.util.Duration
3535
@CompileStatic
3636
class WaveConfig {
3737
final private static String DEF_ENDPOINT = 'https://wave.seqera.io'
38-
final private static List<String> DEF_STRATEGIES = List.of('container','dockerfile','conda', 'spack')
38+
final private static List<String> DEF_STRATEGIES = List.of('container','dockerfile','conda')
3939
final private Boolean enabled
4040
final private String endpoint
4141
final private List<URL> containerConfigUrl

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ class WaveContainerResolver implements ContainerResolver {
131131
* An instance of {@link TaskRun} task representing the current task
132132
* @param container
133133
* The container image name specified by the task. Can be {@code null} if the task
134-
* provides a Dockerfile or a Conda recipe or a Spack recipe
134+
* provides a Dockerfile or a Conda recipe
135135
* @return
136136
* The container image name returned by the Wave backend or {@code null}
137137
* when the task does not request any container or dockerfile to build

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

Lines changed: 3 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -204,7 +204,6 @@ class WaveClientTest extends Specification {
204204
!req.containerPlatform
205205
!req.containerFile
206206
!req.condaFile
207-
!req.spackFile
208207
!req.containerConfig.layers
209208
!req.freeze
210209
!req.dryRun
@@ -226,7 +225,6 @@ class WaveClientTest extends Specification {
226225
!req.containerPlatform
227226
!req.containerFile
228227
!req.condaFile
229-
!req.spackFile
230228
!req.containerConfig.layers
231229
!req.mirror
232230
and:
@@ -249,7 +247,6 @@ class WaveClientTest extends Specification {
249247
!req.containerPlatform
250248
!req.containerFile
251249
!req.condaFile
252-
!req.spackFile
253250
!req.containerConfig.layers
254251
!req.freeze
255252
and:
@@ -273,7 +270,6 @@ class WaveClientTest extends Specification {
273270
!req.containerPlatform
274271
!req.containerFile
275272
!req.condaFile
276-
!req.spackFile
277273
!req.containerConfig.layers
278274
and:
279275
req.scanMode == ScanMode.required
@@ -297,7 +293,6 @@ class WaveClientTest extends Specification {
297293
!req.containerPlatform
298294
!req.containerFile
299295
!req.condaFile
300-
!req.spackFile
301296
!req.containerConfig.layers
302297
and:
303298
req.dryRun
@@ -324,7 +319,6 @@ class WaveClientTest extends Specification {
324319
and:
325320
!req.containerFile
326321
!req.condaFile
327-
!req.spackFile
328322
!req.containerConfig.layers
329323
and:
330324
req.fingerprint == 'd31044e6594126479585c0cdca15c15e'
@@ -343,7 +337,6 @@ class WaveClientTest extends Specification {
343337
!req.containerImage
344338
new String(req.containerFile.decodeBase64()) == DOCKERFILE
345339
!req.condaFile
346-
!req.spackFile
347340
!req.containerConfig.layers
348341
}
349342

@@ -367,7 +360,6 @@ class WaveClientTest extends Specification {
367360
!req.containerImage
368361
new String(req.containerFile.decodeBase64()) == SINGULARITY_FILE
369362
!req.condaFile
370-
!req.spackFile
371363
!req.containerConfig.layers
372364
and:
373365
req.format == 'sif'
@@ -387,7 +379,6 @@ class WaveClientTest extends Specification {
387379
!req.containerImage
388380
new String(req.containerFile.decodeBase64()) == DOCKERFILE
389381
!req.condaFile
390-
!req.spackFile
391382
!req.containerConfig.layers
392383
}
393384

@@ -763,10 +754,6 @@ class WaveClientTest extends Specification {
763754
then:
764755
result == [dockerfile:'x']
765756

766-
when:
767-
result = client.resolveConflicts([spack:'x',container:'z'], ['conda','spack'])
768-
then:
769-
result == [spack:'x']
770757
}
771758

772759
def 'should patch strategy for singularity' () {
@@ -780,10 +767,9 @@ class WaveClientTest extends Specification {
780767

781768
where:
782769
STRATEGY | SING | EXPECTED
783-
['conda','dockerfile', 'spack'] | false | ['conda','dockerfile', 'spack']
784-
['conda','dockerfile', 'spack'] | true | ['conda','singularityfile', 'spack']
785-
['conda','dockerfile', 'spack'] | true | ['conda','singularityfile', 'spack']
786-
['conda','singularityfile','dockerfile', 'spack'] | true | ['conda','singularityfile','dockerfile', 'spack']
770+
['conda','dockerfile'] | false | ['conda','dockerfile']
771+
['conda','dockerfile'] | true | ['conda','singularityfile']
772+
['conda','singularityfile','dockerfile'] | true | ['conda','singularityfile','dockerfile']
787773
}
788774

789775
def 'should check conflicts' () {

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

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ class WaveConfigTest extends Specification {
118118
when:
119119
def opts = new WaveConfig([:])
120120
then:
121-
opts.strategy() == ['container','dockerfile','conda','spack']
121+
opts.strategy() == ['container','dockerfile','conda']
122122

123123
when:
124124
opts = new WaveConfig([strategy:STRATEGY])
@@ -127,13 +127,12 @@ class WaveConfigTest extends Specification {
127127

128128
where:
129129
STRATEGY | EXPECTED
130-
null | ['container','dockerfile','conda','spack']
130+
null | ['container','dockerfile','conda']
131131
'dockerfile' | ['dockerfile']
132132
'conda,container' | ['conda','container']
133133
'conda , container' | ['conda','container']
134134
['conda','container'] | ['conda','container']
135135
[' conda',' container'] | ['conda','container']
136-
'spack' | ['spack']
137136
}
138137

139138
def 'should fail to set strategy' () {
@@ -186,7 +185,7 @@ class WaveConfigTest extends Specification {
186185
given:
187186
def config = new WaveConfig([enabled: true])
188187
expect:
189-
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)'
188+
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)'
190189
}
191190

192191
def 'should not allow invalid setting' () {

0 commit comments

Comments
 (0)