Skip to content

Commit 12cdd53

Browse files
eregonansalond
authored andcommitted
[GR-56099] Merge master in 24.1 release branch
PullRequest: graalpython/3416
2 parents 91beace + a686cb9 commit 12cdd53

File tree

488 files changed

+14482
-9273
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

488 files changed

+14482
-9273
lines changed

.gitignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,5 +90,6 @@ graalpython/graalpy-maven-plugin/target
9090
graalpython/graalpy-archetype-polyglot-app/target
9191
graalpython/graalpy-micronaut-embedding/target
9292
graalpython/com.oracle.graal.python.test/src/tests/standalone/micronaut/hello/target/
93+
graalpython/com.oracle.graal.python.test/src/tests/cpyext/build/
9394
pom-mx.xml
94-
.venv
95+
.venv

CHANGELOG.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,16 @@
33
This changelog summarizes major changes between GraalVM versions of the Python
44
language runtime. The main focus is on user-observable behavior of the engine.
55

6+
## Version 24.2.0
7+
* Updated developer metadata of Maven artifacts.
8+
69
## Version 24.1.0
710
* Update to Python 3.11.7
811
* We now provide intrinsified `_pickle` module also in the community version.
12+
* `polyglot.eval` now raises more meaningful exceptions. Unavaliable languages raise `ValueError`. Exceptions from the polyglot language are raised directly as interop objects (typed as `polyglot.ForeignException`). The shortcut for executing python files without specifying language has been removed, use regular `eval` for executing Python code.
13+
* In Jython emulation mode we now magically fall back to calling Java getters or setters when using Python attribute access for non-visible properties. This can help migrating away from Jython if you relied on this behavior.
14+
* The option `python.EmulateJython` to enable Jython emulation is now marked as stable, and can thus be relied upon in production.
15+
* Fixed parsing of pyvenv.cfg according to PEP 405, which is required to use [uv](https://github.com/astral-sh/uv?tab=readme-ov-file#uv) generated venvs with GraalPy.
916

1017
## Version 24.0.0
1118
* We now provide a collection of recipes in the form of GitHub Actions to build popular native extensions on GraalPy. These provide a reproducible way for the community to build native extensions for GraalPy with the correct dependencies. See scripts/wheelbuilder/README.md for details.

ci.jsonnet

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{ "overlay": "e8d5ccf73763d1522c237072ed831e91b811ed9f" }
1+
{ "overlay": "9d0f6e553533cf857ff21d485094ece21f9e7771" }

graalpython/com.oracle.graal.python.annotations/src/com/oracle/graal/python/annotations/Slot.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,9 @@
9494
enum SlotKind {
9595
nb_bool,
9696
sq_length,
97+
sq_item,
9798
mp_length,
99+
mp_subscript,
98100
tp_descr_get,
99101
tp_descr_set,
100102
tp_getattro,

graalpython/com.oracle.graal.python.cext/CMakeLists.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,6 @@ endfunction()
186186
add_library(${TARGET_LIBPYTHON} SHARED)
187187
native_module("_cpython_sre" TRUE "${SRC_DIR}/modules/_cpython_sre/sre.c")
188188
simple_native_module("_cpython_unicodedata")
189-
simple_native_module("_cpython_struct")
190189
if(NOT WIN32)
191190
simple_native_module("termios")
192191
endif()

graalpython/com.oracle.graal.python.cext/include/methodobject.h

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* Copyright (c) 2018, 2023, Oracle and/or its affiliates.
1+
/* Copyright (c) 2018, 2024, Oracle and/or its affiliates.
22
* Copyright (C) 1996-2020 Python Software Foundation
33
*
44
* Licensed under the PYTHON SOFTWARE FOUNDATION LICENSE VERSION 2
@@ -125,6 +125,10 @@ PyAPI_FUNC(PyObject *) PyCMethod_New(PyMethodDef *, PyObject *,
125125
#define METH_METHOD 0x0200
126126
#endif
127127

128+
// GraalPy public API functions
129+
PyAPI_FUNC(const char*) GraalPyCFunction_GetDoc(PyObject *func);
130+
PyAPI_FUNC(void) GraalPyCFunction_SetDoc(PyObject *func, const char *doc);
131+
128132

129133
#ifndef Py_LIMITED_API
130134
# define Py_CPYTHON_METHODOBJECT_H

graalpython/com.oracle.graal.python.cext/include/pyconfig.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -165,6 +165,7 @@
165165
#define HAVE_WCHAR_H 1
166166

167167
#define WITH_THREAD 1
168+
#define WITH_DOC_STRINGS 1
168169

169170
#ifndef MS_WINDOWS
170171
#define HAVE_UNISTD_H

0 commit comments

Comments
 (0)