From 206a53dacdb5f3ffece719928679981767614d9a Mon Sep 17 00:00:00 2001 From: Kevin Sheppard Date: Tue, 12 Oct 2021 17:12:26 +0100 Subject: [PATCH] MAINT: Update setup to reflect correct requirements Only list NumPy as an install requirement --- pyproject.toml | 4 ++-- requirements.txt | 2 +- setup.py | 6 ++++-- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 31b4ac0c8..fcca015eb 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,9 +1,9 @@ [build-system] requires = [ - "packaging==20.5; platform_machine=='arm64'", # macos M1 + "packaging>=21.0; platform_machine=='arm64'", "setuptools", "wheel", - "Cython>=0.29.22,<3.0", # Note: keep in sync with tools/cythonize.py + "Cython>=0.29.24,<3.0", "numpy==1.16.6; python_version<='3.7'", "numpy==1.17.5; python_version=='3.8'", "numpy==1.19.5; python_version=='3.9'", diff --git a/requirements.txt b/requirements.txt index 15622dfc1..8b82ee104 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,4 +1,4 @@ numpy>=1.14 -cython>=0.29.22 +cython>=0.29.24 setuptools wheel diff --git a/setup.py b/setup.py index 1e97ad0a2..265cd8682 100644 --- a/setup.py +++ b/setup.py @@ -25,7 +25,8 @@ raise ImportError("tempita required to install, use pip install tempita") with open("requirements.txt") as f: - required = f.read().splitlines() + setup_required = f.read().splitlines() +install_required = [pkg for pkg in setup_required if "numpy" in pkg] CYTHON_COVERAGE = os.environ.get("RANDOMGEN_CYTHON_COVERAGE", "0") in ( "true", @@ -384,6 +385,7 @@ def is_pure(self): "RDRAND", ], zip_safe=False, - install_requires=required, + install_requires=install_required, + setup_requires=setup_required, python_requires=">=3.6", )