Skip to content

Commit 8123175

Browse files
ppislppisl
committed
Correcting typos in changelog.
1 parent 41dc607 commit 8123175

File tree

2 files changed

+127
-127
lines changed

2 files changed

+127
-127
lines changed

‎CHANGELOG.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ language runtime. The main focus is on user-observable behavior of the engine.
1818
*Adding integration with jBang (https://www.jbang.dev/)
1919
** running example via `jbang hello@oracle/graalpython` or `jbang hello@oracle/graalpython "print(1*4)"`
2020
** creating new script via: `jbang init --template=graalpy@oracle/graalpython myscript.java`
21-
** creating new srcript with local maven repo for testing: `jbag init --temlate=graalpy@oracle/graalpython -Dpath_to_local_repo=/absolute/path/to/local/maven/repository myscript.java'
21+
** creating new script with local maven repo for testing: `jbang init --template=graalpy@oracle/graalpython -Dpath_to_local_repo=/absolute/path/to/local/maven/repository myscript.java'
2222

2323
## Version 23.1.0
2424
* Oracle GraalPy distributions (previously known as GraalPy Enterprise) are now available under the [GFTC license](https://www.oracle.com/downloads/licenses/graal-free-license.html). The community builds published on Github have been renamed to `graalpy-community-<version>-<os>-<arch>.tar.gz`.

‎graalpython/graalpy-jbang/examples/hello.java

+126-126
Original file line numberDiff line numberDiff line change
@@ -1,126 +1,126 @@
1-
/*
2-
* Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
3-
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
4-
*
5-
* The Universal Permissive License (UPL), Version 1.0
6-
*
7-
* Subject to the condition set forth below, permission is hereby granted to any
8-
* person obtaining a copy of this software, associated documentation and/or
9-
* data (collectively the "Software"), free of charge and under any and all
10-
* copyright rights in the Software, and any and all patent rights owned or
11-
* freely licensable by each licensor hereunder covering either (i) the
12-
* unmodified Software as contributed to or provided by such licensor, or (ii)
13-
* the Larger Works (as defined below), to deal in both
14-
*
15-
* (a) the Software, and
16-
*
17-
* (b) any piece of software and/or hardware listed in the lrgrwrks.txt file if
18-
* one is included with the Software each a "Larger Work" to which the Software
19-
* is contributed by such licensors),
20-
*
21-
* without restriction, including without limitation the rights to copy, create
22-
* derivative works of, display, perform, and distribute the Software and make,
23-
* use, sell, offer for sale, import, export, have made, and have sold the
24-
* Software and the Larger Work(s), and to sublicense the foregoing rights on
25-
* either these or other terms.
26-
*
27-
* This license is subject to the following condition:
28-
*
29-
* The above copyright notice and either this complete permission notice or at a
30-
* minimum a reference to the UPL must be included in all copies or substantial
31-
* portions of the Software.
32-
*
33-
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
34-
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
35-
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
36-
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
37-
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
38-
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
39-
* SOFTWARE.
40-
*/
41-
///usr/bin/env jbang "$0" "$@" ; exit $?
42-
43-
//DEPS org.graalvm.python:python-language:24.0.0-dev
44-
//DEPS org.graalvm.python:python-resources:24.0.0-dev
45-
//DEPS org.graalvm.python:python-launcher:24.0.0-dev
46-
//DEPS org.graalvm.python:python-embedding:24.0.0-dev
47-
//PIP termcolor
48-
49-
import org.graalvm.polyglot.Context;
50-
import org.graalvm.polyglot.PolyglotAccess;
51-
import org.graalvm.polyglot.PolyglotException;
52-
import org.graalvm.polyglot.io.IOAccess;
53-
import org.graalvm.python.embedding.utils.VirtualFileSystem;
54-
55-
public class hello {
56-
public static void main(String[] args) {
57-
System.out.println("Running main method from Java.");
58-
try (Context context = VirtualGraalPyContext.getContext()) {
59-
switch (args.length) {
60-
case 0:
61-
context.eval("python", "print('Hello from Python')");
62-
break;
63-
case 1:
64-
context.eval("python", args[0]);
65-
break;
66-
default:
67-
throw new IllegalArgumentException("The main() helper only takes 0-1 arguments.");
68-
}
69-
} catch (PolyglotException e) {
70-
if (e.isExit()) {
71-
System.exit(e.getExitStatus());
72-
} else {
73-
throw e;
74-
}
75-
}
76-
}
77-
}
78-
79-
final class VirtualGraalPyContext {
80-
private static final String VENV_PREFIX = "/vfs/venv";
81-
private static final String HOME_PREFIX = "/vfs/home";
82-
83-
public static Context getContext() {
84-
VirtualFileSystem vfs = VirtualFileSystem.create();
85-
var builder = Context.newBuilder()
86-
// set true to allow experimental options
87-
.allowExperimentalOptions(false)
88-
// deny all privileges unless configured below
89-
.allowAllAccess(false)
90-
// allow access to the virtual and the host filesystem, as well as sockets
91-
.allowIO(IOAccess.newBuilder()
92-
.allowHostSocketAccess(true)
93-
.fileSystem(vfs)
94-
.build())
95-
// allow creating python threads
96-
.allowCreateThread(true)
97-
// allow running Python native extensions
98-
.allowNativeAccess(true)
99-
// allow exporting Python values to polyglot bindings and accessing Java from Python
100-
.allowPolyglotAccess(PolyglotAccess.ALL)
101-
// choose the backend for the POSIX module
102-
.option("python.PosixModuleBackend", "java")
103-
// equivalent to the Python -B flag
104-
.option("python.DontWriteBytecodeFlag", "true")
105-
// equivalent to the Python -v flag
106-
.option("python.VerboseFlag", System.getenv("PYTHONVERBOSE") != null ? "true" : "false")
107-
// log level
108-
.option("log.python.level", System.getenv("PYTHONVERBOSE") != null ? "FINE" : "SEVERE")
109-
// equivalent to setting the PYTHONWARNINGS environment variable
110-
.option("python.WarnOptions", System.getenv("PYTHONWARNINGS") == null ? "" : System.getenv("PYTHONWARNINGS"))
111-
// print Python exceptions directly
112-
.option("python.AlwaysRunExcepthook", "true")
113-
// Force to automatically import site.py module, to make Python packages available
114-
.option("python.ForceImportSite", "true")
115-
// The sys.executable path, a virtual path that is used by the interpreter to discover packages
116-
.option("python.Executable", vfs.resourcePathToPlatformPath(VENV_PREFIX) + (VirtualFileSystem.isWindows() ? "\\Scripts\\python.exe" : "/bin/python"))
117-
// Do not warn if running without JIT. This can be desirable for short running scripts
118-
// to reduce memory footprint.
119-
.option("engine.WarnInterpreterOnly", "false");
120-
if (System.getProperty("org.graalvm.nativeimage.imagecode") != null) {
121-
// Set the python home to be read from the embedded resources
122-
builder.option("python.PythonHome", vfs.resourcePathToPlatformPath(HOME_PREFIX));
123-
}
124-
return builder.build();
125-
}
126-
}
1+
/*
2+
* Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
3+
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
4+
*
5+
* The Universal Permissive License (UPL), Version 1.0
6+
*
7+
* Subject to the condition set forth below, permission is hereby granted to any
8+
* person obtaining a copy of this software, associated documentation and/or
9+
* data (collectively the "Software"), free of charge and under any and all
10+
* copyright rights in the Software, and any and all patent rights owned or
11+
* freely licensable by each licensor hereunder covering either (i) the
12+
* unmodified Software as contributed to or provided by such licensor, or (ii)
13+
* the Larger Works (as defined below), to deal in both
14+
*
15+
* (a) the Software, and
16+
*
17+
* (b) any piece of software and/or hardware listed in the lrgrwrks.txt file if
18+
* one is included with the Software each a "Larger Work" to which the Software
19+
* is contributed by such licensors),
20+
*
21+
* without restriction, including without limitation the rights to copy, create
22+
* derivative works of, display, perform, and distribute the Software and make,
23+
* use, sell, offer for sale, import, export, have made, and have sold the
24+
* Software and the Larger Work(s), and to sublicense the foregoing rights on
25+
* either these or other terms.
26+
*
27+
* This license is subject to the following condition:
28+
*
29+
* The above copyright notice and either this complete permission notice or at a
30+
* minimum a reference to the UPL must be included in all copies or substantial
31+
* portions of the Software.
32+
*
33+
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
34+
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
35+
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
36+
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
37+
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
38+
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
39+
* SOFTWARE.
40+
*/
41+
///usr/bin/env jbang "$0" "$@" ; exit $?
42+
43+
//DEPS org.graalvm.python:python-language:24.0.0-dev
44+
//DEPS org.graalvm.python:python-resources:24.0.0-dev
45+
//DEPS org.graalvm.python:python-launcher:24.0.0-dev
46+
//DEPS org.graalvm.python:python-embedding:24.0.0-dev
47+
//PIP termcolor
48+
49+
import org.graalvm.polyglot.Context;
50+
import org.graalvm.polyglot.PolyglotAccess;
51+
import org.graalvm.polyglot.PolyglotException;
52+
import org.graalvm.polyglot.io.IOAccess;
53+
import org.graalvm.python.embedding.utils.VirtualFileSystem;
54+
55+
public class hello {
56+
public static void main(String[] args) {
57+
System.out.println("Running main method from Java.");
58+
try (Context context = VirtualGraalPyContext.getContext()) {
59+
switch (args.length) {
60+
case 0:
61+
context.eval("python", "print('Hello from Python')");
62+
break;
63+
case 1:
64+
context.eval("python", args[0]);
65+
break;
66+
default:
67+
throw new IllegalArgumentException("The main() helper only takes 0-1 arguments.");
68+
}
69+
} catch (PolyglotException e) {
70+
if (e.isExit()) {
71+
System.exit(e.getExitStatus());
72+
} else {
73+
throw e;
74+
}
75+
}
76+
}
77+
}
78+
79+
final class VirtualGraalPyContext {
80+
private static final String VENV_PREFIX = "/vfs/venv";
81+
private static final String HOME_PREFIX = "/vfs/home";
82+
83+
public static Context getContext() {
84+
VirtualFileSystem vfs = VirtualFileSystem.create();
85+
var builder = Context.newBuilder()
86+
// set true to allow experimental options
87+
.allowExperimentalOptions(false)
88+
// deny all privileges unless configured below
89+
.allowAllAccess(false)
90+
// allow access to the virtual and the host filesystem, as well as sockets
91+
.allowIO(IOAccess.newBuilder()
92+
.allowHostSocketAccess(true)
93+
.fileSystem(vfs)
94+
.build())
95+
// allow creating python threads
96+
.allowCreateThread(true)
97+
// allow running Python native extensions
98+
.allowNativeAccess(true)
99+
// allow exporting Python values to polyglot bindings and accessing Java from Python
100+
.allowPolyglotAccess(PolyglotAccess.ALL)
101+
// choose the backend for the POSIX module
102+
.option("python.PosixModuleBackend", "java")
103+
// equivalent to the Python -B flag
104+
.option("python.DontWriteBytecodeFlag", "true")
105+
// equivalent to the Python -v flag
106+
.option("python.VerboseFlag", System.getenv("PYTHONVERBOSE") != null ? "true" : "false")
107+
// log level
108+
.option("log.python.level", System.getenv("PYTHONVERBOSE") != null ? "FINE" : "SEVERE")
109+
// equivalent to setting the PYTHONWARNINGS environment variable
110+
.option("python.WarnOptions", System.getenv("PYTHONWARNINGS") == null ? "" : System.getenv("PYTHONWARNINGS"))
111+
// print Python exceptions directly
112+
.option("python.AlwaysRunExcepthook", "true")
113+
// Force to automatically import site.py module, to make Python packages available
114+
.option("python.ForceImportSite", "true")
115+
// The sys.executable path, a virtual path that is used by the interpreter to discover packages
116+
.option("python.Executable", vfs.resourcePathToPlatformPath(VENV_PREFIX) + (VirtualFileSystem.isWindows() ? "\\Scripts\\python.exe" : "/bin/python"))
117+
// Do not warn if running without JIT. This can be desirable for short running scripts
118+
// to reduce memory footprint.
119+
.option("engine.WarnInterpreterOnly", "false");
120+
if (System.getProperty("org.graalvm.nativeimage.imagecode") != null) {
121+
// Set the python home to be read from the embedded resources
122+
builder.option("python.PythonHome", vfs.resourcePathToPlatformPath(HOME_PREFIX));
123+
}
124+
return builder.build();
125+
}
126+
}

0 commit comments

Comments
 (0)