diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index bc5b1e4d7c..5be824c1cb 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -29,11 +29,6 @@ jobs: - platform: ubuntu-latest python: "3.10" distutils: stdlib - exclude: - # The combination of PyPy+Windows+pytest-xdist+ProcessPoolExecutor is flaky/problematic - - platform: windows-2019 - python: pypy-3.7 - distutils: local runs-on: ${{ matrix.platform }} env: SETUPTOOLS_USE_DISTUTILS: ${{ matrix.distutils }} diff --git a/setuptools/tests/test_build_meta.py b/setuptools/tests/test_build_meta.py index eb43fe9b0e..c4cdda0306 100644 --- a/setuptools/tests/test_build_meta.py +++ b/setuptools/tests/test_build_meta.py @@ -18,6 +18,13 @@ IS_PYPY = '__pypy__' in sys.builtin_module_names +pytestmark = pytest.mark.skipif( + sys.platform == "win32" and IS_PYPY, + reason="The combination of PyPy + Windows + pytest-xdist + ProcessPoolExecutor " + "is flaky and problematic" +) + + class BuildBackendBase: def __init__(self, cwd='.', env={}, backend_name='setuptools.build_meta'): self.cwd = cwd