Merge branch 'main' of github.com:klindsay28/esm_catalog_utils into main

klindsay28 · May 17, 2023 · c951524 · c951524
2 parents 4937953 + 0dbc1b9
commit c951524
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 6 deletions.
diff --git a/docs/Makefile b/docs/Makefile
@@ -6,7 +6,7 @@
 SPHINXOPTS    ?=
 SPHINXBUILD   ?= sphinx-build
 SOURCEDIR     = source
-BUILDDIR      = _build
+BUILDDIR      = build
 
 # Put it first so that "make" without argument is like "make help".
 help:

diff --git a/docs/environment.yaml b/docs/environment.yaml
@@ -4,4 +4,6 @@ channels:
 dependencies:
   - black
   - flake8
-  - sphinx
+  - sphinx<6.0
+  - sphinx-rtd-theme
+  - urllib3<2.0
diff --git a/docs/make.bat b/docs/make.bat
@@ -8,7 +8,7 @@ if "%SPHINXBUILD%" == "" (
 	set SPHINXBUILD=sphinx-build
 )
 set SOURCEDIR=source
-set BUILDDIR=_build
+set BUILDDIR=build
 
 %SPHINXBUILD% >NUL 2>NUL
 if errorlevel 9009 (

diff --git a/docs/requirements.txt b/docs/requirements.txt
@@ -0,0 +1,3 @@
+sphinx<6.0
+sphinx_rtd_theme
+urllib3<2.0
diff --git a/docs/source/conf.py b/docs/source/conf.py
@@ -16,11 +16,11 @@
 extensions = []
 
 templates_path = ["_templates"]
-exclude_patterns = ["_build", "Thumbs.db", ".DS_Store"]
+exclude_patterns = []
 
 
 # -- Options for HTML output -------------------------------------------------
 # https://www.sphinx-doc.org/en/master/usage/configuration.html#options-for-html-output
 
-html_theme = "alabaster"
+html_theme = "sphinx_rtd_theme"
 html_static_path = ["_static"]
diff --git a/docs/source/index.rst b/docs/source/index.rst
@@ -1,5 +1,5 @@
 .. esm_catalog_utils documentation master file, created by
-   sphinx-quickstart on Mon May  1 10:51:47 2023.
+   sphinx-quickstart on Mon May  8 14:26:15 2023.
    You can adapt this file completely to your liking, but it should at least
    contain the root `toctree` directive.