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 ce7536defbd6417be7c62c8fcbbba3c899bc41b0..37a6f84864bea6076c14b762c5e93bc572585bbe 100644 (file)
--- 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
 # 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
 
 import shutil
 import string
 

diff --git a/docs/environment.yml b/docs/environment.yml
deleted file mode 100644 (file)
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 a36fd8a675b2307fa0ac9920b75799be6e3c441e..b0bb9102e6a4922e22b17ea3f584ddcfe0d72d30 100644 (file)
--- a/docs/requirements.txt
+++ b/docs/requirements.txt
@@ -1,2 +1,3 @@
 recommonmark==0.4.0
 Sphinx==1.7.2
 recommonmark==0.4.0
 Sphinx==1.7.2

+setuptools_scm==3.3.3

diff --git a/readthedocs.yml b/readthedocs.yml
index f5e2a9a5ce2d7bfcbf6ce376d244a9512e115d8c..d8a016a14fc1d7f675a568525e741a74ffe3f4c3 100644 (file)
--- a/readthedocs.yml
+++ b/readthedocs.yml
@@ -1,6 +1,5 @@
-name: black
-type: sphinx
-conda:
-  file: docs/environment.yml
+version: 2

 python:
 python:

-  version: 3
+  version: 3.8
+  install:
+    - requirements: docs/requirements.txt