Skip to content

Commit 8f42bfd

Browse files
authored
upgrade sphinx (#6415)
* pin sphinx to v4 * update the docs environment * use the new official name of the RTD configuration file * reorder the RTD sections * [skip-ci] * temporarily pin jinja2 [skip-ci] * drop the pin altogether, but disallow sphinx=4.4.0 [skip-ci] `extlinks` in `sphinx=4.4.0` creates warnings for hard-coded links — which are useful, but it's impossible to ignore false positives. * attempt to follow most of the advice of the extlinks checker * [skip-ci] * fix some broken links to PRs * [skip-ci]
1 parent 81715fd commit 8f42bfd

File tree

6 files changed

+18
-18
lines changed

6 files changed

+18
-18
lines changed
Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,14 @@
11
version: 2
2+
23
build:
34
os: ubuntu-20.04
45
tools:
56
python: mambaforge-4.10
6-
sphinx:
7-
fail_on_warning: true
7+
88
conda:
99
environment: ci/requirements/doc.yml
10+
11+
sphinx:
12+
fail_on_warning: true
13+
1014
formats: []

ci/requirements/doc.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ channels:
44
- conda-forge
55
- nodefaults
66
dependencies:
7-
- python=3.8
7+
- python=3.9
88
- bottleneck
99
- cartopy
1010
- cfgrib>=0.9
@@ -13,6 +13,7 @@ dependencies:
1313
- ipykernel
1414
- ipython
1515
- iris>=2.3
16+
- jinja2<3.1 # remove once nbconvert fixed the use of removed functions
1617
- jupyter_client
1718
- matplotlib-base
1819
- nbsphinx
@@ -33,7 +34,7 @@ dependencies:
3334
- sphinx-book-theme >= 0.0.38
3435
- sphinx-copybutton
3536
- sphinx-panels
36-
- sphinx<4
37+
- sphinx!=4.4.0
3738
- zarr>=2.4
3839
- pip:
3940
- sphinxext-rediraffe

doc/developers-meeting.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ The meeting occurs on `Zoom <https://us02web.zoom.us/j/88251613296?pwd=azZsSkU1U
77

88
Notes for the meeting are kept `here <https://hackmd.io/@U4W-olO3TX-hc-cvbjNe4A/xarray-dev-meeting/edit>`__.
99

10-
There is a `GitHub issue <https://github.com/pydata/xarray/issues/4001>`__ for changes to the meeting.
10+
There is a :issue:`GitHub issue <4001>` for changes to the meeting.
1111

1212
You can subscribe to this calendar to be notified of changes:
1313

doc/internals/extending-xarray.rst

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,10 @@ easy to inadvertently use internal APIs when subclassing, which means that your
1818
code may break when xarray upgrades. Furthermore, many builtin methods will
1919
only return native xarray objects.
2020

21-
The standard advice is to use `composition over inheritance`__, but
21+
The standard advice is to use :issue:`composition over inheritance <706>`, but
2222
reimplementing an API as large as xarray's on your own objects can be an onerous
2323
task, even if most methods are only forwarding to xarray implementations.
2424

25-
__ https://github.com/pydata/xarray/issues/706
26-
2725
If you simply want the ability to call a function with the syntax of a
2826
method call, then the builtin :py:meth:`~xarray.DataArray.pipe` method (copied
2927
from pandas) may suffice.

doc/roadmap.rst

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -114,8 +114,7 @@ xarray's data model, e.g., as attributes on the ``Dataset`` and
114114
coordinates in xarray operations, but will no longer would need to have
115115
a one-to-one correspondence with coordinate variables. Instead, an index
116116
should be able to refer to multiple (possibly multidimensional)
117-
coordinates that define it. See `GH
118-
1603 <https://github.com/pydata/xarray/issues/1603>`__ for full details
117+
coordinates that define it. See :issue:`1603` for full details.
119118

120119
Specific tasks:
121120

@@ -182,11 +181,9 @@ backends means that users can not easily build backend interface for
182181
xarray in third-party libraries.
183182

184183
The idea of refactoring the backends API and exposing it to users was
185-
originally proposed in `GH
186-
1970 <https://github.com/pydata/xarray/issues/1970>`__. The idea would
187-
be to develop a well tested and generic backend base class and
188-
associated utilities for external use. Specific tasks for this
189-
development would include:
184+
originally proposed in :issue:`1970`. The idea would be to develop a
185+
well tested and generic backend base class and associated utilities
186+
for external use. Specific tasks for this development would include:
190187

191188
- Exposing an abstract backend for writing new storage systems.
192189
- Exposing utilities for features like automatic closing of files,
@@ -225,7 +222,7 @@ examples include:
225222

226223
A new tree-like data structure which is essentially a structured hierarchical
227224
collection of Datasets could represent these cases, and would instead map to
228-
multiple netCDF groups (see `GH4118 <https://github.com/pydata/xarray/issues/4118>`__.).
225+
multiple netCDF groups (see :issue:`4118`).
229226

230227
Currently there are several libraries which have wrapped xarray in order to build
231228
domain-specific data structures (e.g. `xarray-multiscale <https://github.com/JaneliaSciComp/xarray-multiscale>`__.),

doc/whats-new.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2148,7 +2148,7 @@ Documentation
21482148
- Created a "How do I..." section (:ref:`howdoi`) for solutions to common questions. (:pull:`3357`).
21492149
By `Deepak Cherian <https://github.com/dcherian>`_.
21502150
- Add examples for :py:meth:`Dataset.swap_dims` and :py:meth:`DataArray.swap_dims`
2151-
(pull:`3331`, pull:`3331`). By `Justus Magin <https://github.com/keewis>`_.
2151+
(:pull:`3331`, :pull:`3331`). By `Justus Magin <https://github.com/keewis>`_.
21522152
- Add examples for :py:meth:`align`, :py:meth:`merge`, :py:meth:`combine_by_coords`,
21532153
:py:meth:`full_like`, :py:meth:`zeros_like`, :py:meth:`ones_like`, :py:meth:`Dataset.pipe`,
21542154
:py:meth:`Dataset.assign`, :py:meth:`Dataset.reindex`, :py:meth:`Dataset.fillna` (:pull:`3328`).
@@ -2732,7 +2732,7 @@ Removes inadvertently introduced setup dependency on pytest-runner
27322732
will be Python 3 only, but older versions of xarray will always be available
27332733
for Python 2.7 users. For the more details, see:
27342734

2735-
- `Xarray Github issue discussing dropping Python 2 <https://github.com/pydata/xarray/issues/1829>`__
2735+
- :issue:`Xarray Github issue discussing dropping Python 2 <1829>`
27362736
- `Python 3 Statement <http://www.python3statement.org/>`__
27372737
- `Tips on porting to Python 3 <https://docs.python.org/3/howto/pyporting.html>`__
27382738

0 commit comments

Comments
 (0)