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 .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand Down
14 changes: 1 addition & 13 deletions tests/test_common.py
Original file line number Diff line number Diff line change
Expand Up @@ -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