Merge pull request #1742 from ucb-bar/pin-sphinx-rtd

Use non-lock-file conda requirements in RTD

.readthedocs.yml

@@ -9,4 +9,4 @@ sphinx:
     configuration: docs/conf.py
 
 conda:
-    environment: conda-reqs/conda-lock-reqs/conda-requirements-riscv-tools-linux-64.conda-lock.yml
+    environment: conda-reqs/docs.yaml

conda-reqs/chipyard.yaml

@@ -78,7 +78,7 @@ dependencies:
     - zlib
     - vim
     - git
-    - openjdk
+    - openjdk=20
     - gengetopt
     - libffi
     - expat
@@ -104,13 +104,6 @@ dependencies:
     - pip:
         - hammer-vlsi[asap7]==1.2.0
 
-    # doc requirements
-    - sphinx
-    - pygments
-    - sphinx-autobuild
-    - sphinx_rtd_theme
-    - docutils
-
     # firesim python packages
     # While it is possible to install using pip after creating the
     # conda environment, pip's dependency resolution can conflict with

conda-reqs/docs.yaml

@@ -0,0 +1,23 @@
+channels:
+    - ucb-bar
+    - conda-forge
+    - litex-hub
+    - nodefaults
+
+platforms:
+    - linux-64
+
+dependencies:
+    # https://conda-forge.org/feedstock-outputs/
+    #   filterable list of all conda-forge packages
+    # https://conda-forge.org/#contribute
+    #   instructions on adding a recipe
+    # https://docs.conda.io/projects/conda/en/latest/user-guide/concepts/pkg-specs.html#package-match-specifications
+    #   documentation on package_spec syntax for constraining versions
+
+    # doc requirements
+    - sphinx
+    - pygments
+    - sphinx-autobuild
+    - sphinx_rtd_theme
+    - docutils

scripts/generate-conda-lockfiles.sh

@@ -19,6 +19,7 @@ for TOOLCHAIN_TYPE in riscv-tools esp-tools; do
 	    --no-mamba \
 	    --no-micromamba \
 	    -f "$REQS_DIR/chipyard.yaml" \
+	    -f "$REQS_DIR/docs.yaml" \
 	    -f "$REQS_DIR/$TOOLCHAIN_TYPE.yaml" \
 	    -p linux-64 \
 	    --lockfile $LOCKFILE