Put current dir in PYTHONPATH in 'scala-cli repl --python'

Author: alexarchambault

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

@@ -14,7 +14,11 @@ import scala.build.internal.{Constants, Runner}
 import scala.build.options.{BuildOptions, JavaOpt, MaybeScalaVersion, Scope}
 import scala.cli.CurrentParams
 import scala.cli.commands.publish.ConfigUtil.*
-import scala.cli.commands.run.Run.{maybePrintSimpleScalacOutput, orPythonDetectionError}
+import scala.cli.commands.run.Run.{
+  maybePrintSimpleScalacOutput,
+  orPythonDetectionError,
+  pythonPathEnv
+}
 import scala.cli.commands.run.RunMode
 import scala.cli.commands.shared.SharedOptions
 import scala.cli.commands.{ScalaCommand, WatchUtil}
@@ -264,20 +268,25 @@ object Repl extends ScalaCommand[ReplOptions] {
       }
       .params
 
-    val scalapyJavaOpts =
+    val (scalapyJavaOpts, scalapyExtraEnv) =
       if (setupPython) {
         val props = value {
           val python       = Python()
           val propsOrError = python.scalapyProperties
           logger.debug(s"Python Java properties: $propsOrError")
           propsOrError.orPythonDetectionError
         }
-        props.toVector.sorted.map {
+        val props0 = props.toVector.sorted.map {
           case (k, v) => s"-D$k=$v"
         }
+        // Putting current dir in PYTHONPATH, see
+        // https://github.com/VirtusLab/scala-cli/pull/1616#issuecomment-1333283174
+        // for context.
+        val dirs = buildOpt.map(_.inputs.workspace).toSeq ++ Seq(os.pwd)
+        (props0, pythonPathEnv(dirs: _*))
       }
       else
-        Nil
+        (Nil, Map.empty[String, String])
 
     def additionalArgs = {
       val pythonArgs =
@@ -365,7 +374,7 @@ object Repl extends ScalaCommand[ReplOptions] {
           maybeAdaptForWindows(replArgs),
           logger,
           allowExecve = allowExit,
-          extraEnv = extraEnv
+          extraEnv = scalapyExtraEnv ++ extraEnv
         ).waitFor()
         if (retCode != 0)
           value(Left(new ReplError(retCode)))

modules/integration/src/test/scala/scala/cli/integration/ReplTestDefinitions.scala

@@ -46,12 +46,18 @@ abstract class ReplTestDefinitions(val scalaVersionOpt: Option[String])
   }
 
   test("ammonite scalapy") {
-    TestInputs.empty.fromRoot { root =>
+    val inputs = TestInputs(
+      os.rel / "foo" / "something.py" ->
+        """messageStart = 'Hello from'
+          |messageEnd = 'ScalaPy'
+          |""".stripMargin
+    )
+    inputs.fromRoot { root =>
       val ammArgs = Seq(
         "-c",
         """println("Hello" + " from Scala " + scala.util.Properties.versionNumberString)
-          |// py.Dynamic.global.print("Hello from", "ScalaPy") // doesn't work
-          |println(py"'Hello from '" + py"'ScalaPy'")
+          |val sth = py.module("foo.something")
+          |py.Dynamic.global.applyDynamicNamed("print")("" -> sth.messageStart, "" -> sth.messageEnd, "flush" -> py.Any.from(true))
           |""".stripMargin
       )
         .map {
@@ -61,6 +67,24 @@ abstract class ReplTestDefinitions(val scalaVersionOpt: Option[String])
             identity
         }
         .flatMap(arg => Seq("--ammonite-arg", arg))
+
+      val errorRes = os.proc(
+        TestUtil.cli,
+        "repl",
+        extraOptions,
+        "--ammonite",
+        "--python",
+        ammArgs
+      ).call(
+        cwd = root,
+        env = Map("PYTHONSAFEPATH" -> "foo"),
+        mergeErrIntoOut = true,
+        check = false
+      )
+      expect(errorRes.exitCode != 0)
+      val errorOutput = errorRes.out.text()
+      expect(errorOutput.contains("No module named 'foo'"))
+
       val res = os.proc(
         TestUtil.cli,
         "repl",