From: Ben Darnell <ben@cockroachlabs.com>
Date: Mon, 11 May 2020 17:09:54 +0000 (-0400)
Subject: Revert "docs: Use python 3.7 via conda for readthedocs builds"
X-Git-Tag: v6.1.0b1~29^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F2857%2Fhead;p=thirdparty%2Ftornado.git

Revert "docs: Use python 3.7 via conda for readthedocs builds"

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
---

diff --git a/docs/conda.yml b/docs/conda.yml
deleted file mode 100644
index 44c4274a2..000000000
--- a/docs/conda.yml
+++ /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
index e40382080..000000000
--- a/readthedocs.yml
+++ /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