[GR-65634] Start 26.0.0 dev cycle.

ansalond · ansalond · commit 5e846266a4dd · 2025-06-10T16:46:25.000Z
PullRequest: graalpython/3830
diff --git a/ci.jsonnet b/ci.jsonnet
@@ -1 +1 @@
-{ "overlay": "085931c8fed2b4635554b514af888554ef775385" }
+{ "overlay": "f942d7813c6847f2b87d5704228d40b2c242ba1f" }
diff --git a/graalpython/com.oracle.graal.python.test.integration/pom.xml b/graalpython/com.oracle.graal.python.test.integration/pom.xml
@@ -64,7 +64,7 @@ Additionally, one can change the polyglot artifacts version with
         <maven.compiler.source>17</maven.compiler.source>
         <maven.compiler.target>17</maven.compiler.target>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <com.oracle.graal.python.test.polyglot.version>25.0.0</com.oracle.graal.python.test.polyglot.version>
+        <com.oracle.graal.python.test.polyglot.version>26.0.0</com.oracle.graal.python.test.polyglot.version>
     </properties>
 
     <build>
diff --git a/graalpython/com.oracle.graal.python.test/src/tests/standalone/gradle/build/build.gradle b/graalpython/com.oracle.graal.python.test/src/tests/standalone/gradle/build/build.gradle
@@ -1,6 +1,6 @@
 plugins {
     id "application"
-    id 'org.graalvm.python' version '25.0.0'
+    id 'org.graalvm.python' version '26.0.0'
     id "org.graalvm.buildtools.native" version "0.10.2"
 }
 
diff --git a/graalpython/com.oracle.graal.python.test/src/tests/standalone/gradle/build/build.gradle.kts b/graalpython/com.oracle.graal.python.test/src/tests/standalone/gradle/build/build.gradle.kts
@@ -1,6 +1,6 @@
 plugins {
     application
-    id("org.graalvm.python") version "25.0.0"
+    id("org.graalvm.python") version "26.0.0"
     id("org.graalvm.buildtools.native") version "0.10.2"
 }
 
diff --git a/graalpython/com.oracle.graal.python.test/src/tests/standalone/jbang/EmptyPIPComments.j b/graalpython/com.oracle.graal.python.test/src/tests/standalone/jbang/EmptyPIPComments.j
@@ -1,6 +1,6 @@
 ///usr/bin/env jbang "$0" "$@" ; exit $?
 
-//DEPS org.graalvm.python:jbang:${env.GRAALPY_VERSION:25.0.0}
+//DEPS org.graalvm.python:jbang:${env.GRAALPY_VERSION:26.0.0}
 //PIP
 // one blank after PIP
 //PIP 
diff --git a/graalpython/com.oracle.graal.python.test/src/tests/standalone/jbang/EmptyPythonResourceComment.j b/graalpython/com.oracle.graal.python.test/src/tests/standalone/jbang/EmptyPythonResourceComment.j
@@ -1,6 +1,6 @@
 ///usr/bin/env jbang "$0" "$@" ; exit $?
 
-//DEPS org.graalvm.python:jbang:${env.GRAALPY_VERSION:25.0.0}
+//DEPS org.graalvm.python:jbang:${env.GRAALPY_VERSION:26.0.0}
 //PYTHON_RESOURCES_DIRECTORY
 
 public class EmptyPythonResourceComment {
diff --git a/graalpython/com.oracle.graal.python.test/src/tests/standalone/jbang/EmptyPythonResourceCommentWithBlanks.j b/graalpython/com.oracle.graal.python.test/src/tests/standalone/jbang/EmptyPythonResourceCommentWithBlanks.j
@@ -1,6 +1,6 @@
 ///usr/bin/env jbang "$0" "$@" ; exit $?
 
-//DEPS org.graalvm.python:jbang:${env.GRAALPY_VERSION:25.0.0}
+//DEPS org.graalvm.python:jbang:${env.GRAALPY_VERSION:26.0.0}
 // resource dir with blanks
 //PYTHON_RESOURCES_DIRECTORY   
 
diff --git a/graalpython/com.oracle.graal.python.test/src/tests/standalone/jbang/NoPackagesResourcesDir.j b/graalpython/com.oracle.graal.python.test/src/tests/standalone/jbang/NoPackagesResourcesDir.j
@@ -1,6 +1,6 @@
 ///usr/bin/env jbang "$0" "$@" ; exit $?
 
-//DEPS org.graalvm.python:jbang:${env.GRAALPY_VERSION:25.0.0}
+//DEPS org.graalvm.python:jbang:${env.GRAALPY_VERSION:26.0.0}
 //PYTHON_RESOURCES_DIRECTORY python-resources
 
 public class NoPackagesResourcesDir {
diff --git a/graalpython/com.oracle.graal.python.test/src/tests/standalone/jbang/TwoPythonResourceComments.j b/graalpython/com.oracle.graal.python.test/src/tests/standalone/jbang/TwoPythonResourceComments.j
@@ -1,6 +1,6 @@
 ///usr/bin/env jbang "$0" "$@" ; exit $?
 
-//DEPS org.graalvm.python:jbang:${env.GRAALPY_VERSION:25.0.0}
+//DEPS org.graalvm.python:jbang:${env.GRAALPY_VERSION:26.0.0}
 //PYTHON_RESOURCES_DIRECTORY
 //PYTHON_RESOURCES_DIRECTORY
 
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/str/StringUtils.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/str/StringUtils.java
@@ -320,21 +320,36 @@ static boolean doString(TruffleString str,
             }
             TruffleStringIterator it = createCodePointIteratorNode.execute(str, TS_ENCODING);
             int c = nextNode.execute(it);
-            if (c != '_' && !hasProperty(c, UProperty.XID_START)) {
+            if (c != '_' && !isIdentifierStart(c)) {
                 return false;
             }
             while (it.hasNext()) {
                 c = nextNode.execute(it);
-                if (!hasProperty(c, UProperty.XID_CONTINUE)) {
+                if (!isIdentifierPart(c)) {
                     return false;
                 }
             }
             return true;
         }
 
         @TruffleBoundary
-        static boolean hasProperty(int codePoint, int property) {
-            return UCharacter.hasBinaryProperty(codePoint, property);
+        static boolean isIdentifierStart(int codePoint) {
+            if (ImageInfo.inImageBuildtimeCode()) {
+                // Avoid initializing ICU4J at image build time
+                return Character.isUnicodeIdentifierStart(codePoint);
+            } else {
+                return UCharacter.hasBinaryProperty(codePoint, UProperty.XID_START);
+            }
+        }
+
+        @TruffleBoundary
+        static boolean isIdentifierPart(int codePoint) {
+            if (ImageInfo.inImageBuildtimeCode()) {
+                // Avoid initializing ICU4J at image build time
+                return Character.isUnicodeIdentifierPart(codePoint);
+            } else {
+                return UCharacter.hasBinaryProperty(codePoint, UProperty.XID_CONTINUE);
+            }
         }
     }
 
diff --git a/graalpython/graalpy-archetype-polyglot-app/pom.xml b/graalpython/graalpy-archetype-polyglot-app/pom.xml
@@ -45,7 +45,7 @@ SOFTWARE.
   <groupId>org.graalvm.python</groupId>
   <artifactId>graalpy-archetype-polyglot-app</artifactId>
   <!-- This version is always overridden when deploying using mx -->
-  <version>25.0.0</version>
+  <version>26.0.0</version>
   <url>http://www.graalvm.org/python</url>
   <description>Maven archetype providing a skeleton GraalPy - Java polyglot application.</description>
   <packaging>maven-archetype</packaging>
diff --git a/graalpython/graalpy-archetype-polyglot-app/src/main/resources/archetype-resources/pom.xml b/graalpython/graalpy-archetype-polyglot-app/src/main/resources/archetype-resources/pom.xml
@@ -10,7 +10,7 @@
 
 #set( $symbol_dollar = '$' )
   <properties>
-    <graalpy.version>25.0.0</graalpy.version>
+    <graalpy.version>26.0.0</graalpy.version>
     <graalpy.edition>python-community</graalpy.edition>
     <native-maven-plugin.version>0.10.4</native-maven-plugin.version>
     <maven.compiler.target>17</maven.compiler.target>
diff --git a/graalpython/graalpy-jbang/examples/hello.java b/graalpython/graalpy-jbang/examples/hello.java
@@ -40,7 +40,7 @@
  */
 ///usr/bin/env jbang "$0" "$@" ; exit $?
 //JAVA 17+
-//DEPS org.graalvm.python:jbang:${env.GRAALPY_VERSION:25.0.0}
+//DEPS org.graalvm.python:jbang:${env.GRAALPY_VERSION:26.0.0}
 // specify python packages and their versions as if used with pip
 //PIP termcolor==2.2
 
diff --git a/graalpython/graalpy-jbang/templates/graalpy-template.java.qute b/graalpython/graalpy-jbang/templates/graalpy-template.java.qute
@@ -5,7 +5,7 @@
 {/for}
 {#if dependencies.isEmpty()}// //DEPS <dependency1> <dependency2>{/if}
 {|
-//DEPS org.graalvm.python:jbang:${env.GRAALPY_VERSION:25.0.0}
+//DEPS org.graalvm.python:jbang:${env.GRAALPY_VERSION:26.0.0}
 // specify python packages and their versions as if used with pip
 //PIP termcolor==2.2
 |}
diff --git a/graalpython/graalpy-jbang/templates/graalpy-template_local_repo.java.qute b/graalpython/graalpy-jbang/templates/graalpy-template_local_repo.java.qute
@@ -8,7 +8,7 @@
 //REPOS mc=https://repo1.maven.org/maven2/
 //REPOS local=file://{path_to_local_repo}
 {|
-//DEPS org.graalvm.python:jbang:${env.GRAALPY_VERSION:25.0.0}
+//DEPS org.graalvm.python:jbang:${env.GRAALPY_VERSION:26.0.0}
 // specify python packages and their versions as if used with pip
 //PIP termcolor==2.2
 |}
diff --git a/graalpython/graalpy-maven-plugin/pom.xml b/graalpython/graalpy-maven-plugin/pom.xml
@@ -48,7 +48,7 @@ SOFTWARE.
   <artifactId>graalpy-maven-plugin</artifactId>
   <packaging>maven-plugin</packaging>
   <!-- This version is always overridden when deploying using mx -->
-  <version>25.0.0</version>
+  <version>26.0.0</version>
   <url>http://www.graalvm.org/python</url>
   <name>graalpy-maven-plugin</name>
   <description>Handles python related resources in a maven GraalPy - Java polyglot application.</description>
@@ -57,7 +57,7 @@ SOFTWARE.
     <maven.compiler.target>17</maven.compiler.target>
     <maven.compiler.source>17</maven.compiler.source>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <graalpy.version>25.0.0</graalpy.version>
+    <graalpy.version>26.0.0</graalpy.version>
   </properties>
 
   <profiles>
diff --git a/mx.graalpython/suite.py b/mx.graalpython/suite.py
@@ -9,7 +9,7 @@
     "name": "graalpython",
     "versionConflictResolution": "latest",
 
-    "version": "25.0.0",
+    "version": "26.0.0",
     "graalpython:pythonVersion": "3.12.8",
     "release": False,
     "groupId": "org.graalvm.python",
@@ -53,15 +53,15 @@
             },
             {
                 "name": "tools",
-                "version": "d019d3d3022c4b357be180478f83c26a7a0f1bc3",
+                "version": "69860d57908cd7b3691d6646687c1cecbe69f36b",
                 "subdir": True,
                 "urls": [
                     {"url": "https://github.com/oracle/graal", "kind": "git"},
                 ],
             },
             {
                 "name": "regex",
-                "version": "d019d3d3022c4b357be180478f83c26a7a0f1bc3",
+                "version": "69860d57908cd7b3691d6646687c1cecbe69f36b",
                 "subdir": True,
                 "urls": [
                     {"url": "https://github.com/oracle/graal", "kind": "git"},

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-{ "overlay": "085931c8fed2b4635554b514af888554ef775385" }`
	`1`	`+{ "overlay": "f942d7813c6847f2b87d5704228d40b2c242ba1f" }`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`plugins {`
`2`	`2`	`id "application"`
`3`		`- id 'org.graalvm.python' version '25.0.0'`
	`3`	`+ id 'org.graalvm.python' version '26.0.0'`
`4`	`4`	`id "org.graalvm.buildtools.native" version "0.10.2"`
`5`	`5`	`}`
`6`	`6`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`plugins {`
`2`	`2`	`application`
`3`		`- id("org.graalvm.python") version "25.0.0"`
	`3`	`+ id("org.graalvm.python") version "26.0.0"`
`4`	`4`	`id("org.graalvm.buildtools.native") version "0.10.2"`
`5`	`5`	`}`
`6`	`6`
Original file line number	Diff line number	Diff line change
`@@ -320,21 +320,36 @@ static boolean doString(TruffleString str,`
`320`	`320`	`}`
`321`	`321`	`TruffleStringIterator it = createCodePointIteratorNode.execute(str, TS_ENCODING);`
`322`	`322`	`int c = nextNode.execute(it);`
`323`		`- if (c != '_' && !hasProperty(c, UProperty.XID_START)) {`
	`323`	`+ if (c != '_' && !isIdentifierStart(c)) {`
`324`	`324`	`return false;`
`325`	`325`	`}`
`326`	`326`	`while (it.hasNext()) {`
`327`	`327`	`c = nextNode.execute(it);`
`328`		`- if (!hasProperty(c, UProperty.XID_CONTINUE)) {`
	`328`	`+ if (!isIdentifierPart(c)) {`
`329`	`329`	`return false;`
`330`	`330`	`}`
`331`	`331`	`}`
`332`	`332`	`return true;`
`333`	`333`	`}`
`334`	`334`
`335`	`335`	`@TruffleBoundary`
`336`		`- static boolean hasProperty(int codePoint, int property) {`
`337`		`- return UCharacter.hasBinaryProperty(codePoint, property);`
	`336`	`+ static boolean isIdentifierStart(int codePoint) {`
	`337`	`+ if (ImageInfo.inImageBuildtimeCode()) {`
	`338`	`+ // Avoid initializing ICU4J at image build time`
	`339`	`+ return Character.isUnicodeIdentifierStart(codePoint);`
	`340`	`+ } else {`
	`341`	`+ return UCharacter.hasBinaryProperty(codePoint, UProperty.XID_START);`
	`342`	`+ }`
	`343`	`+ }`
	`344`	`+`
	`345`	`+ @TruffleBoundary`
	`346`	`+ static boolean isIdentifierPart(int codePoint) {`
	`347`	`+ if (ImageInfo.inImageBuildtimeCode()) {`
	`348`	`+ // Avoid initializing ICU4J at image build time`
	`349`	`+ return Character.isUnicodeIdentifierPart(codePoint);`
	`350`	`+ } else {`
	`351`	`+ return UCharacter.hasBinaryProperty(codePoint, UProperty.XID_CONTINUE);`
	`352`	`+ }`
`338`	`353`	`}`
`339`	`354`	`}`
`340`	`355`