Skip to content

Commit ae4570f

Browse files
Merge pull request #896 from ecmwf/release/0.19.0
Release/0.19.0
2 parents c6aaaa0 + 137ec91 commit ae4570f

File tree

82 files changed

+2685
-527
lines changed

Some content is hidden

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

82 files changed

+2685
-527
lines changed

.github/ci-hpc-config.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ build:
1515
- ecmwf/pdbufr@master
1616
- ecmwf/pyodc@develop
1717
- ecmwf/pyfdb@develop
18+
- ecmwf/earthkit-utils@develop
1819
env:
1920
- ECCODES_SAMPLES_PATH=$ECCODES_DIR/share/eccodes/samples
2021
- ECCODES_DEFINITION_PATH=$ECCODES_DIR/share/eccodes/definitions

.github/ci-hpc-gpu-config.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ build:
1515
- ecmwf/pdbufr@master
1616
- ecmwf/pyodc@develop
1717
- ecmwf/pyfdb@develop
18+
- ecmwf/earthkit-utils@develop
1819
env:
1920
- ECCODES_SAMPLES_PATH=$ECCODES_DIR/share/eccodes/samples
2021
- ECCODES_DEFINITION_PATH=$ECCODES_DIR/share/eccodes/definitions

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -216,6 +216,7 @@ docs/examples/earthkit_use_cases/*.grib
216216
docs/examples/_fdb
217217
docs/experimental/_*
218218
docs/experimental/*.grib*
219+
docs/experimental/*.pp*
219220
docs/experimental/*.png*
220221

221222
# PyBuilder

.pre-commit-config.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ repos:
88
- id: check-yaml # Check YAML files for syntax errors only
99
args: [--unsafe, --allow-multiple-documents]
1010
- id: check-toml
11-
# - id: check-added-large-files
11+
# - id: check-added-large-files
1212
- id: debug-statements # Check for debugger imports and py37+ breakpoint()
1313
- id: mixed-line-ending
1414
- id: no-commit-to-branch # Prevent committing to main / master
@@ -49,7 +49,7 @@ repos:
4949
- id: mdformat
5050
exclude: cruft-update-template.md
5151
- repo: https://github.com/macisamuele/language-formatters-pre-commit-hooks
52-
rev: v2.11.0
52+
rev: v2.16.0
5353
hooks:
5454
- id: pretty-format-yaml
5555
args: [--autofix, --preserve-quotes]

.readthedocs.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ formats: []
33
build:
44
os: "ubuntu-22.04"
55
tools:
6-
python: "3.9"
6+
python: "3.10"
77
python:
88
install:
99
- requirements: docs/requirements.txt

docs/conf.py

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -111,6 +111,10 @@
111111
"earthkit-regrid",
112112
"https://earthkit-regrid.readthedocs.io/en/latest/",
113113
),
114+
"earthkit-utils": (
115+
"earthkit-utils",
116+
"https://github.com/ecmwf/earthkit-utils",
117+
),
114118
"eccodes": (
115119
"ecCodes",
116120
"https://confluence.ecmwf.int/display/ECC/ecCodes+Home",

docs/examples/air_temp.pp

27.6 KB
Binary file not shown.

docs/examples/geotiff.ipynb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -801,7 +801,7 @@
801801
"name": "python",
802802
"nbconvert_exporter": "python",
803803
"pygments_lexer": "ipython3",
804-
"version": "3.10.13"
804+
"version": "3.13.1"
805805
}
806806
},
807807
"nbformat": 4,
Lines changed: 8 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@
6161
}
6262
},
6363
"source": [
64-
"Using the :meth:`~data.core.fieldlist.FieldList.to_fieldlist` method we can convert this object into an array fieldlist where each field contains an array (holding the field values) and a :py:class:`~data.readers.grib.metadata.RestrictedGribMetadata` object representing the related metadata. Array fieldlists are entirely stored in memory. The resulting array format is controlled by ``array_backend`` keyword argument of :meth:`~data.core.fieldlist.FieldList.to_fieldlist`. When using its default value (None) the underlying array format of the original fieldlist is kept. For GRIB data read from a file or stream this will be \"numpy\". "
64+
"Using the :meth:`~data.core.fieldlist.FieldList.to_fieldlist` method we can convert this object into an array fieldlist where each field contains an array (holding the field values) and a :py:class:`~data.readers.grib.metadata.RestrictedGribMetadata` object representing the related metadata. Array fieldlists are entirely stored in memory. The resulting array format is controlled by ``array_namespace`` keyword argument of :meth:`~data.core.fieldlist.FieldList.to_fieldlist`. When using its default value (None) the underlying array format of the original fieldlist is kept. For GRIB data read from a file or stream this will be \"numpy\". "
6565
]
6666
},
6767
{
@@ -124,7 +124,7 @@
124124
"id": "e34b8492-60d5-4052-abf9-b02d1a692c1d",
125125
"metadata": {},
126126
"source": [
127-
"For the next example we choose the \"pytorch\" array backend. Since pytorch is an optional dependency for earthkit-data we need to ensure it is installed in the environment."
127+
"For the next example we choose the \"torch\" array namespace. Since pytorch is an optional dependency for earthkit-data we need to ensure it is installed in the environment."
128128
]
129129
},
130130
{
@@ -138,16 +138,7 @@
138138
},
139139
"tags": []
140140
},
141-
"outputs": [
142-
{
143-
"name": "stdout",
144-
"output_type": "stream",
145-
"text": [
146-
"\u001b[33mWARNING: Error parsing requirements for nbsphinx: [Errno 2] No such file or directory: '/opt/homebrew/Caskroom/miniforge/base/envs/dev_ecc/lib/python3.10/site-packages/nbsphinx-0.9.3.dist-info/METADATA'\u001b[0m\u001b[33m\n",
147-
"\u001b[0m"
148-
]
149-
}
150-
],
141+
"outputs": [],
151142
"source": [
152143
"!pip install torch --quiet"
153144
]
@@ -165,7 +156,7 @@
165156
},
166157
"outputs": [],
167158
"source": [
168-
"ds = ds_in.to_fieldlist(array_backend=\"pytorch\")"
159+
"ds = ds_in.to_fieldlist(array_namespace=\"torch\")"
169160
]
170161
},
171162
{
@@ -430,7 +421,7 @@
430421
"tags": []
431422
},
432423
"source": [
433-
":py:meth:`Field.to_array() <data.core.fieldlist.Field.to_array>` and :py:meth:`FieldList.to_array() <data.core.fieldlist.FieldList.to_array>` return the values based on the underlying backend. "
424+
":py:meth:`Field.to_array() <data.core.fieldlist.Field.to_array>` and :py:meth:`FieldList.to_array() <data.core.fieldlist.FieldList.to_array>` return the values based on the underlying namespace. "
434425
]
435426
},
436427
{
@@ -1095,9 +1086,9 @@
10951086
],
10961087
"metadata": {
10971088
"kernelspec": {
1098-
"display_name": "dev_ecc",
1089+
"display_name": "dev",
10991090
"language": "python",
1100-
"name": "dev_ecc"
1091+
"name": "dev"
11011092
},
11021093
"language_info": {
11031094
"codemirror_mode": {
@@ -1109,7 +1100,7 @@
11091100
"name": "python",
11101101
"nbconvert_exporter": "python",
11111102
"pygments_lexer": "ipython3",
1112-
"version": "3.10.13"
1103+
"version": "3.13.1"
11131104
}
11141105
},
11151106
"nbformat": 4,

docs/examples/index.rst

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ GRIB
4848
grib_metadata_object.ipynb
4949
grib_modification.ipynb
5050
numpy_fieldlist.ipynb
51-
grib_array_backends.ipynb
51+
grib_array_namespace.ipynb
5252
grib_nearest_gridpoint.ipynb
5353
grib_time_series.ipynb
5454
grib_fdb_write.ipynb
@@ -124,6 +124,16 @@ Shapefile
124124

125125
.. _examples_lod:
126126

127+
UK Met Office PP file
128+
++++++++++++++++++++++
129+
130+
.. toctree::
131+
:maxdepth: 1
132+
:glob:
133+
134+
ukmo_pp.ipynb
135+
136+
127137
Dictionary input
128138
++++++++++++++++++++++
129139

0 commit comments

Comments
 (0)