Handle python-related options via SharedOptions

Rather than having each and every command handle them.

Author: alexarchambault

modules/cli/src/main/scala/scala/cli/commands/publish/Publish.scala

@@ -70,7 +70,6 @@ object Publish extends ScalaCommand[PublishOptions] with BuildCommandHelpers {
     publishParams: PublishParamsOptions,
     sharedPublish: SharedPublishOptions,
     publishRepo: PublishRepositoryOptions,
-    sharedPython: SharedPythonOptions,
     scalaSigning: PgpScalaSigningOptions,
     mainClass: MainClassOptions,
     ivy2LocalLike: Option[Boolean]
@@ -156,10 +155,7 @@ object Publish extends ScalaCommand[PublishOptions] with BuildCommandHelpers {
             useJvm = scalaSigning.forceJvmSigningCli,
             javaArgs = scalaSigning.signingCliJavaArg
           )
-        ),
-        python = sharedPython.python,
-        pythonSetup = sharedPython.pythonSetup,
-        scalaPyVersion = sharedPython.scalaPyVersion
+        )
       )
     )
   }
@@ -191,7 +187,6 @@ object Publish extends ScalaCommand[PublishOptions] with BuildCommandHelpers {
       options.publishParams,
       options.sharedPublish,
       options.publishRepo,
-      options.sharedPython,
       options.signingCli,
       options.mainClass,
       options.ivy2LocalLike

modules/cli/src/main/scala/scala/cli/commands/publish/PublishLocal.scala

@@ -37,7 +37,6 @@ object PublishLocal extends ScalaCommand[PublishLocalOptions] {
       options.publishParams,
       options.sharedPublish,
       PublishRepositoryOptions(),
-      options.sharedPython,
       options.scalaSigning,
       options.mainClass,
       None

modules/cli/src/main/scala/scala/cli/commands/publish/PublishLocalOptions.scala

@@ -26,8 +26,6 @@ final case class PublishLocalOptions(
     publishParams: PublishParamsOptions = PublishParamsOptions(),
   @Recurse
     sharedPublish: SharedPublishOptions = SharedPublishOptions(),
-  @Recurse
-    sharedPython: SharedPythonOptions = SharedPythonOptions(),
   @Recurse
     scalaSigning: PgpScalaSigningOptions = PgpScalaSigningOptions(),
 ) extends HasSharedOptions

modules/cli/src/main/scala/scala/cli/commands/publish/PublishOptions.scala

@@ -21,8 +21,6 @@ final case class PublishOptions(
     publishRepo: PublishRepositoryOptions = PublishRepositoryOptions(),
   @Recurse
     sharedPublish: SharedPublishOptions = SharedPublishOptions(),
-  @Recurse
-    sharedPython: SharedPythonOptions = SharedPythonOptions(),
   @Recurse
     signingCli: PgpScalaSigningOptions = PgpScalaSigningOptions(),
 

modules/cli/src/main/scala/scala/cli/commands/repl/Repl.scala

@@ -78,9 +78,6 @@ object Repl extends ScalaCommand[ReplOptions] {
           ammoniteVersionOpt = ammoniteVersion.map(_.trim).filter(_.nonEmpty),
           ammoniteArgs = ammoniteArg
         ),
-        python = sharedPython.python,
-        pythonSetup = sharedPython.pythonSetup,
-        scalaPyVersion = sharedPython.scalaPyVersion,
         addRunnerDependencyOpt = baseOptions.notForBloopOptions.addRunnerDependencyOpt
           .orElse(Some(false))
       )

modules/cli/src/main/scala/scala/cli/commands/repl/SharedReplOptions.scala

@@ -19,8 +19,6 @@ final case class SharedReplOptions(
     watch: SharedWatchOptions = SharedWatchOptions(),
   @Recurse
     compileCross: CrossOptions = CrossOptions(),
-  @Recurse
-    sharedPython: SharedPythonOptions = SharedPythonOptions(),
 
   @Group("Repl")
   @Tag(tags.restricted)

modules/cli/src/main/scala/scala/cli/commands/run/Run.scala

@@ -89,9 +89,6 @@ object Run extends ScalaCommand[RunOptions] with BuildCommandHelpers {
       ),
       notForBloopOptions = baseOptions.notForBloopOptions.copy(
         runWithManifest = options.sharedRun.useManifest,
-        python = options.sharedRun.sharedPython.python,
-        pythonSetup = options.sharedRun.sharedPython.pythonSetup,
-        scalaPyVersion = options.sharedRun.sharedPython.scalaPyVersion,
         addRunnerDependencyOpt = baseOptions.notForBloopOptions.addRunnerDependencyOpt.orElse {
           runMode(options) match {
             case _: RunMode.Spark | RunMode.HadoopJar =>

modules/cli/src/main/scala/scala/cli/commands/run/SharedRunOptions.scala

@@ -25,8 +25,6 @@ final case class SharedRunOptions(
     compileCross: CrossOptions = CrossOptions(),
   @Recurse
     mainClass: MainClassOptions = MainClassOptions(),
-  @Recurse
-    sharedPython: SharedPythonOptions = SharedPythonOptions(),
   @Group("Run")
   @Hidden
   @Tag(tags.experimental)

modules/cli/src/main/scala/scala/cli/commands/shared/SharedOptions.scala

@@ -63,6 +63,8 @@ final case class SharedOptions(
     coursier: CoursierOptions = CoursierOptions(),
   @Recurse
     workspace: SharedWorkspaceOptions = SharedWorkspaceOptions(),
+  @Recurse
+    sharedPython: SharedPythonOptions = SharedPythonOptions(),
 
   @Group("Scala")
   @HelpMessage(s"Set the Scala version (${Constants.defaultScalaVersion} by default)")
@@ -321,7 +323,10 @@ final case class SharedOptions(
       ),
       notForBloopOptions = bo.PostBuildOptions(
         scalaJsLinkerOptions = linkerOptions(js),
-        addRunnerDependencyOpt = runner
+        addRunnerDependencyOpt = runner,
+        python = sharedPython.python,
+        pythonSetup = sharedPython.pythonSetup,
+        scalaPyVersion = sharedPython.scalaPyVersion
       )
     )
   }

modules/cli/src/test/scala/cli/commands/tests/ReplOptionsTests.scala

@@ -3,14 +3,14 @@ package scala.cli.commands.tests
 import com.eed3si9n.expecty.Expecty.{assert => expect}
 
 import scala.cli.commands.repl.{Repl, ReplOptions, SharedReplOptions}
-import scala.cli.commands.shared.SharedPythonOptions
+import scala.cli.commands.shared.{SharedOptions, SharedPythonOptions}
 
 class ReplOptionsTests extends munit.FunSuite {
 
   test("ScalaPy version") {
     val ver = "X.Y.Z"
     val replOptions = ReplOptions(
-      sharedRepl = SharedReplOptions(
+      shared = SharedOptions(
         sharedPython = SharedPythonOptions(
           scalaPyVersion = Some(ver)
         )