Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/actions/downstream-test/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ runs:
set -euo pipefail

python3 -m venv "$RUNNER_TEMP/uv-venv"
"$RUNNER_TEMP/uv-venv/bin/python" -m pip install "uv==0.11.21"
"$RUNNER_TEMP/uv-venv/bin/python" -m pip install "uv==0.13.4"
echo "$RUNNER_TEMP/uv-venv/bin" >> "$GITHUB_PATH"

- name: Get GraalPy CE dev build
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/_downstream-test-oracledb.yml
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ jobs:
needs: build-numpy-wheels
runs-on: ubuntu-latest
env:
PACKAGES_TO_BUILD: pyarrow==20.0.0
PACKAGES_TO_BUILD: pyarrow==24.0.0
PIP_FIND_LINKS: ${{ github.workspace }}/dependency-wheels
PIP_PREFER_BINARY: "1"
steps:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,7 @@
VERSION_PARAMETER = '<version>'
DEFAULT_PATCHES_URL = f'https://raw.githubusercontent.com/oracle/graalpython/refs/heads/github/patches/{VERSION_PARAMETER}/graalpython/lib-graalpython/patches/'

OVERRIDES_PATCHES_URL = 'PIP_GRAALPY_PATCHES_URL' in os.environ
PATCHES_URL = os.environ.get('PIP_GRAALPY_PATCHES_URL', DEFAULT_PATCHES_URL)
DISABLED_PATCHES_URL = 'disabled'
DISABLE_PATCHING = os.environ.get('PIP_GRAALPY_DISABLE_PATCHING', '').lower() in ('true', '1')
Expand Down Expand Up @@ -216,6 +217,8 @@ def from_url(cls, patches_url: str):
if not response.encoding:
response.encoding = 'utf-8'
metadata_content = response.text
except RepositoryNotFound:
raise
except Exception as e:
raise RepositoryException(f"'{METADATA_FILENAME}' cannot be retrieved': {e}")
return cls(patches_url, cls.metadata_from_string(metadata_content))
Expand Down Expand Up @@ -272,7 +275,7 @@ def create_patch_repository(patches_url, default_patches_path=DEFAULT_PATCHES_PA
try:
return repository_from_url_or_path(patches_url)
except RepositoryException as e:
if patches_url == DEFAULT_PATCHES_URL and isinstance(e, RepositoryNotFound):
if not OVERRIDES_PATCHES_URL and isinstance(e, RepositoryNotFound):
logger.info("No post-release patch repository published yet")
else:
logger.warning("Failed to load GraalPy patch repository: %s", e)
Expand Down
5 changes: 3 additions & 2 deletions mx.graalpython/mx_graalpython.py
Original file line number Diff line number Diff line change
Expand Up @@ -1689,15 +1689,16 @@ def graalpytest(args):
python_binary = args.python
if not python_binary:
is_graalpy = True
python_args = ["--experimental-options=true", "--python.EnableDebuggingBuiltins", *python_args]
if args.svm:
python_binary = graalpy_standalone_native()
elif 'graalpy' in os.path.basename(python_binary) or 'mxbuild' in python_binary:
is_graalpy = True
if is_graalpy:
gp_args = ["--experimental-options=true", "--python.EnableDebuggingBuiltins"]
if env.get("GRAALPYTEST_ALLOW_NO_JAVA_ASSERTIONS") != "true":
gp_args += ["--vm.ea", "--vm.esa", "--vm.Dpython.DetailedAsserts=true"]
mx.log(f"Executable seems to be GraalPy, prepending arguments: {gp_args}")
if args.python:
mx.log(f"Executable seems to be GraalPy, prepending arguments: {gp_args}")
python_args = [*gp_args, *python_args]
runner_args.append(f'--subprocess-args={shlex.join(arg for arg in python_args if arg != "-repeated-run")}')
if is_graalpy:
Expand Down
Loading