Repository navigation
Sync with upstream (2 commits through 552e598353) - #8
Merged
Merged
Conversation
Sam Gammon (sgammon)
force-pushed
the
upstream/sync-2026-10-17
branch
from
October 17, 2026 22:25
8301708 to
8724f9b
Compare
Sam Gammon (sgammon)
force-pushed
the
upstream/sync-2026-10-17
branch
from
October 17, 2026 23:06
8724f9b to
7a4a3fd
Compare
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Brings
elide-25.5.xup to graalvm/graalpython master972404ceb7(2026-10-16), minus the commits skipped below. Cherry-picked with-x; please rebase-merge so the(cherry picked from commit ...)trailers are kept.Picked (2)
aaa08da195[GR-80371] Exclude generated C API assertions from JaCoCo552e598353Update unittest tagsNo conflicts.
Skipped (7), with reasons
bdac2d9d13,f76c88df79,ff0c9aeded,c84c43dbd8(PosixSupportLibrary conversions): already on the fork. Upstream sync: 112 commits through upstream a099d00643, and CI on self-hosted runners #6 picked them (asb75b30c40d,d5e2dccc7c,6391368bda,0ee91303fd);bdac2d9d13andc84c43dbd8needed conflict resolution inPosixModuleBuiltins(see Upstream sync: 112 commits through upstream a099d00643, and CI on self-hosted runners #6), so their patch-ids differ andgit log --cherry-pickstill lists them. Thecherry picked fromtrailers confirm they are present.d0e46126b0Update imports: not taken. It moves thetools/regexpins inmx.graalpython/suite.pyto oracle/graalf1dce3f84de, which is not an ancestor of the fork's graalelide-25.5.xorupstream/wave-10, and bumps labsjdk (jvmci-25.4-b23 to 25.5-b24), mx (7.87.0 to 7.88.0) and the GraalOS resource pins inci/graal/common.json/graalos_versions.json. The fork keeps the pin at5727d2bee28(as in Upstream sync: 112 commits through upstream a099d00643, and CI on self-hosted runners #6). It should be taken together with the matching graal and JDK update.972404ceb7Preserve pending input during terminal initialization (GR-80639): blocked on the graal pin, not on content. It callsTerminalBuilder.graphemeCluster(false), which the JLine on the pinned graal5727d2bee28does not have, so CI fails withcannot find symbolinJLineConsoleHandler.java:103(the first push of this PR included it and failed style-gate, abi-check, tier2/3 python-svm builds for that reason). It builds against the fork's graalwave-10, which carries the newer JLine, so it can follow when the graal pin moves forward together withd0e46126b0.af3256cc9aFix style (TpSlotDescrGetpermitsindentation): the style gate here runs the eclipse formatter of the pinned graal5727d2bee28, which wants the previous indentation. With this commit the gate fails (CodeFormatCheck: 1 files were modified,TpSlotDescrGet.java). It goes together with the newer graal import (d0e46126b0).Testing
Sibling layout: graal =
elide/upstream/wave-10(14403bb2cda), graalpython = this branch plus972404ceb7andaf3256cc9a(tested locally before it was dropped), labsjdk-ce-latest-jvmci-25.4-b23.mx build --build-logs=silent: OK.mx graalpytest tests/test_posix.py tests/test_pickle.py: 96 run, 88 passed, 8 skipped, 0 failed.mx graalpytest --tagged test_os.py test_posix.py test_genericpath.py test_mmap.py test_locale.py test_site.py: 400 run, all passed (these cover the retagged files).972404ceb7applied,graalpy -iunder a pty withprint(6*7)queued before startup executes it and prints 42.