From 2506902e4ff7197646be9e284dafe589371e3c0b Mon Sep 17 00:00:00 2001 From: Johan Larsson Date: Wed, 29 Nov 2023 16:45:01 +0100 Subject: [PATCH] fix: move installation dependencies to setup.py They were previously in pyproject.toml under buil-system, which was not the right way to do this. --- .github/workflows/ci.yaml | 2 +- pyproject.toml | 3 --- setup.py | 3 +++ 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index fb411f1..a6d498c 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -22,7 +22,7 @@ jobs: - name: Install dependencies run: | python -m pip install --upgrade pip - python -m pip install pybind11 setuptools numpy + python -m pip install pybind11 setuptools - name: Install run: python -m pip install . diff --git a/pyproject.toml b/pyproject.toml index a1aa13d..0c739ba 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -3,8 +3,5 @@ requires = [ "setuptools>=42", "wheel", "pybind11>=2.6.0", - "scipy", - "scikit-learn", - "numpy" ] build-backend = "setuptools.build_meta" diff --git a/setup.py b/setup.py index d59dce4..067d40d 100644 --- a/setup.py +++ b/setup.py @@ -13,6 +13,8 @@ exec(fp.read(), version) __version__ = version["__version__"] +install_requires = ["numpy", "scipy", "scikit-learn"] + ext_modules = [ Pybind11Extension( "_sortedl1", @@ -30,6 +32,7 @@ url="https://github.com/jolars/sortedl1", description="Sorted L-One Penalized Estimation (SLOPE)", long_description="", + install_requires=install_requires, ext_modules=ext_modules, cmdclass={"build_ext": build_ext}, zip_safe=False,