From d214e606db41cfbcf63138e3c3f8659484294d73 Mon Sep 17 00:00:00 2001 From: Robin Dunn Date: Tue, 21 May 2019 12:13:05 -0700 Subject: [PATCH] Split the requirements list into two lists, load install_requires list from one of them. (cherry picked from commit 4b3f422806ed08a7edfdba7ea347077ff72d787e) --- requirements.txt | 15 +-------------- requirements/devel.txt | 12 ++++++++++++ requirements/install.txt | 4 ++++ setup.py | 8 ++++---- 4 files changed, 21 insertions(+), 18 deletions(-) create mode 100644 requirements/devel.txt create mode 100644 requirements/install.txt diff --git a/requirements.txt b/requirements.txt index d6fbaceb..2d46c3cd 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,14 +1 @@ -# Phoenix build and test requirements -appdirs -setuptools -six -wheel -twine -sphinx -requests -pytest -pytest-xdist -pytest-timeout -numpy -pillow -pathlib2 +-r requirements/devel.txt diff --git a/requirements/devel.txt b/requirements/devel.txt new file mode 100644 index 00000000..80c2ff07 --- /dev/null +++ b/requirements/devel.txt @@ -0,0 +1,12 @@ +# Python packages needed for building and testing wxPython Phoenix +-r install.txt +appdirs +setuptools +wheel +twine +sphinx +requests +pytest +pytest-xdist +pytest-timeout +pathlib2 diff --git a/requirements/install.txt b/requirements/install.txt new file mode 100644 index 00000000..36b286b6 --- /dev/null +++ b/requirements/install.txt @@ -0,0 +1,4 @@ +# Runtime dependencies needed when using wxPython Phoenix +numpy +pillow +six diff --git a/setup.py b/setup.py index 63ce99b3..43836730 100644 --- a/setup.py +++ b/setup.py @@ -89,9 +89,9 @@ Programming Language :: Python :: Implementation :: CPython Topic :: Software Development :: User Interfaces """ -DEPENDENCIES = [ 'six', - 'Pillow', - ] +INSTALL_REQUIRES = [line.strip() + for line in open('requirements/install.txt').readlines() + if not line.startswith('#')] isWindows = sys.platform.startswith('win') isDarwin = sys.platform == "darwin" @@ -356,7 +356,7 @@ if __name__ == '__main__': platforms = PLATFORMS, classifiers = [c for c in CLASSIFIERS.split("\n") if c], keywords = KEYWORDS, - install_requires = DEPENDENCIES, + install_requires = INSTALL_REQUIRES, zip_safe = False, use_2to3 = False, include_package_data = True,