From: Zsolt Dollenstein Date: Fri, 27 Mar 2020 10:43:41 +0000 (+0000) Subject: Fix readthedocs build (#1321) X-Git-Url: https://git.madduck.net/etc/vim.git/commitdiff_plain/a33823e85956b30b3785120478775f8a9fe64b62?ds=inline;hp=453ad9500b36f00cd8d4ba8ed0c23ff6765b18d3 Fix readthedocs build (#1321) * migrate to new rtd config format and pip * no type field anymore * use builtin re for docs --- diff --git a/docs/conf.py b/docs/conf.py index ce7536d..37a6f84 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -13,7 +13,7 @@ # documentation root, use os.path.abspath to make it absolute, like shown here. # from pathlib import Path -import regex as re +import re import shutil import string diff --git a/docs/environment.yml b/docs/environment.yml deleted file mode 100644 index 4ab55ef..0000000 --- a/docs/environment.yml +++ /dev/null @@ -1,10 +0,0 @@ -name: black_docs -channels: - - conda-forge -dependencies: - - python>=3.6 - - Sphinx==1.7.2 - - pip: - - recommonmark==0.4.0 - - git+https://git@github.com/psf/black.git - - setuptools_scm==3.3.3 diff --git a/docs/requirements.txt b/docs/requirements.txt index a36fd8a..b0bb910 100644 --- a/docs/requirements.txt +++ b/docs/requirements.txt @@ -1,2 +1,3 @@ recommonmark==0.4.0 Sphinx==1.7.2 +setuptools_scm==3.3.3 diff --git a/readthedocs.yml b/readthedocs.yml index f5e2a9a..d8a016a 100644 --- a/readthedocs.yml +++ b/readthedocs.yml @@ -1,6 +1,5 @@ -name: black -type: sphinx -conda: - file: docs/environment.yml +version: 2 python: - version: 3 + version: 3.8 + install: + - requirements: docs/requirements.txt