Skip to content

Commit cc5ffc9

Browse files
authored
Merge branch 'main' into sph_pixavproj
2 parents 52af201 + 712b724 commit cc5ffc9

125 files changed

Lines changed: 1747 additions & 1082 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/workflows/bleeding-edge.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ jobs:
4040
# the '-dev' suffix allows to use pre-releases if no final release is available yet
4141
# this version should be upgraded as often as possible, typically once a year when
4242
# Cython, numpy and matplotlib are known to be compatible
43-
python-version: '3.12-dev'
43+
python-version: '3.13-dev'
4444

4545
- name: Install dependencies
4646
# PyYAML needs to be installed in isolation for now, because of a known

.github/workflows/build-test.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,14 +25,14 @@ jobs:
2525
os:
2626
- ubuntu-latest
2727
- macos-latest
28-
python-version: ['3.12']
28+
python-version: ['3.13']
2929
dependencies: [full]
3030
tests-type: [unit]
3131
test-runner: [pytest]
3232
venv-loc: [bin]
3333
include:
3434
- os: windows-latest
35-
python-version: '3.12'
35+
python-version: '3.13'
3636
dependencies: full
3737
tests-type: unit
3838
test-runner: pytest

.github/workflows/wheels.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ jobs:
3333
uses: actions/checkout@v4
3434

3535
- name: Build wheels for CPython
36-
uses: pypa/cibuildwheel@v2.21.2
36+
uses: pypa/cibuildwheel@v2.22.0
3737
with:
3838
output-dir: dist
3939

@@ -82,7 +82,7 @@ jobs:
8282
- name: Set up Python
8383
uses: actions/setup-python@v5
8484
with:
85-
python-version: '3.12'
85+
python-version: '3.13'
8686
- name: install check-manifest
8787
run: |
8888
python -m pip install --upgrade pip
@@ -124,7 +124,7 @@ jobs:
124124
merge-multiple: true
125125

126126
- name: Publish to PyPI
127-
uses: pypa/gh-action-pypi-publish@v1.10.3
127+
uses: pypa/gh-action-pypi-publish@v1.12.4
128128
with:
129129
user: __token__
130130
password: ${{ secrets.pypi_token }}

.pre-commit-config.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,13 +30,13 @@ repos:
3030
# TODO: replace this with ruff when it supports embedded python blocks
3131
# see https://github.com/astral-sh/ruff/issues/8237
3232
- repo: https://github.com/adamchainz/blacken-docs
33-
rev: 1.18.0
33+
rev: 1.19.1
3434
hooks:
3535
- id: blacken-docs
3636
additional_dependencies: [black==24.3.0]
3737

3838
- repo: https://github.com/astral-sh/ruff-pre-commit
39-
rev: v0.6.9
39+
rev: v0.9.4
4040
hooks:
4141
- id: ruff-format
4242
- id: ruff
@@ -51,7 +51,7 @@ repos:
5151
- id: rst-backticks
5252

5353
- repo: https://github.com/MarcoGorelli/cython-lint
54-
rev: v0.16.2
54+
rev: v0.16.6
5555
hooks:
5656
- id: cython-lint
5757
args: [--no-pycodestyle]

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
[![Devel Mailing List](https://img.shields.io/badge/Devel-List-lightgrey.svg)](https://mail.python.org/archives/list/yt-dev@python.org//)
88
[![Data Hub](https://img.shields.io/badge/data-hub-orange.svg)](https://hub.yt/)
99
[![Powered by NumFOCUS](https://img.shields.io/badge/powered%20by-NumFOCUS-orange.svg?style=flat&colorA=E1523D&colorB=007D8A)](http://numfocus.org)
10-
[![Sponsor our Project](https://img.shields.io/badge/donate-to%20yt-blueviolet)](https://numfocus.salsalabs.org/donate-to-yt/index.html)
10+
[![Sponsor our Project](https://img.shields.io/badge/donate-to%20yt-blueviolet)](https://numfocus.org/donate-to-yt)
1111

1212
<!--- Tests and style --->
1313
[![Build and Test](https://github.com/yt-project/yt/actions/workflows/build-test.yaml/badge.svg)](https://github.com/yt-project/yt/actions/workflows/build-test.yaml)

conftest.py

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -156,8 +156,7 @@ def pytest_configure(config):
156156
# https://github.com/h5py/h5py/pull/2242
157157
config.addinivalue_line(
158158
"filterwarnings",
159-
"ignore:`product` is deprecated as of NumPy 1.25.0"
160-
":DeprecationWarning",
159+
"ignore:`product` is deprecated as of NumPy 1.25.0:DeprecationWarning",
161160
)
162161

163162
if PANDAS_VERSION is not None and PANDAS_VERSION >= Version("2.2.0"):
@@ -184,6 +183,16 @@ def pytest_configure(config):
184183
":DeprecationWarning",
185184
)
186185

186+
if find_spec("datatree"):
187+
# the cf_radial dependency arm-pyart<=1.9.2 installs the now deprecated
188+
# xarray-datatree package (which imports as datatree), which triggers
189+
# a bunch of runtimewarnings when importing xarray.
190+
# https://github.com/yt-project/yt/pull/5042#issuecomment-2457797694
191+
config.addinivalue_line(
192+
"filterwarnings",
193+
"ignore:" r"Engine.*loading failed.*" ":RuntimeWarning",
194+
)
195+
187196

188197
def pytest_collection_modifyitems(config, items):
189198
r"""

doc/source/conf.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,9 +68,9 @@
6868
# built documents.
6969
#
7070
# The short X.Y version.
71-
version = "4.4"
71+
version = "4.5"
7272
# The full version, including alpha/beta/rc tags.
73-
release = "4.4-dev"
73+
release = "4.5-dev"
7474

7575
# The language for content autogenerated by Sphinx. Refer to documentation
7676
# for a list of supported languages.

doc/source/cookbook/custom_colorbar_tickmarks.ipynb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@
7171
"cell_type": "markdown",
7272
"metadata": {},
7373
"source": [
74-
"Next, we call `_setup_plots()` to ensure the plot is properly initialized. Without this, the custom tickmarks we are adding will be ignored."
74+
"Next, we call `render()` to ensure the plot is properly rendered. Without this, the custom tickmarks we are adding will be ignored."
7575
]
7676
},
7777
{
@@ -82,7 +82,7 @@
8282
},
8383
"outputs": [],
8484
"source": [
85-
"slc._setup_plots()"
85+
"slc.render()"
8686
]
8787
},
8888
{

doc/source/cookbook/geographic_xforms_and_projections.ipynb

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,7 @@
174174
"cell_type": "markdown",
175175
"metadata": {},
176176
"source": [
177-
"Note that this doesn't have a lot of contextual information. We can add annotations for the coastlines just as we would with matplotlib. Before the annotations are set, we need to call `p._setup_plots` to make the axes available for annotation. "
177+
"Note that this doesn't have a lot of contextual information. We can add annotations for the coastlines just as we would with matplotlib. Before the annotations are set, we need to call `p.render` to make the axes available for annotation. "
178178
]
179179
},
180180
{
@@ -184,7 +184,7 @@
184184
"outputs": [],
185185
"source": [
186186
"p = yt.SlicePlot(ds, \"altitude\", \"AIRDENS\")\n",
187-
"p._setup_plots()\n",
187+
"p.render()\n",
188188
"p.plots[\"AIRDENS\"].axes.set_global()\n",
189189
"p.plots[\"AIRDENS\"].axes.coastlines()\n",
190190
"p.show()"
@@ -212,7 +212,7 @@
212212
"source": [
213213
"p = yt.SlicePlot(ds, \"altitude\", \"AIRDENS\")\n",
214214
"p.set_mpl_projection(\"Robinson\")\n",
215-
"p._setup_plots()\n",
215+
"p.render()\n",
216216
"p.plots[\"AIRDENS\"].axes.set_global()\n",
217217
"p.plots[\"AIRDENS\"].axes.coastlines()\n",
218218
"p.show()"
@@ -233,7 +233,7 @@
233233
"source": [
234234
"p = yt.SlicePlot(ds, \"altitude\", \"AIRDENS\")\n",
235235
"p.set_mpl_projection((\"Robinson\", (37.5,)))\n",
236-
"p._setup_plots()\n",
236+
"p.render()\n",
237237
"p.plots[\"AIRDENS\"].axes.set_global()\n",
238238
"p.plots[\"AIRDENS\"].axes.coastlines()\n",
239239
"p.show()"
@@ -253,7 +253,7 @@
253253
"outputs": [],
254254
"source": [
255255
"p.set_mpl_projection(\"Orthographic\")\n",
256-
"p._setup_plots()\n",
256+
"p.render()\n",
257257
"p.plots[\"AIRDENS\"].axes.set_global()\n",
258258
"p.plots[\"AIRDENS\"].axes.coastlines()\n",
259259
"p.show()"
@@ -289,7 +289,7 @@
289289
"outputs": [],
290290
"source": [
291291
"p.set_mpl_projection((\"Orthographic\", (90, 45)))\n",
292-
"p._setup_plots()\n",
292+
"p.render()\n",
293293
"p.plots[\"AIRDENS\"].axes.set_global()\n",
294294
"p.plots[\"AIRDENS\"].axes.coastlines()\n",
295295
"p.show()"
@@ -311,7 +311,7 @@
311311
"p.set_mpl_projection(\n",
312312
" (\"Orthographic\", (), {\"central_latitude\": -45, \"central_longitude\": 275})\n",
313313
")\n",
314-
"p._setup_plots()\n",
314+
"p.render()\n",
315315
"p.plots[\"AIRDENS\"].axes.set_global()\n",
316316
"p.plots[\"AIRDENS\"].axes.coastlines()\n",
317317
"p.show()"
@@ -338,7 +338,7 @@
338338
"outputs": [],
339339
"source": [
340340
"p.set_mpl_projection((\"RotatedPole\", (177.5, 37.5)))\n",
341-
"p._setup_plots()\n",
341+
"p.redner()\n",
342342
"p.plots[\"AIRDENS\"].axes.set_global()\n",
343343
"p.plots[\"AIRDENS\"].axes.coastlines()\n",
344344
"p.show()"
@@ -353,7 +353,7 @@
353353
"p.set_mpl_projection(\n",
354354
" (\"RotatedPole\", (), {\"pole_latitude\": 37.5, \"pole_longitude\": 177.5})\n",
355355
")\n",
356-
"p._setup_plots()\n",
356+
"p.render()\n",
357357
"p.plots[\"AIRDENS\"].axes.set_global()\n",
358358
"p.plots[\"AIRDENS\"].axes.coastlines()\n",
359359
"p.show()"
@@ -366,7 +366,7 @@
366366
"outputs": [],
367367
"source": [
368368
"p.set_mpl_projection(\"NorthPolarStereo\")\n",
369-
"p._setup_plots()\n",
369+
"p.render()\n",
370370
"p.plots[\"AIRDENS\"].axes.set_global()\n",
371371
"p.plots[\"AIRDENS\"].axes.coastlines()\n",
372372
"p.show()"
@@ -379,7 +379,7 @@
379379
"outputs": [],
380380
"source": [
381381
"p.set_mpl_projection(\"AlbersEqualArea\")\n",
382-
"p._setup_plots()\n",
382+
"p.render()\n",
383383
"p.plots[\"AIRDENS\"].axes.set_global()\n",
384384
"p.plots[\"AIRDENS\"].axes.coastlines()\n",
385385
"p.show()"
@@ -392,7 +392,7 @@
392392
"outputs": [],
393393
"source": [
394394
"p.set_mpl_projection(\"InterruptedGoodeHomolosine\")\n",
395-
"p._setup_plots()\n",
395+
"p.render()\n",
396396
"p.plots[\"AIRDENS\"].axes.set_global()\n",
397397
"p.plots[\"AIRDENS\"].axes.coastlines()\n",
398398
"p.show()"
@@ -405,7 +405,7 @@
405405
"outputs": [],
406406
"source": [
407407
"p.set_mpl_projection(\"Robinson\")\n",
408-
"p._setup_plots()\n",
408+
"p.render()\n",
409409
"p.plots[\"AIRDENS\"].axes.set_global()\n",
410410
"p.plots[\"AIRDENS\"].axes.coastlines()\n",
411411
"p.show()"
@@ -418,7 +418,7 @@
418418
"outputs": [],
419419
"source": [
420420
"p.set_mpl_projection(\"Gnomonic\")\n",
421-
"p._setup_plots()\n",
421+
"p.render()\n",
422422
"p.plots[\"AIRDENS\"].axes.set_global()\n",
423423
"p.plots[\"AIRDENS\"].axes.coastlines()\n",
424424
"p.show()"
@@ -465,7 +465,7 @@
465465
"outputs": [],
466466
"source": [
467467
"p.set_mpl_projection(\"Robinson\")\n",
468-
"p._setup_plots()\n",
468+
"p.render()\n",
469469
"p.plots[\"AIRDENS\"].axes.set_global()\n",
470470
"p.plots[\"AIRDENS\"].axes.coastlines()\n",
471471
"p.show()"

doc/source/visualizing/callbacks.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -257,7 +257,7 @@ Overplot Contours
257257
Add contours in ``field`` to the plot. ``levels`` governs the number of
258258
contours generated, ``factor`` governs the number of points used in the
259259
interpolation, ``take_log`` governs how it is contoured and ``clim`` gives
260-
the (upper, lower) limits for contouring.
260+
the (lower, upper) limits for contouring.
261261

262262
.. python-script::
263263

0 commit comments

Comments
 (0)