From 88e83ddae526abcb0f99b3dc9d933ba062ec0c85 Mon Sep 17 00:00:00 2001 From: Damien Elmes Date: Sun, 5 Jan 2020 07:30:17 +1000 Subject: [PATCH] wheel deps should be checked at install time, not build time --- pylib/setup.py | 10 +++------- qt/setup.py | 9 +++------ 2 files changed, 6 insertions(+), 13 deletions(-) diff --git a/pylib/setup.py b/pylib/setup.py index cd3b35a93..6cf28b324 100644 --- a/pylib/setup.py +++ b/pylib/setup.py @@ -3,12 +3,6 @@ import setuptools, sys with open("../meta/version") as fh: version = fh.read().strip() -platform_reqs = [] -if sys.platform == "win32": - platform_reqs.append("psutil") -if sys.platform != "win32" and sys.platform != "darwin": - platform_reqs.append("distro") - setuptools.setup( name="anki", version=version, @@ -26,5 +20,7 @@ setuptools.setup( 'requests', 'decorator', 'protobuf', - ] + platform_reqs + 'psutil; sys_platform == "win32"', + 'distro; sys_platform != "darwin" and sys_platform != "win32"' + ] ) diff --git a/qt/setup.py b/qt/setup.py index 0ead94093..43367c49d 100644 --- a/qt/setup.py +++ b/qt/setup.py @@ -3,10 +3,6 @@ import setuptools, sys, os with open("../meta/version") as fh: version = fh.read().strip() -platform_reqs = [] -if sys.platform == "win32": - platform_reqs.append("psutil") - def package_files(directory): entries = [] for (path, directories, filenames) in os.walk(directory): @@ -34,6 +30,7 @@ setuptools.setup( 'send2trash', 'pyaudio', 'markdown', - 'jsonschema' - ] + platform_reqs + 'jsonschema', + 'psutil; sys.platform == "win32"', + ] )