]> git.ipfire.org Git - thirdparty/tornado.git/commitdiff
Revert "docs: Use python 3.7 via conda for readthedocs builds" 2857/head
authorBen Darnell <ben@cockroachlabs.com>
Mon, 11 May 2020 17:09:54 +0000 (13:09 -0400)
committerBen Darnell <ben@cockroachlabs.com>
Mon, 11 May 2020 17:09:54 +0000 (13:09 -0400)
This reverts commit e7e31e5642ae56da3f768d9829036eab99f0c988.

We were using conda to get access to python 3.7 before rtd supported
it in their regular builds, but this led to problems pinning a
specific version of sphinx. See
https://github.com/readthedocs/readthedocs.org/issues/6870

docs/conda.yml [deleted file]
readthedocs.yml [deleted file]

diff --git a/docs/conda.yml b/docs/conda.yml
deleted file mode 100644 (file)
index 44c4274..0000000
+++ /dev/null
@@ -1,9 +0,0 @@
-# TODO: remove when RTD supports python 3.7 without conda
-name: tornado-docs
-dependencies:
-  - python=3.7
-  - pip:
-    - sphinx
-    - sphinx-rtd-theme
-    - sphinxcontrib-asyncio
-    - Twisted
diff --git a/readthedocs.yml b/readthedocs.yml
deleted file mode 100644 (file)
index e403820..0000000
+++ /dev/null
@@ -1,4 +0,0 @@
-# TODO: remove when RTD supports Python 3.7 without conda.
-# https://github.com/rtfd/readthedocs-docker-images/pull/73
-conda:
-  file: docs/conda.yml