From 106373a54444f66b12bf9d10ad86d1a3c2160a46 Mon Sep 17 00:00:00 2001 From: "Brutus (robot)" Date: Sun, 25 May 2025 20:22:47 +0000 Subject: [PATCH 1/2] Bump pyupgrade from v3.19.1 to v3.20.0 --- .pre-commit-config.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 0a9d1c4..f98c4dc 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -15,7 +15,7 @@ repos: - id: isort additional_dependencies: [toml] - repo: https://github.com/asottile/pyupgrade - rev: v3.19.1 + rev: v3.20.0 hooks: - id: pyupgrade args: [--py38-plus] From c1efd3b5859da949e21543d24542c6bc6dba2f8e Mon Sep 17 00:00:00 2001 From: Russell Keith-Magee Date: Mon, 26 May 2025 06:53:28 +0800 Subject: [PATCH 2/2] Remove Android special case for .pth testing. --- tests/test_common.py | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/tests/test_common.py b/tests/test_common.py index ee6040a..ad8b2fc 100644 --- a/tests/test_common.py +++ b/tests/test_common.py @@ -456,16 +456,4 @@ def test_pth_handling(): # When the .pth file is processed, the full standard library should be # available. Check if the initialization process could import socket. - if sys.platform == "android" or hasattr(sys, "getandroidapilevel"): - # Android is known to have an issue with .pth/sys.path ordering that - # causes this test to fail. For now, accept this as an XFAIL; if it - # passes, fail as an indicator that the bug has been resolved, and we - # can simplify the test. - if pth_tester.has_socket: - pytest.fail("Android .pth handling bug has been resolved.") - else: - pytest.xfail( - "On Android, .pth files are processed before sys.path is finalized." - ) - else: - assert pth_tester.has_socket + assert pth_tester.has_socket