From e9d63fdae1d5a7102645c05e57da28885fe15984 Mon Sep 17 00:00:00 2001 From: Michael Simacek Date: Mon, 20 May 2024 09:39:03 +0200 Subject: [PATCH 1/3] Relax IO encoding check GraalPy reads the variable too and we need to be able to run it with the variable unset to build a clean preinitialized context for native images. --- src/mx/_impl/support/logging.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/mx/_impl/support/logging.py b/src/mx/_impl/support/logging.py index 7abe85b3..cc74c90b 100644 --- a/src/mx/_impl/support/logging.py +++ b/src/mx/_impl/support/logging.py @@ -60,8 +60,12 @@ def _check_stdout_encoding(): # Importing here to avoid broken circular import + from .envvars import env_var_to_bool from .system import is_continuous_integration + if not env_var_to_bool("MX_CHECK_IOENCODING", "1"): + return + encoding = sys.stdout.encoding if "utf" not in encoding: @@ -69,7 +73,8 @@ def _check_stdout_encoding(): "Python's stdout does not use a unicode encoding.\n" "This may cause encoding errors when printing special characters.\n" "Please set up your system or console to use a unicode encoding.\n" - "When piping mx output, you can force UTF-8 encoding with the environment variable PYTHONIOENCODING=utf-8" + "When piping mx output, you can force UTF-8 encoding with the environment variable PYTHONIOENCODING=utf-8\n" + "This check can be disabled by setting MX_CHECK_IOENCODING=0 environment variable" ) if is_continuous_integration(): abort(msg) From a835fdfaf878ef565140194dc8b4a144faaf5873 Mon Sep 17 00:00:00 2001 From: Michael Simacek Date: Tue, 21 May 2024 10:16:25 +0200 Subject: [PATCH 2/3] Update mx version --- src/mx/_impl/mx.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/mx/_impl/mx.py b/src/mx/_impl/mx.py index aff051f3..1580229b 100755 --- a/src/mx/_impl/mx.py +++ b/src/mx/_impl/mx.py @@ -18173,7 +18173,7 @@ def alarm_handler(signum, frame): _CACHE_DIR = get_env('MX_CACHE_DIR', join(dot_mx_dir(), 'cache')) # The version must be updated for every PR (checked in CI) and the comment should reflect the PR's issue -version = VersionSpec("7.25.4") # GR-54113 +version = VersionSpec("7.25.5") # [GR-54154] Relax IO encoding check _mx_start_datetime = datetime.utcnow() From 835127077c95f871dc51f938e21096446a3f0c13 Mon Sep 17 00:00:00 2001 From: Michael Simacek Date: Wed, 22 May 2024 08:11:43 +0200 Subject: [PATCH 3/3] Sync common.json --- common.json | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/common.json b/common.json index 369e9048..95763516 100644 --- a/common.json +++ b/common.json @@ -45,13 +45,13 @@ "labsjdk-ee-21-llvm": {"name": "labsjdk", "version": "ee-21.0.2+13-jvmci-23.1-b33-sulong", "platformspecific": true }, "graalvm-ee-21": {"name": "graalvm-java21", "version": "23.1.3", "platformspecific": true }, - "oraclejdk-latest": {"name": "jpg-jdk", "version": "23", "build_id": "jdk-23+22", "platformspecific": true, "extrabundles": ["static-libs"]}, - "labsjdk-ce-latest": {"name": "labsjdk", "version": "ce-23+22-jvmci-b01", "platformspecific": true }, - "labsjdk-ce-latestDebug": {"name": "labsjdk", "version": "ce-23+22-jvmci-b01-debug", "platformspecific": true }, - "labsjdk-ce-latest-llvm": {"name": "labsjdk", "version": "ce-23+22-jvmci-b01-sulong", "platformspecific": true }, - "labsjdk-ee-latest": {"name": "labsjdk", "version": "ee-23+22-jvmci-b01", "platformspecific": true }, - "labsjdk-ee-latestDebug": {"name": "labsjdk", "version": "ee-23+22-jvmci-b01-debug", "platformspecific": true }, - "labsjdk-ee-latest-llvm": {"name": "labsjdk", "version": "ee-23+22-jvmci-b01-sulong", "platformspecific": true } + "oraclejdk-latest": {"name": "jpg-jdk", "version": "23", "build_id": "jdk-23+23", "platformspecific": true, "extrabundles": ["static-libs"]}, + "labsjdk-ce-latest": {"name": "labsjdk", "version": "ce-23+23-jvmci-b01", "platformspecific": true }, + "labsjdk-ce-latestDebug": {"name": "labsjdk", "version": "ce-23+23-jvmci-b01-debug", "platformspecific": true }, + "labsjdk-ce-latest-llvm": {"name": "labsjdk", "version": "ce-23+23-jvmci-b01-sulong", "platformspecific": true }, + "labsjdk-ee-latest": {"name": "labsjdk", "version": "ee-23+23-jvmci-b01", "platformspecific": true }, + "labsjdk-ee-latestDebug": {"name": "labsjdk", "version": "ee-23+23-jvmci-b01-debug", "platformspecific": true }, + "labsjdk-ee-latest-llvm": {"name": "labsjdk", "version": "ee-23+23-jvmci-b01-sulong", "platformspecific": true } }, "eclipse": {