From 97ccf67bb3c8bc309e8d2302874f56c734628a1c Mon Sep 17 00:00:00 2001 From: Stas Bekman Date: Thu, 8 Apr 2021 15:10:44 -0700 Subject: [PATCH] [setup] extras[docs] must include 'all' (#11148) * extras[doc] must include 'all' * fix * better * regroup --- .circleci/config.yml | 4 ++-- setup.py | 24 ++++++++++++++---------- 2 files changed, 16 insertions(+), 12 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 999af392fbb3ca..ec9c5741fb24a1 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -348,7 +348,7 @@ jobs: - v0.4-{{ checksum "setup.py" }} - run: sudo apt-get -y update && sudo apt-get install -y libsndfile1-dev - run: pip install --upgrade pip - - run: pip install ."[all, docs]" + - run: pip install ."[docs]" - save_cache: key: v0.4-build_doc-{{ checksum "setup.py" }} paths: @@ -370,7 +370,7 @@ jobs: keys: - v0.4-deploy_doc-{{ checksum "setup.py" }} - v0.4-{{ checksum "setup.py" }} - - run: pip install ."[all,docs]" + - run: pip install ."[docs]" - save_cache: key: v0.4-deploy_doc-{{ checksum "setup.py" }} paths: diff --git a/setup.py b/setup.py index c3583a30700980..e942e65a7c0475 100644 --- a/setup.py +++ b/setup.py @@ -246,15 +246,7 @@ def run(self): + extras["retrieval"] + extras["modelcreation"] ) -extras["docs"] = deps_list( - "docutils", - "recommonmark", - "sphinx", - "sphinx-markdown-tables", - "sphinx-rtd-theme", - "sphinx-copybutton", - "sphinxext-opengraph", -) + extras["quality"] = deps_list("black", "isort", "flake8") extras["all"] = ( @@ -267,12 +259,24 @@ def run(self): + extras["vision"] ) +extras["docs_specific"] = deps_list( + "docutils", + "recommonmark", + "sphinx", + "sphinx-markdown-tables", + "sphinx-rtd-theme", + "sphinx-copybutton", + "sphinxext-opengraph", +) +# "docs" needs "all" to resolve all the references +extras["docs"] = extras["all"] + extras["docs_specific"] + extras["dev"] = ( extras["all"] + extras["testing"] + extras["quality"] + extras["ja"] - + extras["docs"] + + extras["docs_specific"] + extras["sklearn"] + extras["modelcreation"] )