Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gevent
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
gevent
Commits
72a5990b
Commit
72a5990b
authored
Jun 11, 2020
by
Jason Madden
Committed by
GitHub
Jun 11, 2020
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #1644 from gevent/test-newer-psutil-pypy
Relax the psutil version pin for PyPy.
parents
c2d7a7d3
160f59e9
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
9 additions
and
5 deletions
+9
-5
docs/changes/issue1643.bugfix
docs/changes/issue1643.bugfix
+4
-0
setup.py
setup.py
+5
-5
No files found.
docs/changes/issue1643.bugfix
0 → 100644
View file @
72a5990b
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.
setup.py
View file @
72a5990b
...
...
@@ -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
=
[
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment