[GR-66152][GR-64568] Run tests for GraalPy in polyglot isolates.

PullRequest: graalpython/3853

Author: timfel

ci.jsonnet

@@ -1 +1 @@
-{ "overlay": "7be7c92b7ccf259703be8e90dc74d9b6034f535d" }
+{ "overlay": "eed61bcd1e6a728edbbe22e323ca383f179faeb2" }

docs/user/Embedding-Build-Tools.md

@@ -161,7 +161,22 @@ Remember to use the appropriate `GraalPyResources` API to create the Context. Th
       ...
   </configuration>
   ```
-  
+
+- If you want to remove packages that are only needed during venv creation but not at runtime, such as setuptools or pip, you can use e.g. the `maven-jar-plugin`:
+  ```xml
+  <plugin>
+    <groupId>org.apache.maven.plugins</groupId>
+    <artifactId>maven-jar-plugin</artifactId>
+    <version>3.4.2</version>
+    <configuration>
+        <excludes>
+            <exclude>**/site-packages/pip*/**</exclude>
+            <exclude>**/site-packages/setuptools*/**</exclude>
+        </excludes>
+    </configuration>
+  </plugin>
+  ```
+
 ### Locking Python Packages
 To lock the dependency tree of the specified Python packages, execute the GraalPy plugin goal `org.graalvm.python:graalpy-maven-plugin:lock-packages`. 
 ```bash

graalpython/com.oracle.graal.python.test.integration/pom.xml

@@ -150,6 +150,23 @@ Additionally, one can change the polyglot artifacts version with
                 </repository>
             </repositories>
         </profile>
+        <profile>
+            <id>isolate</id>
+            <activation>
+                <property>
+                    <name>polyglot.engine.SpawnIsolate</name>
+                </property>
+            </activation>
+            <dependencies>
+                <dependency>
+                    <groupId>org.graalvm.polyglot</groupId>
+                    <artifactId>python-isolate</artifactId>
+                    <version>${com.oracle.graal.python.test.polyglot.version}</version>
+                    <scope>runtime</scope>
+                    <type>pom</type>
+                </dependency>
+            </dependencies>
+        </profile>
     </profiles>
 
     <dependencies>
@@ -160,7 +177,7 @@ Additionally, one can change the polyglot artifacts version with
         </dependency>
         <dependency>
             <groupId>org.graalvm.polyglot</groupId>
-            <artifactId>python-community</artifactId>
+            <artifactId>python</artifactId>
             <version>${com.oracle.graal.python.test.polyglot.version}</version>
             <scope>runtime</scope>
             <type>pom</type>

graalpython/com.oracle.graal.python.test.integration/src/com/oracle/graal/python/test/integration/EngineOptionsTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * The Universal Permissive License (UPL), Version 1.0
@@ -53,11 +53,12 @@ public class EngineOptionsTests {
     @Test
     public void engineOptions() {
         assumeFalse(IS_WINDOWS);
-        Engine engine = Engine.newBuilder().build();
+        Engine engine = Engine.create("python");
 
         assertEquals("java", doit(engine, null));
         assertEquals("java", doit(engine, "java"));
         assertEquals("native", doit(engine, "native"));
+        engine.close();
     }
 
     private static String doit(Engine engine, String backend) {

graalpython/com.oracle.graal.python.test.integration/src/com/oracle/graal/python/test/integration/PythonTests.java

@@ -58,7 +58,7 @@ public class PythonTests {
     static final PrintStream errStream = new PrintStream(errArray);
     static final PrintStream outStream = new PrintStream(outArray);
 
-    private static final Engine engine = Engine.newBuilder().out(PythonTests.outStream).err(PythonTests.errStream).build();
+    private static final Engine engine = Engine.newBuilder("python").out(outStream).err(errStream).build();
     private static Context context = null;
 
     public static Context enterContext(String... newArgs) {

graalpython/com.oracle.graal.python.test.integration/src/com/oracle/graal/python/test/integration/advanced/MultiContextTest.java

@@ -49,17 +49,18 @@
 public class MultiContextTest extends PythonTests {
     @Test
     public void testSharingWithMemoryview() {
-        Engine engine = Engine.newBuilder().build();
+        Engine engine = Engine.create("python");
         for (int i = 0; i < 10; i++) {
             try (Context context = newContext(engine)) {
                 context.eval("python", "memoryview(b'abc')");
             }
         }
+        engine.close();
     }
 
     @Test
     public void testTryCatch() {
-        Engine engine = Engine.newBuilder().build();
+        Engine engine = Engine.create("python");
         for (int i = 0; i < 10; i++) {
             try (Context context = newContext(engine)) {
                 context.eval("python", "last_val = -1\n" +
@@ -72,6 +73,7 @@ public void testTryCatch() {
                                 "last_val");
             }
         }
+        engine.close();
     }
 
     private static Context newContext(Engine engine) {

graalpython/com.oracle.graal.python.test.integration/src/com/oracle/graal/python/test/integration/advanced/NativeExtTest.java

@@ -63,7 +63,7 @@ public static void setUpClass() {
     @Test
     public void testSharingErrorWithCpythonSre() throws InterruptedException {
         // The first context is the one that will use native extensions
-        Engine engine = Engine.newBuilder().build();
+        Engine engine = Engine.create("python");
         Context cextContext = newContext(engine).option("python.IsolateNativeModules", "true").build();
         try {
             cextContext.eval("python", "import _cpython_sre\nassert _cpython_sre.ascii_tolower(88) == 120\n");
@@ -104,6 +104,7 @@ public void testSharingErrorWithCpythonSre() throws InterruptedException {
 
         } finally {
             cextContext.close(true);
+            engine.close();
         }
     }
 

graalpython/com.oracle.graal.python.test.integration/src/com/oracle/graal/python/test/integration/advanced/ResourcesTest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * The Universal Permissive License (UPL), Version 1.0
@@ -45,6 +45,7 @@
 import java.io.File;
 
 import org.graalvm.polyglot.Context;
+import org.graalvm.polyglot.Engine;
 import org.graalvm.polyglot.io.IOAccess;
 import org.junit.Before;
 import org.junit.Test;
@@ -72,7 +73,8 @@ public void testResourcesAsHome() {
 
     @Test
     public void testResourcesAlwaysAllowReading() {
-        try (Context context = Context.newBuilder("python").allowIO(IOAccess.NONE).option("python.PythonHome", "/path/that/does/not/exist").build()) {
+        try (Engine engine = Engine.create("python");
+                        Context context = Context.newBuilder("python").engine(engine).allowIO(IOAccess.NONE).option("python.PythonHome", "/path/that/does/not/exist").build()) {
             String foundHome = context.eval("python", "import email; email.__spec__.origin").asString();
             assertTrue(foundHome, foundHome.contains("python" + File.separator + "python-home"));
         }

graalpython/com.oracle.graal.python.test.integration/src/com/oracle/graal/python/test/integration/advanced/ShutdownTest.java

@@ -45,6 +45,7 @@
 import java.util.concurrent.atomic.AtomicReference;
 
 import org.graalvm.polyglot.Context;
+import org.graalvm.polyglot.Engine;
 import org.graalvm.polyglot.PolyglotException;
 import org.junit.Assert;
 import org.junit.Assume;
@@ -161,7 +162,7 @@ public void testJavaThreadNotExecutingPythonAnymore() throws InterruptedExceptio
     }
 
     private static Context createContext() {
-        return Context.newBuilder().allowExperimentalOptions(true).allowAllAccess(true).option("python.IsolateNativeModules", "true").build();
+        return Context.newBuilder().engine(Engine.create("python")).allowExperimentalOptions(true).allowAllAccess(true).option("python.IsolateNativeModules", "true").build();
     }
 
     private static void loadNativeExtension(Context context) {

graalpython/com.oracle.graal.python.test.integration/src/com/oracle/graal/python/test/integration/basic/HelloWorldTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2023, Oracle and/or its affiliates.
+ * Copyright (c) 2017, 2025, Oracle and/or its affiliates.
  * Copyright (c) 2013, Regents of the University of California
  *
  * All rights reserved.
@@ -31,6 +31,7 @@
 import java.io.PrintStream;
 
 import org.graalvm.polyglot.Context;
+import org.graalvm.polyglot.Engine;
 import org.junit.Test;
 
 import com.oracle.graal.python.test.integration.PythonTests;
@@ -53,7 +54,7 @@ public void helloworldAgain() {
     public void usesFrozenModules() {
         final ByteArrayOutputStream byteArray = new ByteArrayOutputStream();
         final PrintStream printStream = new PrintStream(byteArray);
-        try (Context c = Context.newBuilder().option("log.python.level", "FINE").out(printStream).err(printStream).build()) {
+        try (Context c = Context.newBuilder().engine(Engine.newBuilder("python").out(printStream).err(printStream).build()).option("log.python.level", "FINE").build()) {
             c.initialize("python");
         }
         String result = byteArray.toString().replaceAll("\r\n", "\n");