From 75eb207c89b3e2042c7a4173048ade27718ef532 Mon Sep 17 00:00:00 2001 From: Sylvain Gugger Date: Wed, 4 Nov 2020 10:54:02 -0500 Subject: [PATCH 1/5] Try -j option --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 9427e28416df11..8ecf5a64916456 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -287,7 +287,7 @@ jobs: key: v0.4-build_doc-{{ checksum "setup.py" }} paths: - '~/.cache/pip' - - run: cd docs && make html SPHINXOPTS="-W" + - run: cd docs && make html -j 4 SPHINXOPTS="-W" - store_artifacts: path: ./docs/_build From c2a192a572d817a6b3f71b14838745c012997f8b Mon Sep 17 00:00:00 2001 From: Sylvain Gugger Date: Wed, 4 Nov 2020 11:01:31 -0500 Subject: [PATCH 2/5] Try other thing --- docs/source/conf.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/docs/source/conf.py b/docs/source/conf.py index e9dd01b4c4b57f..d37b08f7fee494 100644 --- a/docs/source/conf.py +++ b/docs/source/conf.py @@ -91,7 +91,8 @@ # documentation. # html_theme_options = { - 'analytics_id': 'UA-83738774-2' + 'analytics_id': 'UA-83738774-2', + 'navigation_depth': 2, } # Add any paths that contain custom static files (such as style sheets) here, From 69611cb3c0c4b72ea7da12917c486d973572c4d3 Mon Sep 17 00:00:00 2001 From: Sylvain Gugger Date: Wed, 4 Nov 2020 11:06:09 -0500 Subject: [PATCH 3/5] Bigger machine --- .circleci/config.yml | 4 ++-- docs/source/conf.py | 3 +-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 8ecf5a64916456..abd94487c3d42b 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -274,7 +274,7 @@ jobs: working_directory: ~/transformers docker: - image: circleci/python:3.6 - resource_class: large + resource_class: xlarge steps: - checkout - restore_cache: @@ -287,7 +287,7 @@ jobs: key: v0.4-build_doc-{{ checksum "setup.py" }} paths: - '~/.cache/pip' - - run: cd docs && make html -j 4 SPHINXOPTS="-W" + - run: cd docs && make html SPHINXOPTS="-W" - store_artifacts: path: ./docs/_build diff --git a/docs/source/conf.py b/docs/source/conf.py index d37b08f7fee494..e9dd01b4c4b57f 100644 --- a/docs/source/conf.py +++ b/docs/source/conf.py @@ -91,8 +91,7 @@ # documentation. # html_theme_options = { - 'analytics_id': 'UA-83738774-2', - 'navigation_depth': 2, + 'analytics_id': 'UA-83738774-2' } # Add any paths that contain custom static files (such as style sheets) here, From bcee5aee50f27577050b284ca7870587c681731c Mon Sep 17 00:00:00 2001 From: Sylvain Gugger Date: Wed, 4 Nov 2020 11:28:30 -0500 Subject: [PATCH 4/5] Test lower sphinx version --- .circleci/config.yml | 2 -- setup.py | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index abd94487c3d42b..b187f9e16c84e0 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -274,7 +274,6 @@ jobs: working_directory: ~/transformers docker: - image: circleci/python:3.6 - resource_class: xlarge steps: - checkout - restore_cache: @@ -295,7 +294,6 @@ jobs: working_directory: ~/transformers docker: - image: circleci/python:3.6 - resource_class: large steps: - add_ssh_keys: fingerprints: diff --git a/setup.py b/setup.py index 7ffacbff359f94..406fbbbdd1ef96 100644 --- a/setup.py +++ b/setup.py @@ -105,7 +105,7 @@ extras["retrieval"] = ["faiss-cpu", "datasets"] extras["testing"] = ["pytest", "pytest-xdist", "timeout-decorator", "parameterized", "psutil"] + extras["retrieval"] # sphinx-rtd-theme==0.5.0 introduced big changes in the style. -extras["docs"] = ["recommonmark", "sphinx", "sphinx-markdown-tables", "sphinx-rtd-theme==0.4.3", "sphinx-copybutton"] +extras["docs"] = ["recommonmark", "sphinx==3.2.1", "sphinx-markdown-tables", "sphinx-rtd-theme==0.4.3", "sphinx-copybutton"] extras["quality"] = ["black >= 20.8b1", "isort >= 5.5.4", "flake8 >= 3.8.3"] From 185e3a4e540709dc6e055d8a9519d4ea2149fa72 Mon Sep 17 00:00:00 2001 From: Sylvain Gugger Date: Wed, 4 Nov 2020 11:35:12 -0500 Subject: [PATCH 5/5] Remove trailing space --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index b187f9e16c84e0..aa48f075605554 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -286,7 +286,7 @@ jobs: key: v0.4-build_doc-{{ checksum "setup.py" }} paths: - '~/.cache/pip' - - run: cd docs && make html SPHINXOPTS="-W" + - run: cd docs && make html SPHINXOPTS="-W" - store_artifacts: path: ./docs/_build