Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/main' into numpdocs_uno
Browse files Browse the repository at this point in the history
* upstream/main:
  Updated environment lockfiles (SciTools#5334)
  Iris Docs: Dark theme ready (SciTools#5299)
  Updated environment lockfiles (SciTools#5332)
  Support netcdf variable emulation (SciTools#5212)
  Support netCDF load+save on dataset-like objects as well as filepaths. (SciTools#5214)
  minor refinement to release do-nothing script (SciTools#5326)
  update bibtex citation for v3.6.0 release (SciTools#5324)
  Whats new updates for v3.6.0 (SciTools#5323)
  Added whatsnew notes on netcdf delayed saving and Distributed support. (SciTools#5322)
  Updated environment lockfiles (SciTools#5320)
  Bugfix 4566 (SciTools#4569)
  Simpler/faster data aggregation code in `aggregated_by` (SciTools#4970)
  update release_do_nothing script (SciTools#5311)
  Restore latest Whats New files.
  Updated environment lockfiles (SciTools#5308)
  release_do_nothing script updates from v3.6.0rc0 (SciTools#5306)
  Whats new updates for v3.6.0rc0 (SciTools#5300)
  Bump scitools/workflows from 2023.04.3 to 2023.05.0 (SciTools#5303)
  • Loading branch information
tkknight committed May 31, 2023
2 parents 4edf3a4 + 299b335 commit 5cfbfc6
Show file tree
Hide file tree
Showing 60 changed files with 9,419 additions and 1,286 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci-manifest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,4 +23,4 @@ concurrency:
jobs:
manifest:
name: "check-manifest"
uses: scitools/workflows/.github/workflows/ci-manifest.yml@2023.04.3
uses: scitools/workflows/.github/workflows/ci-manifest.yml@2023.05.0
2 changes: 1 addition & 1 deletion .github/workflows/refresh-lockfiles.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,5 +14,5 @@ on:

jobs:
refresh_lockfiles:
uses: scitools/workflows/.github/workflows/refresh-lockfiles.yml@2023.04.3
uses: scitools/workflows/.github/workflows/refresh-lockfiles.yml@2023.05.0
secrets: inherit
63 changes: 37 additions & 26 deletions docs/src/_static/icon_api.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion docs/src/_static/theme_override.css
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/* import the standard theme css */
@import url("css/theme.css");
@import url("styles/theme.css");

/* now we can add custom css.... */

Expand Down
13 changes: 7 additions & 6 deletions docs/src/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -333,9 +333,9 @@ def _dotv(version):
],
"use_edit_page_button": True,
"show_toc_level": 1,
# Omitted `theme-switcher` below to disable it
# Omit `theme-switcher` from navbar_end below to disable it
# Info: https://pydata-sphinx-theme.readthedocs.io/en/stable/user_guide/light-dark.html#configure-default-theme-mode
"navbar_end": ["navbar-icon-links"],
# "navbar_end": ["navbar-icon-links"],
# https://pydata-sphinx-theme.readthedocs.io/en/v0.11.0/user_guide/branding.html#different-logos-for-light-and-dark-mode
"logo": {
"image_light": "_static/iris-logo-title.svg",
Expand All @@ -354,7 +354,7 @@ def _dotv(version):
"doc_path": "docs/src",
# default theme. Also disabled the button in the html_theme_options.
# Info: https://pydata-sphinx-theme.readthedocs.io/en/stable/user_guide/light-dark.html#configure-default-theme-mode
"default_mode": "light",
"default_mode": "auto",
# custom
"on_rtd": on_rtd,
"rtd_version": rtd_version,
Expand All @@ -371,13 +371,14 @@ def _dotv(version):
html_static_path = ["_static"]
html_style = "theme_override.css"

# this allows for using datatables: https://datatables.net/
# this allows for using datatables: https://datatables.net/.
# the version can be manually upgraded by changing the urls below.
html_css_files = [
"https://cdn.datatables.net/1.10.23/css/jquery.dataTables.min.css",
"https://cdn.datatables.net/1.13.4/css/jquery.dataTables.min.css",
]

html_js_files = [
"https://cdn.datatables.net/1.10.23/js/jquery.dataTables.min.js",
"https://cdn.datatables.net/1.13.4/js/jquery.dataTables.min.js",
]

# url link checker. Some links work but report as broken, lets ignore them.
Expand Down
1,375 changes: 1,374 additions & 1 deletion docs/src/further_topics/ugrid/images/data_structured_grid.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2,274 changes: 2,273 additions & 1 deletion docs/src/further_topics/ugrid/images/data_ugrid_mesh.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
32 changes: 16 additions & 16 deletions docs/src/further_topics/ugrid/images/iris-esmf-regrid.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified docs/src/further_topics/ugrid/images/orca_grid.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
631 changes: 630 additions & 1 deletion docs/src/further_topics/ugrid/images/ugrid_edge_data.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1,277 changes: 1,276 additions & 1 deletion docs/src/further_topics/ugrid/images/ugrid_element_centres.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
866 changes: 865 additions & 1 deletion docs/src/further_topics/ugrid/images/ugrid_node_independence.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
944 changes: 943 additions & 1 deletion docs/src/further_topics/ugrid/images/ugrid_variable_faces.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit 5cfbfc6

Please sign in to comment.