Skip to content

Commit e3b1b47

Browse files
edmundmillerclaude
andcommitted
refactor: remove never-merged Pixi implementation
Remove Pixi-related code that was never officially merged: - Delete PixiCache and PixiConfig classes and tests - Remove Pixi command-line options from CmdRun - Remove Pixi configuration logic from ConfigBuilder - Remove Pixi environment methods from TaskRun and TaskBean - Remove pixi directive from ProcessConfig - Remove Pixi activation from BashWrapperBuilder and command template This cleanup focuses the codebase on the unified package management system while maintaining backward compatibility for conda directive. 🤖 Generated with [Claude Code](https://claude.ai/code) Co-Authored-By: Claude <[email protected]> Signed-off-by: Edmund Miller <[email protected]>
1 parent b3e3f26 commit e3b1b47

File tree

13 files changed

+0
-1617
lines changed

13 files changed

+0
-1617
lines changed

modules/nextflow/src/main/groovy/nextflow/Session.groovy

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,6 @@ import nextflow.script.ScriptFile
6868
import nextflow.script.ScriptMeta
6969
import nextflow.script.ScriptRunner
7070
import nextflow.script.WorkflowMetadata
71-
import nextflow.pixi.PixiConfig
7271
import nextflow.spack.SpackConfig
7372
import nextflow.trace.AnsiLogObserver
7473
import nextflow.trace.TraceObserver
@@ -1196,11 +1195,6 @@ class Session implements ISession {
11961195
return new SpackConfig(opts, getSystemEnv())
11971196
}
11981197

1199-
@Memoized
1200-
PixiConfig getPixiConfig() {
1201-
final cfg = config.pixi as Map ?: Collections.emptyMap()
1202-
return new PixiConfig(cfg, getSystemEnv())
1203-
}
12041198

12051199
/**
12061200
* Get the container engine configuration for the specified engine. If no engine is specified

modules/nextflow/src/main/groovy/nextflow/cli/CmdRun.groovy

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -250,11 +250,6 @@ class CmdRun extends CmdBase implements HubOptions {
250250
@Parameter(names=['-without-spack'], description = 'Disable the use of Spack environments')
251251
Boolean withoutSpack
252252

253-
@Parameter(names=['-with-pixi'], description = 'Use the specified Pixi environment package or file (must end with .toml suffix)')
254-
String withPixi
255-
256-
@Parameter(names=['-without-pixi'], description = 'Disable the use of Pixi environments')
257-
Boolean withoutPixi
258253

259254
@Parameter(names=['-offline'], description = 'Do not check for remote project updates')
260255
boolean offline = System.getenv('NXF_OFFLINE')=='true'

modules/nextflow/src/main/groovy/nextflow/config/ConfigBuilder.groovy

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -594,18 +594,6 @@ class ConfigBuilder {
594594
config.spack.enabled = true
595595
}
596596

597-
if( cmdRun.withoutPixi && config.pixi instanceof Map ) {
598-
// disable pixi execution
599-
log.debug "Disabling execution with Pixi as requested by command-line option `-without-pixi`"
600-
config.pixi.enabled = false
601-
}
602-
603-
// -- apply the pixi environment
604-
if( cmdRun.withPixi ) {
605-
if( cmdRun.withPixi != '-' )
606-
config.process.pixi = cmdRun.withPixi
607-
config.pixi.enabled = true
608-
}
609597

610598
// -- sets the resume option
611599
if( cmdRun.resume )

modules/nextflow/src/main/groovy/nextflow/executor/BashWrapperBuilder.groovy

Lines changed: 0 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -343,7 +343,6 @@ class BashWrapperBuilder {
343343
binding.before_script = getBeforeScriptSnippet()
344344
binding.conda_activate = getCondaActivateSnippet()
345345
binding.spack_activate = getSpackActivateSnippet()
346-
binding.pixi_activate = getPixiActivateSnippet()
347346
binding.package_activate = getPackageActivateSnippet()
348347

349348
/*
@@ -564,28 +563,6 @@ class BashWrapperBuilder {
564563
return result
565564
}
566565

567-
private String getPixiActivateSnippet() {
568-
if( !pixiEnv )
569-
return null
570-
def result = "# pixi environment\n"
571-
572-
// Check if there's a .pixi file that points to the project directory
573-
final pixiFile = pixiEnv.resolve('.pixi')
574-
if( pixiFile.exists() ) {
575-
// Read the project directory path
576-
final projectDir = pixiFile.text.trim()
577-
result += "cd ${Escape.path(projectDir as String)} && "
578-
result += "eval \"\$(pixi shell-hook --shell bash)\" && "
579-
result += "cd \"\$OLDPWD\"\n"
580-
}
581-
else {
582-
// Direct activation from environment directory
583-
result += "cd ${Escape.path(pixiEnv)} && "
584-
result += "eval \"\$(pixi shell-hook --shell bash)\" && "
585-
result += "cd \"\$OLDPWD\"\n"
586-
}
587-
return result
588-
}
589566

590567
private String getPackageActivateSnippet() {
591568
if (!packageSpec || !PackageManager.isEnabled(Global.session))

0 commit comments

Comments
 (0)