From f3cc7a49f17ce509eb7d4a4889ad28397a1ee188 Mon Sep 17 00:00:00 2001 From: Katelyn FitzGerald <7872563+kafitzgerald@users.noreply.github.com> Date: Wed, 27 Sep 2023 11:20:21 -0600 Subject: [PATCH 1/4] Remove some duplicative entries in the environment file and sphinx theme we no longer use --- conda_environment.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/conda_environment.yml b/conda_environment.yml index 65e3b643f..5869a1aee 100644 --- a/conda_environment.yml +++ b/conda_environment.yml @@ -15,7 +15,6 @@ dependencies: - holoviews - cartopy - geographiclib - - jupyter - jupyterlab - make - matplotlib @@ -27,11 +26,9 @@ dependencies: - pint - pip - scikit-learn - - sphinx - sphinx-book-theme - sphinx-design - sphinx-gallery - - sphinx_rtd_theme - xarray<=2023.02.0 - wrf-python - pip: From 7dd9acb36921e7ea0f4baca02d4df078431dbdc0 Mon Sep 17 00:00:00 2001 From: Katelyn FitzGerald <7872563+kafitzgerald@users.noreply.github.com> Date: Wed, 27 Sep 2023 11:42:31 -0600 Subject: [PATCH 2/4] remove file related to old sphinx theme --- docs/_templates/breadcrumbs.html | 4 ---- 1 file changed, 4 deletions(-) delete mode 100644 docs/_templates/breadcrumbs.html diff --git a/docs/_templates/breadcrumbs.html b/docs/_templates/breadcrumbs.html deleted file mode 100644 index 4ecb013f8..000000000 --- a/docs/_templates/breadcrumbs.html +++ /dev/null @@ -1,4 +0,0 @@ -{%- extends "sphinx_rtd_theme/breadcrumbs.html" %} - -{% block breadcrumbs_aside %} -{% endblock %} From 4fe4c8f190281c71e8bf54eb44a0d01da76f53e4 Mon Sep 17 00:00:00 2001 From: Katelyn FitzGerald <7872563+kafitzgerald@users.noreply.github.com> Date: Wed, 27 Sep 2023 11:55:59 -0600 Subject: [PATCH 3/4] remove old sphinx theme import from conf.py --- docs/conf.py | 1 - 1 file changed, 1 deletion(-) diff --git a/docs/conf.py b/docs/conf.py index 47a981708..72d49cf4c 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -90,7 +90,6 @@ # The theme to use for HTML and HTML Help pages. See the documentation for # a list of builtin themes. # -import sphinx_rtd_theme html_theme = 'sphinx_book_theme' html_title = "" From 2c4fb45a259bfcc516459553cb5eefd7e248c116 Mon Sep 17 00:00:00 2001 From: Katelyn FitzGerald <7872563+kafitzgerald@users.noreply.github.com> Date: Wed, 27 Sep 2023 12:29:22 -0600 Subject: [PATCH 4/4] pin matplotlib for now until we get a fix in geocat-viz --- conda_environment.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conda_environment.yml b/conda_environment.yml index 5869a1aee..a8e0e70de 100644 --- a/conda_environment.yml +++ b/conda_environment.yml @@ -17,7 +17,7 @@ dependencies: - geographiclib - jupyterlab - make - - matplotlib + - matplotlib<3.8 - metpy - mock - nbsphinx