From 63d8912b5f2190facc2759601668a17d6dd99b1d Mon Sep 17 00:00:00 2001 From: Patrick Ziegler Date: Tue, 2 Apr 2024 11:53:59 +0200 Subject: [PATCH 1/4] [GR-48911] Remove explicit export of argparse.Action All downstream uses have been removed and the module interceptor would still properly redirect new uses and produce a deprecation warning --- src/mx_unittest.py | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/src/mx_unittest.py b/src/mx_unittest.py index a76b4fac..4978f768 100644 --- a/src/mx_unittest.py +++ b/src/mx_unittest.py @@ -42,10 +42,7 @@ from mx._impl.mx_unittest import __all__ as _unittest_symbols -# TODO: [GR-48911] Users should rather use argparse.Action -__legacy__ = ["Action"] - -__all__ = _unittest_symbols + __legacy__ +__all__ = _unittest_symbols _redirect( __name__, From 3b8d3f73b1eceec04532a156f918ee0ee35b3856 Mon Sep 17 00:00:00 2001 From: Patrick Ziegler Date: Thu, 28 Mar 2024 10:15:37 +0100 Subject: [PATCH 2/4] Fix reference to JARDistribution in mx instead of mx_jardistribution --- src/mx/_impl/mx_compat.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/mx/_impl/mx_compat.py b/src/mx/_impl/mx_compat.py index 6e05c9a3..25762860 100644 --- a/src/mx/_impl/mx_compat.py +++ b/src/mx/_impl/mx_compat.py @@ -160,7 +160,7 @@ def __repr__(self): def jarsUseJDKDiscriminant(self): """ - Should `mx.JARDistribution` use the jdk version used for the build as a `Dependency._extra_artifact_discriminant` + Should `mx_jardistribution.JARDistribution` use the jdk version used for the build as a `Dependency._extra_artifact_discriminant` to avoid collisions of build artifacts when building with different JAVA_HOME/EXTRA_JAVA_HOMES settings. """ return False From 5cce62107561a2f05633d49ebb0bb62993a18d3c Mon Sep 17 00:00:00 2001 From: Patrick Ziegler Date: Tue, 2 Apr 2024 11:56:09 +0200 Subject: [PATCH 3/4] Bump 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 1300122a..06f84697 100755 --- a/src/mx/_impl/mx.py +++ b/src/mx/_impl/mx.py @@ -18146,7 +18146,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.21.0") # [GR-53335] Fix arguments parsing in mx intellijinit +version = VersionSpec("7.21.1") # [GR-51531] Fix more accesses to indirect mx imports _mx_start_datetime = datetime.utcnow() From 943c9587fa742b06676db6183593508b2b3fba8d Mon Sep 17 00:00:00 2001 From: Patrick Ziegler Date: Mon, 8 Apr 2024 16:39:54 +0200 Subject: [PATCH 4/4] Export webserver from main mx module It doesn't really make sense to proxy mx_webserver just for the webserver symbol --- src/mx/_impl/mx.py | 1 + 1 file changed, 1 insertion(+) diff --git a/src/mx/_impl/mx.py b/src/mx/_impl/mx.py index 06f84697..1d0eb7d2 100755 --- a/src/mx/_impl/mx.py +++ b/src/mx/_impl/mx.py @@ -311,6 +311,7 @@ "main", "version", "JavaCompliance", # Re-export from mx_javacompliance + "webserver", # Re-export from mx_webserver ] import sys