Skip to content

Commit c65159a

Browse files
committed
[GR-52380] Extract from python-embedding what is only build-time relevant.
PullRequest: graalpython/3214
2 parents e335da8 + b423866 commit c65159a

File tree

16 files changed

+819
-24
lines changed

16 files changed

+819
-24
lines changed

graalpython/com.oracle.graal.python.test.integration/src/org/graalvm/python/embedding/utils/test/VirtualFileSystemTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@
5656
import org.graalvm.polyglot.HostAccess;
5757
import org.graalvm.polyglot.PolyglotAccess;
5858
import org.graalvm.polyglot.io.IOAccess;
59-
import org.graalvm.python.embedding.utils.VirtualFileSystem;
59+
import org.graalvm.python.embedding.vfs.VirtualFileSystem;
6060
import org.junit.Test;
6161

6262
public class VirtualFileSystemTest {

graalpython/graalpy-archetype-polyglot-app/src/main/resources/archetype-resources/src/main/java/GraalPy.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2023, 2024, Oracle and/or its affiliates. All rights reserved.
33
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
*
55
* The Universal Permissive License (UPL), Version 1.0
@@ -51,7 +51,7 @@
5151
import org.graalvm.polyglot.Value;
5252
import org.graalvm.polyglot.io.IOAccess;
5353
import java.io.IOException;
54-
import org.graalvm.python.embedding.utils.VirtualFileSystem;
54+
import org.graalvm.python.embedding.vfs.VirtualFileSystem;
5555

5656
public class GraalPy {
5757
private static final String VENV_PREFIX = "/vfs/venv";

graalpython/graalpy-jbang/examples/hello.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@
5050
import org.graalvm.polyglot.PolyglotAccess;
5151
import org.graalvm.polyglot.PolyglotException;
5252
import org.graalvm.polyglot.io.IOAccess;
53-
import org.graalvm.python.embedding.utils.VirtualFileSystem;
53+
import org.graalvm.python.embedding.vfs.VirtualFileSystem;
5454

5555
public class hello {
5656
public static void main(String[] args) {

graalpython/graalpy-maven-plugin/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ SOFTWARE.
108108

109109
<dependency>
110110
<groupId>org.graalvm.python</groupId>
111-
<artifactId>python-embedding</artifactId>
111+
<artifactId>python-embedding-tools</artifactId>
112112
<version>${graalpy.version}</version>
113113
</dependency>
114114
<dependency>

graalpython/graalpy-maven-plugin/src/main/java/org/graalvm/python/maven/plugin/ManageResourcesMojo.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,11 +47,12 @@
4747
import org.apache.maven.plugin.AbstractMojo;
4848
import org.apache.maven.plugin.MojoExecutionException;
4949
import org.apache.maven.plugin.logging.Log;
50+
5051
import org.apache.maven.plugins.annotations.*;
5152
import org.apache.maven.project.*;
5253
import org.eclipse.aether.graph.Dependency;
53-
import org.graalvm.python.embedding.utils.GraalPyRunner;
54-
import org.graalvm.python.embedding.utils.VFSUtils;
54+
import org.graalvm.python.embedding.tools.exec.GraalPyRunner;
55+
import org.graalvm.python.embedding.tools.vfs.VFSUtils;
5556

5657
import java.io.File;
5758
import java.io.FileWriter;

graalpython/graalpy-maven-plugin/src/main/java/org/graalvm/python/maven/plugin/MavenDelegateLog.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2023, 2024, Oracle and/or its affiliates. All rights reserved.
33
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
*
55
* The Universal Permissive License (UPL), Version 1.0
@@ -41,7 +41,7 @@
4141
package org.graalvm.python.maven.plugin;
4242

4343
import org.apache.maven.plugin.logging.Log;
44-
import org.graalvm.python.embedding.utils.SubprocessLog;
44+
import org.graalvm.python.embedding.tools.exec.SubprocessLog;
4545

4646
final class MavenDelegateLog implements SubprocessLog {
4747
private final Log delegate;

graalpython/lib-graalpython/modules/standalone/resources/Py2BinLauncher.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@
4747
import org.graalvm.polyglot.PolyglotException;
4848
import org.graalvm.polyglot.Source;
4949
import org.graalvm.polyglot.io.IOAccess;
50-
import org.graalvm.python.embedding.utils.VirtualFileSystem;
50+
import org.graalvm.python.embedding.vfs.VirtualFileSystem;
5151

5252
/**
5353
* A simple launcher for Python. The launcher sets the filesystem up to read the Python core,
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
org.graalvm.python.embedding.tools.jbang.JBangIntegration

graalpython/org.graalvm.python.embedding/src/org/graalvm/python/embedding/utils/GraalPyRunner.java renamed to graalpython/org.graalvm.python.embedding.tools/src/org/graalvm/python/embedding/tools/exec/GraalPyRunner.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
3939
* SOFTWARE.
4040
*/
41-
package org.graalvm.python.embedding.utils;
41+
package org.graalvm.python.embedding.tools.exec;
4242

4343
import java.io.BufferedReader;
4444
import java.io.File;

graalpython/org.graalvm.python.embedding/src/org/graalvm/python/embedding/utils/SubprocessLog.java renamed to graalpython/org.graalvm.python.embedding.tools/src/org/graalvm/python/embedding/tools/exec/SubprocessLog.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2023, 2024, Oracle and/or its affiliates. All rights reserved.
33
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
*
55
* The Universal Permissive License (UPL), Version 1.0
@@ -38,7 +38,7 @@
3838
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
3939
* SOFTWARE.
4040
*/
41-
package org.graalvm.python.embedding.utils;
41+
package org.graalvm.python.embedding.tools.exec;
4242

4343
public interface SubprocessLog {
4444

0 commit comments

Comments
 (0)