Commit352434b

committed

Attempting to fix psutil dep due togiampaolo/psutil#1659

1 parenta4724a5 commit352434bCopy full SHA for 352434b

File tree

+10

-5

lines changed

+10

-5

lines changed

Lines changed: 10 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -279,14 +279,19 @@`
`279`	`279`	`'zope.event',`
`280`	`280`	`'zope.interface',`
`281`	`281`	`]`
`282`		`-# Fails to build on PyPy on Windows.`
`283`		`-# TODO: Is that still the case?`
`284`		`-EXTRA_PSUTIL_DEP='psutil >= 5.6.1 ; platform_python_implementation == "CPython" or sys_platform != "win32"'`
`285`	`282`
`286`		`-EXTRA_MONITOR= [`
`287`		`-EXTRA_PSUTIL_DEP,`
	`283`	`+EXTRA_PSUTIL_DEPS= [`
	`284`	`+# psutil fails to build on PyPy on Windows. (TODO: Is that still the case?)`
	`285`	`+# Versions of PyPy2 prior to 7.4 (maybe?) are incompatible with`
	`286`	`+# psutil >= 5.6.4.`
	`287`	`+# https://github.com/giampaolo/psutil/issues/1659`
	`288`	`+'psutil >= 5.6.1 ; platform_python_implementation == "CPython" or python_version!="2.7"',`
	`289`	`+'psutil == 5.6.3 ; platform_python_implementation=="PyPy" and python_version=="2.7" and sys_platform != "win32"',`
`288`	`290`	`]`
`289`	`291`
	`292`	`+EXTRA_MONITOR= [`
	`293`	`+]+EXTRA_PSUTIL_DEPS`
	`294`	`+`
`290`	`295`	`EXTRA_RECOMMENDED= [`
`291`	`296`	`# We need this at runtime to use the libev-CFFI and libuv backends`
`292`	`297`	`CFFI_DEP,`

Comments

(0)