Skip to content

Commit 9fc44f7

Browse files
authored
Remove obsolete conda create --mkdir option (#6010) [ci fast]
Signed-off-by: Nathan Weeks <1800812+nathanweeks@users.noreply.github.com>
1 parent 10b5578 commit 9fc44f7

File tree

2 files changed

+6
-9
lines changed

2 files changed

+6
-9
lines changed

modules/nextflow/src/main/groovy/nextflow/conda/CondaCache.groovy

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -287,9 +287,6 @@ class CondaCache {
287287
log.info "Creating env using ${binaryName}: $condaEnv [cache $prefixPath]"
288288

289289
String opts = createOptions ? "$createOptions " : ''
290-
// micromamba does not and might never support the mkdir flag, since the mkdir behaviour is the default
291-
if( binaryName != 'micromamba' )
292-
opts += '--mkdir '
293290

294291
def cmd
295292
if( isYamlFilePath(condaEnv) ) {

modules/nextflow/src/test/groovy/nextflow/conda/CondaCacheTest.groovy

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -209,7 +209,7 @@ class CondaCacheTest extends Specification {
209209
then:
210210
1 * cache.isYamlFilePath(ENV)
211211
0 * cache.makeAbsolute(_)
212-
1 * cache.runCommand( "conda create --mkdir --yes --quiet --prefix $PREFIX $ENV" ) >> null
212+
1 * cache.runCommand( "conda create --yes --quiet --prefix $PREFIX $ENV" ) >> null
213213
result == PREFIX
214214

215215
}
@@ -235,7 +235,7 @@ class CondaCacheTest extends Specification {
235235
then:
236236
1 * cache.isYamlFilePath(ENV)
237237
0 * cache.makeAbsolute(_)
238-
1 * cache.runCommand("mamba create --mkdir --yes --quiet --prefix $PREFIX $ENV") >> null
238+
1 * cache.runCommand("mamba create --yes --quiet --prefix $PREFIX $ENV") >> null
239239
result == PREFIX
240240

241241
}
@@ -330,7 +330,7 @@ class CondaCacheTest extends Specification {
330330
1 * cache.isYamlFilePath(ENV)
331331
1 * cache.isTextFilePath(ENV)
332332
0 * cache.makeAbsolute(_)
333-
1 * cache.runCommand( "conda create --this --that --mkdir --yes --quiet --prefix $PREFIX $ENV" ) >> null
333+
1 * cache.runCommand( "conda create --this --that --yes --quiet --prefix $PREFIX $ENV" ) >> null
334334
result == PREFIX
335335
}
336336

@@ -347,7 +347,7 @@ class CondaCacheTest extends Specification {
347347
1 * cache.isYamlFilePath(ENV)
348348
1 * cache.isTextFilePath(ENV)
349349
0 * cache.makeAbsolute(_)
350-
1 * cache.runCommand("mamba create --this --that --mkdir --yes --quiet --prefix $PREFIX $ENV") >> null
350+
1 * cache.runCommand("mamba create --this --that --yes --quiet --prefix $PREFIX $ENV") >> null
351351
result == PREFIX
352352
}
353353

@@ -381,7 +381,7 @@ class CondaCacheTest extends Specification {
381381
1 * cache.isYamlFilePath(ENV)
382382
1 * cache.isTextFilePath(ENV)
383383
0 * cache.makeAbsolute(_)
384-
1 * cache.runCommand("conda create --mkdir --yes --quiet --prefix /foo/bar -c bioconda -c defaults bwa=1.1.1") >> null
384+
1 * cache.runCommand("conda create --yes --quiet --prefix /foo/bar -c bioconda -c defaults bwa=1.1.1") >> null
385385
result == PREFIX
386386
}
387387

@@ -435,7 +435,7 @@ class CondaCacheTest extends Specification {
435435
1 * cache.isYamlFilePath(ENV)
436436
1 * cache.isTextFilePath(ENV)
437437
1 * cache.makeAbsolute(ENV) >> Paths.get('/usr/base').resolve(ENV)
438-
1 * cache.runCommand( "conda create --this --that --mkdir --yes --quiet --prefix $PREFIX --file /usr/base/foo.txt" ) >> null
438+
1 * cache.runCommand( "conda create --this --that --yes --quiet --prefix $PREFIX --file /usr/base/foo.txt" ) >> null
439439
result == PREFIX
440440

441441
}

0 commit comments

Comments
 (0)