From 121aac89c594132abed7bb9757e8fadc67c8c6bb Mon Sep 17 00:00:00 2001 From: Ben Darnell Date: Mon, 11 May 2020 13:09:54 -0400 Subject: [PATCH] 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 --- docs/conda.yml | 9 --------- readthedocs.yml | 4 ---- 2 files changed, 13 deletions(-) delete mode 100644 docs/conda.yml delete mode 100644 readthedocs.yml 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 -- 2.47.2