From 9e168be16766ba594893c3c796e9157daecf0ca9 Mon Sep 17 00:00:00 2001
From: John Sirois <john.sirois@gmail.com>
Date: Fri, 3 Nov 2023 07:46:47 -0700
Subject: [PATCH] Fix `.readthedocs.{yml,yaml}` duplication. (#2275)

The fix in #2274 that introduced `.readthedocs.yaml` (the name
documented by RTD currently to use for the config file) was blind to the
fact we already had a `.readthedocs.yml` file. It appears to be the case
that `.readthedocs.yml` is both read by RTD and preferred; so RTD build
errors persisted. Fix this by merging the config files and sticking with
the current reccomended name of `.readthedocs.yaml`.

More work towards #2267.
---
 .readthedocs.yaml |  5 +++++
 .readthedocs.yml  | 18 ------------------
 2 files changed, 5 insertions(+), 18 deletions(-)
 delete mode 100644 .readthedocs.yml

diff --git a/.readthedocs.yaml b/.readthedocs.yaml
index be257f338..9b1e0e347 100644
--- a/.readthedocs.yaml
+++ b/.readthedocs.yaml
@@ -13,3 +13,8 @@ sphinx:
 python:
   install:
   - requirements: docs/rtd/requirements.txt
+
+formats:
+  - htmlzip
+  - pdf
+  - epub
\ No newline at end of file
diff --git a/.readthedocs.yml b/.readthedocs.yml
deleted file mode 100644
index 342736ac2..000000000
--- a/.readthedocs.yml
+++ /dev/null
@@ -1,18 +0,0 @@
-# .readthedocs.yml
-# Read the Docs configuration file
-# See https://docs.readthedocs.io/en/stable/config-file/v2.html for details
-
-version: 2
-
-sphinx:
-  configuration: docs/conf.py
-
-python:
-  version: 3.7
-  install:
-    - requirements: docs/rtd/requirements.txt
-
-formats:
-  - htmlzip
-  - pdf
-  - epub
\ No newline at end of file