From c9faa5089dbb63f1a0bcf091c1c58b615c0ada57 Mon Sep 17 00:00:00 2001 From: Badr MOUFAD <65614794+Badr-MOUFAD@users.noreply.github.com> Date: Wed, 19 Apr 2023 17:21:42 +0200 Subject: [PATCH 1/2] MNT - remove requirements files (#285) --- .circleci/config.yml | 3 +-- MANIFEST.in | 1 - README.md | 2 +- doc/contribute.rst | 2 +- doc/doc-requirements.txt | 6 ------ pyproject.toml | 7 +++++++ requirements.txt | 10 ---------- 7 files changed, 10 insertions(+), 21 deletions(-) delete mode 100644 doc/doc-requirements.txt delete mode 100644 requirements.txt diff --git a/.circleci/config.yml b/.circleci/config.yml index b74273a6..32ae3fbd 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -46,9 +46,8 @@ jobs: name: Get Python running command: | python -m pip install --user --upgrade --progress-bar off pip - python -m pip install --user --upgrade --progress-bar off -r requirements.txt - python -m pip install --user --upgrade --progress-bar off -r doc/doc-requirements.txt python -m pip install --user -e . + python -m pip install --user --upgrade --progress-bar off -e .[doc] - save_cache: key: pip-cache diff --git a/MANIFEST.in b/MANIFEST.in index 69736e07..9eb973af 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -3,7 +3,6 @@ include *.md include *.in include LICENSE include celer/__init__.py -include requirements.txt recursive-include examples *.py recursive-include examples *.txt diff --git a/README.md b/README.md index 93e37ac0..282d3f5e 100644 --- a/README.md +++ b/README.md @@ -91,7 +91,7 @@ pip install -e . ```shell cd doc -pip install -r doc-requirements.txt +pip install -e .[doc] make html ``` diff --git a/doc/contribute.rst b/doc/contribute.rst index e85a3c8c..ee9f0684 100644 --- a/doc/contribute.rst +++ b/doc/contribute.rst @@ -57,7 +57,7 @@ contribute with code or documentation to celer. .. code-block:: shell $ cd doc - $ pip install -r doc-requirements.txt + $ pip install -e .[doc] $ make html diff --git a/doc/doc-requirements.txt b/doc/doc-requirements.txt deleted file mode 100644 index 5319867f..00000000 --- a/doc/doc-requirements.txt +++ /dev/null @@ -1,6 +0,0 @@ -numpydoc -pandas -pillow -furo -sphinx-copybutton -sphinx-gallery \ No newline at end of file diff --git a/pyproject.toml b/pyproject.toml index 0d16d06e..ba5abfda 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -25,3 +25,10 @@ version = {attr = "celer.__version__"} [project.urls] documentation = "https://mathurinm.github.io/celer/" repository = "https://github.com/mathurinm/celer.git" + + +[project.optional-dependencies] +doc = [ + "numpydoc", "pandas", "pillow", + "furo", "sphinx-copybutton", "sphinx-gallery" +] \ No newline at end of file diff --git a/requirements.txt b/requirements.txt deleted file mode 100644 index 63267a48..00000000 --- a/requirements.txt +++ /dev/null @@ -1,10 +0,0 @@ -Cython>=0.26 -download -libsvmdata -matplotlib>=2.0.0 -numpy>=1.12 -scikit-learn>=0.23 -scipy>=0.18.0 -seaborn>=0.7 -tqdm -xarray \ No newline at end of file From c1b564c3c0c8fc214deb67b57f4a4dd95f66121f Mon Sep 17 00:00:00 2001 From: mathurinm Date: Fri, 21 Jul 2023 11:03:49 +0200 Subject: [PATCH 2/2] MNT cosmit readme (#287) --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 282d3f5e..e9685b4d 100644 --- a/README.md +++ b/README.md @@ -26,7 +26,7 @@ Currently, the package handles the following problems: ## Why ``celer``? ``celer`` is specially designed to handle Lasso-like problems which makes it a fast solver of such problems. -``celer`` comes particularly with +In particular it comes with tools such as: - automated parallel cross-validation - support of sparse and dense data