Skip to content

Commit da52a7a

Browse files
authored
Merge branch 'main' into pre-commit-ci-update-config
2 parents 31ba8eb + c7dea8c commit da52a7a

File tree

3 files changed

+6
-2
lines changed

3 files changed

+6
-2
lines changed

.github/workflows/ci.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,7 @@ jobs:
6767
python -m pytest test
6868
6969
link-check:
70+
if: github.event_name != 'pull_request'
7071
runs-on: ubuntu-latest
7172
defaults:
7273
run:
@@ -114,4 +115,5 @@ jobs:
114115
eval "$(micromamba shell hook --shell bash)"
115116
micromamba activate uxarray-docs
116117
cd docs
118+
echo 'nb_execution_mode = "off"' >> conf.py
117119
make linkcheck

docs/user-guide/grid-formats.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,8 @@ References
4343
----------
4444
* https://ugrid-conventions.github.io/ugrid-conventions/#ugrid-conventions-v10
4545
* https://github.com/ugrid-conventions/ugrid-conventions
46-
* https://cfconventions.org/Data/cf-conventions/cf-conventions-1.11/cf-conventions.html#ugrid-conventions
47-
* https://cfconventions.org/Data/cf-conventions/cf-conventions-1.11/cf-conventions.html#mesh-topology-variables
46+
* https://cf-convention.github.io/Data/cf-conventions/cf-conventions-1.13/cf-conventions.html#ugrid-conventions
47+
* https://cf-convention.github.io/Data/cf-conventions/cf-conventions-1.13/cf-conventions.html#mesh-topology-variables
4848

4949
MPAS
5050
====

test/test_plot.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@
44
import pytest
55
import numpy as np
66

7+
import matplotlib
8+
matplotlib.use("Agg")
79
import matplotlib.pyplot as plt
810
import cartopy.crs as ccrs
911

0 commit comments

Comments
 (0)