Merge branch 'develop' into feature/merge-develop-into-main-0.10.0

ecmwf · Sep 2, 2024 · 8735c2e · 8735c2e
2 parents 61dfca7 + 973c436
commit 8735c2e
Show file tree

Hide file tree

Showing 37 changed files with 2,629 additions and 291 deletions.
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -11,7 +11,7 @@ repos:
   - id: debug-statements
   - id: mixed-line-ending
   - id: no-commit-to-branch # Prevent committing to main / master
-  - id: check-merge-conflict # Check for files that contain merge conflict
+  # - id: check-merge-conflict # Check for files that contain merge conflict
 - repo: https://github.com/PyCQA/isort
   rev: 5.13.0
   hooks:

diff --git a/docs/api.rst b/docs/api.rst
@@ -18,6 +18,8 @@ Metadata
 - :py:class:`~data.core.metadata.Metadata`
 - :py:class:`~data.core.metadata.RawMetadata`
 - :py:class:`~data.readers.grib.metadata.GribMetadata`
+- :py:class:`~data.readers.grib.metadata.GribFieldMetadata`
+- :py:class:`~data.readers.grib.metadata.StandAloneGribMetadata`
 
 Numpy fields
 ---------------