refactor pywin/pypy depswheels3

2 files changed, 6 insertions, 3 deletions

diff --git a/scripts/internal/winmake.py b/scripts/internal/winmake.py
index 4f6daaeb..3d9d0a8d 100755
--- a/scripts/internal/winmake.py
+++ b/scripts/internal/winmake.py
@@ -47,7 +47,6 @@ DEPS = [
     "pyreadline",
     "setuptools",
     "wheel",
-    "wmi",
     "requests"
 ]
 if sys.version_info[:2] <= (2, 7):
@@ -60,6 +59,7 @@ if sys.version_info[:2] <= (3, 4):
     DEPS.append('enum34')
 if not PYPY:
     DEPS.append("pywin32")
+    DEPS.append("wmi")
 
 _cmds = {}
 if PY3:
diff --git a/setup.py b/setup.py
index 38621015..3c442302 100755
--- a/setup.py
+++ b/setup.py
@@ -47,6 +47,7 @@ from _compat import PY3  # NOQA
 from _compat import which  # NOQA
 
 
+PYPY = '__pypy__' in sys.builtin_module_names
 macros = []
 if POSIX:
     macros.append(("PSUTIL_POSIX", 1))
@@ -71,10 +72,12 @@ extras_require = {"test": [
     "enum34; python_version <= '3.4'",
     "ipaddress; python_version < '3.0'",
     "mock; python_version < '3.0'",
-    "pywin32; sys.platform == 'win32'",
-    "wmi; sys.platform == 'win32'",
     "unittest2; python_version < '3.0'",
 ]}
+if not PYPY:
+    extras_require['test'].extend([
+        "pywin32; sys.platform == 'win32'",
+        "wmi; sys.platform == 'win32'"])
 
 
 def get_version():