From b6bcaeab7ac5a4d06df74b481ed45260742542f0 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 7 Nov 2024 13:29:20 +0000 Subject: [PATCH 1/4] MNT: (deps): Bump sphinx from 5.2.3 to 8.1.3 in /ci Bumps [sphinx](https://github.com/sphinx-doc/sphinx) from 5.2.3 to 8.1.3. - [Release notes](https://github.com/sphinx-doc/sphinx/releases) - [Changelog](https://github.com/sphinx-doc/sphinx/blob/v8.1.3/CHANGES.rst) - [Commits](https://github.com/sphinx-doc/sphinx/compare/v5.2.3...v8.1.3) --- updated-dependencies: - dependency-name: sphinx dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- ci/doc_requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/doc_requirements.txt b/ci/doc_requirements.txt index 2b02c00e9..e7922b06c 100644 --- a/ci/doc_requirements.txt +++ b/ci/doc_requirements.txt @@ -1,7 +1,7 @@ cartopy==0.24 matplotlib==3.9.2 metpy==1.6.3 -sphinx==5.2.3 +sphinx==8.1.3 sphinx_rtd_theme==1.0.0 sphinx-gallery==0.18.0 myst-parser==0.18.1 From a0e7220f7ae857c920e43da67b76cf94fc9b4036 Mon Sep 17 00:00:00 2001 From: Ryan May Date: Thu, 7 Nov 2024 13:36:23 -0700 Subject: [PATCH 2/4] CI: Bump myst-parser to 4.0.0 and sphinx-rtd-theme to 3.0.1 For compatibility with Sphinx 8. --- ci/doc_requirements.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ci/doc_requirements.txt b/ci/doc_requirements.txt index e7922b06c..9a434aa52 100644 --- a/ci/doc_requirements.txt +++ b/ci/doc_requirements.txt @@ -2,7 +2,7 @@ cartopy==0.24 matplotlib==3.9.2 metpy==1.6.3 sphinx==8.1.3 -sphinx_rtd_theme==1.0.0 +sphinx_rtd_theme==3.0.1 sphinx-gallery==0.18.0 -myst-parser==0.18.1 +myst-parser==4.0.0 netCDF4==1.7.2 From 3390ac116215bce0f81d2c3f6b0448a7bf131acb Mon Sep 17 00:00:00 2001 From: Ryan May Date: Thu, 7 Nov 2024 15:00:18 -0700 Subject: [PATCH 3/4] DOC: Just use Cartopy's built-in states feature This should also clean up a warning when running the examples. --- examples/acis/Mapping_Example.py | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/examples/acis/Mapping_Example.py b/examples/acis/Mapping_Example.py index b1b3e2b69..e0e196d03 100644 --- a/examples/acis/Mapping_Example.py +++ b/examples/acis/Mapping_Example.py @@ -122,15 +122,11 @@ fig = plt.figure(figsize=(20, 10)) ax = fig.add_subplot(1, 1, 1, projection=proj) -state_boundaries = feat.NaturalEarthFeature(category='cultural', - name='admin_1_states_provinces_lines', - scale='110m', facecolor='none') - ax.add_feature(feat.LAND, zorder=-1) ax.add_feature(feat.OCEAN, zorder=-1) ax.add_feature(feat.LAKES, zorder=-1) ax.coastlines(resolution='110m', zorder=2, color='black') -ax.add_feature(state_boundaries, edgecolor='black') +ax.add_feature(feat.STATES, edgecolor='black') ax.add_feature(feat.BORDERS, linewidth=2, edgecolor='black') # Set plot bounds From b0ce0fb1b4f07585bbad01aaf9439778452336fa Mon Sep 17 00:00:00 2001 From: Ryan May Date: Thu, 7 Nov 2024 15:09:48 -0700 Subject: [PATCH 4/4] DOC: Clean up some sphinx config Elminates a warning and uses basic config options to add CSS rather than an app hook. --- docs/conf.py | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/docs/conf.py b/docs/conf.py index 1c772726c..4c119396f 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -137,23 +137,12 @@ # The theme to use for HTML and HTML Help pages. See the documentation for # a list of builtin themes. -#html_theme = 'default' -try: - import sphinx_rtd_theme - html_theme = 'sphinx_rtd_theme' - html_theme_path = [sphinx_rtd_theme.get_html_theme_path()] -except ImportError: - pass - -def setup(app): - app.add_css_file('theme_override.css') +html_theme = 'sphinx_rtd_theme' # Theme options are theme-specific and customize the look and feel of a theme # further. For a list of options available for each theme, see the # documentation. html_theme_options = {'canonical_url': 'https://unidata.github.io/siphon/latest/'} -if 'sphinx_rtd_theme' in vars() and sphinx_rtd_theme.__version__ == '0.2.5b1.post1': - html_theme_options['versions'] = {'latest': '../latest', 'dev': '../dev'} # Extra variables that will be available to the templates. Used to create the # links to the Github repository sources and issues @@ -186,6 +175,7 @@ def setup(app): # relative to this directory. They are copied after the builtin static files, # so a file named "default.css" will overwrite the builtin "default.css". html_static_path = ['_static'] +html_css_files = ['theme_override.css'] # Add any extra paths that contain custom files (such as robots.txt or # .htaccess) here, relative to this directory. These files are copied