Commit 72a5990b authored by Jason Madden's avatar Jason Madden Committed by GitHub

Merge pull request #1644 from gevent/test-newer-psutil-pypy

Relax the psutil version pin for PyPy.
parents c2d7a7d3 160f59e9
Relax the version constraint for psutil on PyPy.
Previously it was pinned to 5.6.3 for PyPy2, except for on Windows,
where it was excluded. It is now treated the same as CPython again.
......@@ -301,12 +301,12 @@ EXTRA_EVENTS = [
]
EXTRA_PSUTIL_DEPS = [
# psutil fails to build on PyPy on Windows. (TODO: Is that still the case?)
# Versions of PyPy2 prior to 7.4 (maybe?) are incompatible with
# psutil >= 5.6.4.
# Versions of PyPy2 prior to 7.3.1 (maybe?) are incompatible with
# psutil >= 5.6.4. 5.7.0 seems to work.
# https://github.com/giampaolo/psutil/issues/1659
'psutil >= 5.6.1 ; platform_python_implementation == "CPython" or python_version!="2.7"',
'psutil == 5.6.3 ; platform_python_implementation=="PyPy" and python_version=="2.7" and sys_platform != "win32"',
# PyPy on Windows can't build psutil, it fails to link with the missing symbol
# PyErr_SetFromWindowsErr.
'psutil >= 5.7.0; sys_platform != "win32" or platform_python_implementation == "CPython"',
]
EXTRA_MONITOR = [
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment