anemoi-datasets 0.3.0__tar.gz → 0.3.2__tar.gz

{anemoi_datasets-0.3.0 → anemoi_datasets-0.3.2}/.pre-commit-config.yaml

@@ -64,7 +64,7 @@ repos:
       exclude: 'cli/.*' # Because we use argparse
 
 - repo: https://github.com/b8raoult/pre-commit-docconvert
-  rev: "0.1.4"
+  rev: "0.1.5"
   hooks:
   - id: docconvert
     args: ["numpy"]

{anemoi_datasets-0.3.0 → anemoi_datasets-0.3.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: anemoi-datasets
-Version: 0.3.0
+Version: 0.3.2
 Summary: A package to hold various functions to support training of ML models on ECMWF data.
 Author-email: "European Centre for Medium-Range Weather Forecasts (ECMWF)" <software.support@ecmwf.int>
 License:                                  Apache License
@@ -232,9 +232,10 @@ Requires-Dist: zarr<=2.17
 Provides-Extra: all
 Requires-Dist: anemoi-utils[provenance]>=0.3; extra == "all"
 Requires-Dist: boto3; extra == "all"
-Requires-Dist: climetlab>=0.22.1; extra == "all"
+Requires-Dist: climetlab>=0.23.2; extra == "all"
 Requires-Dist: earthkit-meteo; extra == "all"
 Requires-Dist: ecmwflibs>=0.6.3; extra == "all"
+Requires-Dist: entrypoints; extra == "all"
 Requires-Dist: numpy; extra == "all"
 Requires-Dist: pyproj; extra == "all"
 Requires-Dist: pyyaml; extra == "all"
@@ -244,13 +245,13 @@ Requires-Dist: semantic-version; extra == "all"
 Requires-Dist: tqdm; extra == "all"
 Requires-Dist: zarr<=2.17; extra == "all"
 Provides-Extra: create
-Requires-Dist: climetlab>=0.22.1; extra == "create"
+Requires-Dist: climetlab>=0.23.2; extra == "create"
 Requires-Dist: earthkit-meteo; extra == "create"
 Requires-Dist: ecmwflibs>=0.6.3; extra == "create"
+Requires-Dist: entrypoints; extra == "create"
 Requires-Dist: pyproj; extra == "create"
 Provides-Extra: dev
 Requires-Dist: boto3; extra == "dev"
-Requires-Dist: climetlab>=0.22.1; extra == "dev"
 Requires-Dist: earthkit-meteo; extra == "dev"
 Requires-Dist: ecmwflibs>=0.6.3; extra == "dev"
 Requires-Dist: nbsphinx; extra == "dev"

{anemoi_datasets-0.3.0 → anemoi_datasets-0.3.2}/docs/test.ipynb

@@ -113,7 +113,7 @@
     }
    ],
    "source": [
-    "print(len(ds))"
+    "print(len(ds,"
    ]
   },
   {

{anemoi_datasets-0.3.0 → anemoi_datasets-0.3.2}/pyproject.toml

@@ -61,9 +61,10 @@ dependencies = [
 optional-dependencies.all = [
   "anemoi-utils[provenance]>=0.3",
   "boto3",
-  "climetlab>=0.22.1",
+  "climetlab>=0.23.2",
   "earthkit-meteo",
   "ecmwflibs>=0.6.3",
+  "entrypoints",
   "numpy",
   "pyproj",
   "pyyaml",
@@ -74,14 +75,15 @@ optional-dependencies.all = [
   "zarr<=2.17",
 ]
 optional-dependencies.create = [
-  "climetlab>=0.22.1", # "earthkit-data"
+  "climetlab>=0.23.2", # "earthkit-data"
   "earthkit-meteo",
   "ecmwflibs>=0.6.3",
+  "entrypoints",
   "pyproj",
 ]
 optional-dependencies.dev = [
   "boto3",
-  "climetlab>=0.22.1", # "earthkit-data"
+
   "earthkit-meteo",
   "ecmwflibs>=0.6.3",
   "nbsphinx",

{anemoi_datasets-0.3.0 → anemoi_datasets-0.3.2}/src/anemoi/datasets/_version.py

@@ -12,5 +12,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '0.3.0'
-__version_tuple__ = version_tuple = (0, 3, 0)
+__version__ = version = '0.3.2'
+__version_tuple__ = version_tuple = (0, 3, 2)

{anemoi_datasets-0.3.0 → anemoi_datasets-0.3.2}/src/anemoi/datasets/create/functions/__init__.py

@@ -8,7 +8,30 @@
 #
 
 
+import importlib
+
+import entrypoints
+
+
 def assert_is_fieldset(obj):
     from climetlab.readers.grib.index import FieldSet
 
     assert isinstance(obj, FieldSet), type(obj)
+
+
+def import_function(name, kind):
+
+    name = name.replace("-", "_")
+
+    plugins = {}
+    for e in entrypoints.get_group_all(f"anemoi.datasets.{kind}s"):
+        plugins[e.name.replace("_", "-")] = e
+
+    if name in plugins:
+        return plugins[name].load()
+
+    module = importlib.import_module(
+        f".{kind}.{name}",
+        package=__name__,
+    )
+    return module.execute

{anemoi_datasets-0.3.0 → anemoi_datasets-0.3.2}/src/anemoi/datasets/create/input.py

@@ -7,7 +7,6 @@
 # nor does it submit to any jurisdiction.
 #
 import datetime
-import importlib
 import logging
 import time
 from collections import defaultdict
@@ -21,6 +20,7 @@ from climetlab.indexing.fieldset import FieldSet
 
 from anemoi.datasets.dates import Dates
 
+from .functions import import_function
 from .template import Context
 from .template import notify_result
 from .template import resolve
@@ -65,14 +65,6 @@ def time_delta_to_string(delta):
         return f"minus_{hours}h"
 
 
-def import_function(name, kind):
-    module = importlib.import_module(
-        f"..functions.{kind}.{name}",
-        package=__name__,
-    )
-    return module.execute
-
-
 def is_function(name, kind):
     name, delta = parse_function_name(name)  # noqa
     try:

{anemoi_datasets-0.3.0 → anemoi_datasets-0.3.2}/src/anemoi/datasets/data/misc.py

@@ -88,13 +88,12 @@ def _frequency_to_hours(frequency):
 
 
 def _as_date(d, dates, last):
-    if isinstance(d, np.datetime64):
-        d = d.astype(datetime.datetime)
 
-    if isinstance(d, datetime.datetime):
-        if not d.minute == 0 and d.hour == 0 and d.second == 0:
-            return np.datetime64(d)
-        d = datetime.date(d.year, d.month, d.day)
+    # WARNING,  datetime.datetime is a subclass of datetime.date
+    # so we need to check for datetime.datetime first
+
+    if isinstance(d, (np.datetime64, datetime.datetime)):
+        return d
 
     if isinstance(d, datetime.date):
         d = d.year * 10_000 + d.month * 100 + d.day

{anemoi_datasets-0.3.0 → anemoi_datasets-0.3.2}/src/anemoi_datasets.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: anemoi-datasets
-Version: 0.3.0
+Version: 0.3.2
 Summary: A package to hold various functions to support training of ML models on ECMWF data.
 Author-email: "European Centre for Medium-Range Weather Forecasts (ECMWF)" <software.support@ecmwf.int>
 License:                                  Apache License
@@ -232,9 +232,10 @@ Requires-Dist: zarr<=2.17
 Provides-Extra: all
 Requires-Dist: anemoi-utils[provenance]>=0.3; extra == "all"
 Requires-Dist: boto3; extra == "all"
-Requires-Dist: climetlab>=0.22.1; extra == "all"
+Requires-Dist: climetlab>=0.23.2; extra == "all"
 Requires-Dist: earthkit-meteo; extra == "all"
 Requires-Dist: ecmwflibs>=0.6.3; extra == "all"
+Requires-Dist: entrypoints; extra == "all"
 Requires-Dist: numpy; extra == "all"
 Requires-Dist: pyproj; extra == "all"
 Requires-Dist: pyyaml; extra == "all"
@@ -244,13 +245,13 @@ Requires-Dist: semantic-version; extra == "all"
 Requires-Dist: tqdm; extra == "all"
 Requires-Dist: zarr<=2.17; extra == "all"
 Provides-Extra: create
-Requires-Dist: climetlab>=0.22.1; extra == "create"
+Requires-Dist: climetlab>=0.23.2; extra == "create"
 Requires-Dist: earthkit-meteo; extra == "create"
 Requires-Dist: ecmwflibs>=0.6.3; extra == "create"
+Requires-Dist: entrypoints; extra == "create"
 Requires-Dist: pyproj; extra == "create"
 Provides-Extra: dev
 Requires-Dist: boto3; extra == "dev"
-Requires-Dist: climetlab>=0.22.1; extra == "dev"
 Requires-Dist: earthkit-meteo; extra == "dev"
 Requires-Dist: ecmwflibs>=0.6.3; extra == "dev"
 Requires-Dist: nbsphinx; extra == "dev"

{anemoi_datasets-0.3.0 → anemoi_datasets-0.3.2}/src/anemoi_datasets.egg-info/requires.txt

@@ -8,9 +8,10 @@ zarr<=2.17
 [all]
 anemoi-utils[provenance]>=0.3
 boto3
-climetlab>=0.22.1
+climetlab>=0.23.2
 earthkit-meteo
 ecmwflibs>=0.6.3
+entrypoints
 numpy
 pyproj
 pyyaml
@@ -21,14 +22,14 @@ tqdm
 zarr<=2.17
 
 [create]
-climetlab>=0.22.1
+climetlab>=0.23.2
 earthkit-meteo
 ecmwflibs>=0.6.3
+entrypoints
 pyproj
 
 [dev]
 boto3
-climetlab>=0.22.1
 earthkit-meteo
 ecmwflibs>=0.6.3
 nbsphinx