From 1ed20dcaf5103f71a5815d1ee8409a8f33f6c278 Mon Sep 17 00:00:00 2001
From: abejgonzalez <abe.j.gonza@gmail.com>
Date: Thu, 18 Jan 2024 11:23:39 -0800
Subject: [PATCH] Revert some stuff

---
 ...irements-esp-tools-linux-64.conda-lock.yml | 61 ++++++++++++-------
 ...ements-riscv-tools-linux-64.conda-lock.yml | 61 ++++++++++++-------
 conda-reqs/docs.yaml                          |  2 +-
 3 files changed, 77 insertions(+), 47 deletions(-)

diff --git a/conda-reqs/conda-lock-reqs/conda-requirements-esp-tools-linux-64.conda-lock.yml b/conda-reqs/conda-lock-reqs/conda-requirements-esp-tools-linux-64.conda-lock.yml
index e5b0e86c42..2083ce4d1c 100644
--- a/conda-reqs/conda-lock-reqs/conda-requirements-esp-tools-linux-64.conda-lock.yml
+++ b/conda-reqs/conda-lock-reqs/conda-requirements-esp-tools-linux-64.conda-lock.yml
@@ -21,7 +21,7 @@ metadata:
   - url: nodefaults
     used_env_vars: []
   content_hash:
-    linux-64: 7300df8400fcd0448fa571ed688fa54681300799640194f359ecf2620e155550
+    linux-64: dff1e57c6346a984141e6206e0fc0c8c13152f37ae38ad67d6e938937c5b061a
   platforms:
   - linux-64
   sources:
@@ -5720,19 +5720,6 @@ package:
   platform: linux-64
   url: https://conda.anaconda.org/conda-forge/noarch/sphinx-autobuild-2021.3.14-pyhd8ed1ab_0.tar.bz2
   version: 2021.3.14
-- category: main
-  dependencies:
-    python: '>=2.7'
-    sphinx: <6
-  hash:
-    md5: 231a6798e540439299666e2eae31751e
-    sha256: 3b80b31fe1298c04c28285e3c2b1acb019be726acdc76fcd24d0123dc97bee6d
-  manager: conda
-  name: sphinx_rtd_theme
-  optional: false
-  platform: linux-64
-  url: https://conda.anaconda.org/conda-forge/noarch/sphinx_rtd_theme-0.5.2-pyhd8ed1ab_0.tar.bz2
-  version: 0.5.2
 - category: main
   dependencies:
     python: '>=3.9'
@@ -5772,6 +5759,34 @@ package:
   platform: linux-64
   url: https://conda.anaconda.org/conda-forge/noarch/sphinxcontrib-htmlhelp-2.0.5-pyhd8ed1ab_0.conda
   version: 2.0.5
+- category: main
+  dependencies:
+    python: '>=2.7'
+    sphinx: '>=1.8'
+  hash:
+    md5: 914897066d5873acfb13e75705276ad1
+    sha256: 2e5f16a2d58f9a31443ffbb8ce3852cfccf533a6349045828cd2e994ef0679ca
+  manager: conda
+  name: sphinxcontrib-jquery
+  optional: false
+  platform: linux-64
+  url: https://conda.anaconda.org/conda-forge/noarch/sphinxcontrib-jquery-4.1-pyhd8ed1ab_0.conda
+  version: '4.1'
+- category: main
+  dependencies:
+    docutils: <0.21
+    python: '>=3.6'
+    sphinx: '>=5,<8'
+    sphinxcontrib-jquery: '>=4,<5'
+  hash:
+    md5: baf6d9a33df1a789ca55e3b404c7ea28
+    sha256: 8545c806d03092fd0236db6663c88036eab2dc99e34c91cd36c0704db03b148a
+  manager: conda
+  name: sphinx_rtd_theme
+  optional: false
+  platform: linux-64
+  url: https://conda.anaconda.org/conda-forge/noarch/sphinx_rtd_theme-2.0.0-pyha770c72_0.conda
+  version: 2.0.0
 - category: main
   dependencies:
     python: '>=3.9'
@@ -5790,30 +5805,30 @@ package:
     alabaster: '>=0.7,<0.8'
     babel: '>=2.9'
     colorama: '>=0.4.5'
-    docutils: '>=0.14,<0.20'
+    docutils: '>=0.18.1,<0.21'
     imagesize: '>=1.3'
     importlib-metadata: '>=4.8'
     jinja2: '>=3.0'
     packaging: '>=21.0'
-    pygments: '>=2.12'
-    python: '>=3.7'
-    requests: '>=2.5.0'
+    pygments: '>=2.14'
+    python: '>=3.9'
+    requests: '>=2.25.0'
     snowballstemmer: '>=2.0'
     sphinxcontrib-applehelp: ''
     sphinxcontrib-devhelp: ''
     sphinxcontrib-htmlhelp: '>=2.0.0'
     sphinxcontrib-jsmath: ''
     sphinxcontrib-qthelp: ''
-    sphinxcontrib-serializinghtml: '>=1.1.5'
+    sphinxcontrib-serializinghtml: '>=1.1.9'
   hash:
-    md5: f9e1fcfe235d655900bfeb6aee426472
-    sha256: f11fd5fb4ae2c65f41ae86e7408e3ab44844898d928264aa9e89929fffc685c8
+    md5: bbfd1120d1824d2d073bc65935f0e4c0
+    sha256: 665d1fe6d20c6cc672ff20e6ebb405860f878b487d3d8d86a5952733fb7bbc42
   manager: conda
   name: sphinx
   optional: false
   platform: linux-64
-  url: https://conda.anaconda.org/conda-forge/noarch/sphinx-5.3.0-pyhd8ed1ab_0.tar.bz2
-  version: 5.3.0
+  url: https://conda.anaconda.org/conda-forge/noarch/sphinx-7.2.6-pyhd8ed1ab_0.conda
+  version: 7.2.6
 - category: main
   dependencies:
     python: '>=3.9'
diff --git a/conda-reqs/conda-lock-reqs/conda-requirements-riscv-tools-linux-64.conda-lock.yml b/conda-reqs/conda-lock-reqs/conda-requirements-riscv-tools-linux-64.conda-lock.yml
index 0858506773..0c884a6881 100644
--- a/conda-reqs/conda-lock-reqs/conda-requirements-riscv-tools-linux-64.conda-lock.yml
+++ b/conda-reqs/conda-lock-reqs/conda-requirements-riscv-tools-linux-64.conda-lock.yml
@@ -21,7 +21,7 @@ metadata:
   - url: nodefaults
     used_env_vars: []
   content_hash:
-    linux-64: 3b07df8967ebe658d3a01b62b76d1fc245d6c03e7de019aaca57d4a3a2c9a4e0
+    linux-64: 8fd67723de354ff9321ddc6c1d37927add144bb0cd3e983b1bb3e486f31b98fb
   platforms:
   - linux-64
   sources:
@@ -5721,19 +5721,6 @@ package:
   platform: linux-64
   url: https://conda.anaconda.org/conda-forge/noarch/sphinx-autobuild-2021.3.14-pyhd8ed1ab_0.tar.bz2
   version: 2021.3.14
-- category: main
-  dependencies:
-    python: '>=2.7'
-    sphinx: <6
-  hash:
-    md5: 231a6798e540439299666e2eae31751e
-    sha256: 3b80b31fe1298c04c28285e3c2b1acb019be726acdc76fcd24d0123dc97bee6d
-  manager: conda
-  name: sphinx_rtd_theme
-  optional: false
-  platform: linux-64
-  url: https://conda.anaconda.org/conda-forge/noarch/sphinx_rtd_theme-0.5.2-pyhd8ed1ab_0.tar.bz2
-  version: 0.5.2
 - category: main
   dependencies:
     python: '>=3.9'
@@ -5773,6 +5760,34 @@ package:
   platform: linux-64
   url: https://conda.anaconda.org/conda-forge/noarch/sphinxcontrib-htmlhelp-2.0.5-pyhd8ed1ab_0.conda
   version: 2.0.5
+- category: main
+  dependencies:
+    python: '>=2.7'
+    sphinx: '>=1.8'
+  hash:
+    md5: 914897066d5873acfb13e75705276ad1
+    sha256: 2e5f16a2d58f9a31443ffbb8ce3852cfccf533a6349045828cd2e994ef0679ca
+  manager: conda
+  name: sphinxcontrib-jquery
+  optional: false
+  platform: linux-64
+  url: https://conda.anaconda.org/conda-forge/noarch/sphinxcontrib-jquery-4.1-pyhd8ed1ab_0.conda
+  version: '4.1'
+- category: main
+  dependencies:
+    docutils: <0.21
+    python: '>=3.6'
+    sphinx: '>=5,<8'
+    sphinxcontrib-jquery: '>=4,<5'
+  hash:
+    md5: baf6d9a33df1a789ca55e3b404c7ea28
+    sha256: 8545c806d03092fd0236db6663c88036eab2dc99e34c91cd36c0704db03b148a
+  manager: conda
+  name: sphinx_rtd_theme
+  optional: false
+  platform: linux-64
+  url: https://conda.anaconda.org/conda-forge/noarch/sphinx_rtd_theme-2.0.0-pyha770c72_0.conda
+  version: 2.0.0
 - category: main
   dependencies:
     python: '>=3.9'
@@ -5791,30 +5806,30 @@ package:
     alabaster: '>=0.7,<0.8'
     babel: '>=2.9'
     colorama: '>=0.4.5'
-    docutils: '>=0.14,<0.20'
+    docutils: '>=0.18.1,<0.21'
     imagesize: '>=1.3'
     importlib-metadata: '>=4.8'
     jinja2: '>=3.0'
     packaging: '>=21.0'
-    pygments: '>=2.12'
-    python: '>=3.7'
-    requests: '>=2.5.0'
+    pygments: '>=2.14'
+    python: '>=3.9'
+    requests: '>=2.25.0'
     snowballstemmer: '>=2.0'
     sphinxcontrib-applehelp: ''
     sphinxcontrib-devhelp: ''
     sphinxcontrib-htmlhelp: '>=2.0.0'
     sphinxcontrib-jsmath: ''
     sphinxcontrib-qthelp: ''
-    sphinxcontrib-serializinghtml: '>=1.1.5'
+    sphinxcontrib-serializinghtml: '>=1.1.9'
   hash:
-    md5: f9e1fcfe235d655900bfeb6aee426472
-    sha256: f11fd5fb4ae2c65f41ae86e7408e3ab44844898d928264aa9e89929fffc685c8
+    md5: bbfd1120d1824d2d073bc65935f0e4c0
+    sha256: 665d1fe6d20c6cc672ff20e6ebb405860f878b487d3d8d86a5952733fb7bbc42
   manager: conda
   name: sphinx
   optional: false
   platform: linux-64
-  url: https://conda.anaconda.org/conda-forge/noarch/sphinx-5.3.0-pyhd8ed1ab_0.tar.bz2
-  version: 5.3.0
+  url: https://conda.anaconda.org/conda-forge/noarch/sphinx-7.2.6-pyhd8ed1ab_0.conda
+  version: 7.2.6
 - category: main
   dependencies:
     python: '>=3.9'
diff --git a/conda-reqs/docs.yaml b/conda-reqs/docs.yaml
index a7bd5db990..38356ad072 100644
--- a/conda-reqs/docs.yaml
+++ b/conda-reqs/docs.yaml
@@ -19,5 +19,5 @@ dependencies:
     - sphinx
     - pygments
     - sphinx-autobuild
-    - sphinx_rtd_theme==0.5.2
+    - sphinx_rtd_theme
     - docutils