From fb6251ee801927f0913c733848f6da8ce2993d73 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Br=C3=A9nainn=20Woodsend?= Date: Fri, 17 Jun 2022 22:35:26 +0100 Subject: [PATCH 1/2] Renable CI/CD testing on PyPy for all platforms. PyPy's Windows unicode handling transpired to be significantly different enough that a PyPy+Windows specific test failure slipped in (#552). --- .github/workflows/test.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 63cecf2d..b3dd0d75 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -16,6 +16,8 @@ jobs: include: - { python-version: "3.10", os: windows-latest } - { python-version: "3.10", os: macos-latest } + - { python-version: "pypy-3.8", os: windows-latest } + - { python-version: "pypy-3.8", os: macos-latest } steps: - uses: actions/checkout@v2 From 404de1a66fa819e2e9c50a6f4b51da2fcab8991f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Br=C3=A9nainn=20Woodsend?= Date: Fri, 17 Jun 2022 22:42:06 +0100 Subject: [PATCH 2/2] xfail test_decode_surrogate_characters() on Windows PyPy. This feature needs fixing. See #552. --- .github/workflows/test.yml | 4 ++-- tests/test_ujson.py | 4 ++++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index b3dd0d75..ae8d4b80 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -14,10 +14,10 @@ jobs: python-version: ["pypy-3.8", "3.7", "3.8", "3.9", "3.10", "3.11-dev"] os: [ubuntu-latest] include: - - { python-version: "3.10", os: windows-latest } - - { python-version: "3.10", os: macos-latest } - { python-version: "pypy-3.8", os: windows-latest } - { python-version: "pypy-3.8", os: macos-latest } + - { python-version: "3.10", os: windows-latest } + - { python-version: "3.10", os: macos-latest } steps: - uses: actions/checkout@v2 diff --git a/tests/test_ujson.py b/tests/test_ujson.py index 266ae7ce..be506157 100644 --- a/tests/test_ujson.py +++ b/tests/test_ujson.py @@ -515,6 +515,10 @@ def test_encode_surrogate_characters(): assert ujson.dumps({"\ud800": "\udfff"}, ensure_ascii=False, sort_keys=True) == out2 +@pytest.mark.xfail( + hasattr(sys, "pypy_version_info") and os.name == "nt", + reason="This feature needs fixing! See #552", +) @pytest.mark.parametrize( "test_input, expected", [