anemoi-utils 0.4.31__py3-none-any.whl → 0.4.32__py3-none-any.whl

anemoi/utils/_version.py

@@ -1,14 +1,7 @@
 # file generated by setuptools-scm
 # don't change, don't track in version control
 
-__all__ = [
-    "__version__",
-    "__version_tuple__",
-    "version",
-    "version_tuple",
-    "__commit_id__",
-    "commit_id",
-]
+__all__ = ["__version__", "__version_tuple__", "version", "version_tuple"]
 
 TYPE_CHECKING = False
 if TYPE_CHECKING:
@@ -16,19 +9,13 @@ if TYPE_CHECKING:
     from typing import Union
 
     VERSION_TUPLE = Tuple[Union[int, str], ...]
-    COMMIT_ID = Union[str, None]
 else:
     VERSION_TUPLE = object
-    COMMIT_ID = object
 
 version: str
 __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
-commit_id: COMMIT_ID
-__commit_id__: COMMIT_ID
 
-__version__ = version = '0.4.31'
-__version_tuple__ = version_tuple = (0, 4, 31)
-
-__commit_id__ = commit_id = None
+__version__ = version = '0.4.32'
+__version_tuple__ = version_tuple = (0, 4, 32)

anemoi/utils/testing.py

@@ -11,6 +11,7 @@ import logging
 import os
 import shutil
 import warnings
+from collections.abc import Callable
 from functools import lru_cache
 from pathlib import Path
 
@@ -42,17 +43,21 @@ def _check_path(path: str) -> None:
     assert not path.startswith("."), f"Path '{path}' should not start with '.'"
 
 
-@pytest.fixture(scope="session")
-def temporary_directory_for_test_data(tmp_path_factory) -> callable:
-    base_dir = tmp_path_factory.mktemp("test_data_base")
+class TemporaryDirectoryForTestData:
+    def __init__(self, base_dir: Path) -> None:
+        self.base_dir = base_dir
 
-    def _temporary_directory_for_test_data(path: str = "", archive: bool = False) -> str:
+    def __call__(self, path: str = "", archive: bool = False) -> str:
         if path == "":
-            return str(base_dir)
+            return str(self.base_dir)
         _check_path(path)
-        return str(base_dir.joinpath(*Path(path).parts)) + (".extracted" if archive else "")
+        return str(self.base_dir.joinpath(*Path(path).parts)) + (".extracted" if archive else "")
+
 
-    return _temporary_directory_for_test_data
+@pytest.fixture(scope="session")
+def temporary_directory_for_test_data(tmp_path_factory: pytest.TempPathFactory) -> TemporaryDirectoryForTestData:
+    base_dir = tmp_path_factory.mktemp("test_data_base")
+    return TemporaryDirectoryForTestData(base_dir)
 
 
 def url_for_test_data(path: str) -> str:
@@ -73,11 +78,12 @@ def url_for_test_data(path: str) -> str:
     return f"{TEST_DATA_URL}{path}"
 
 
-@pytest.fixture()
-def get_test_data(temporary_directory_for_test_data):
-    def _get_test_data(path: str, gzipped=False) -> callable:
-        """Download the test data to a temporary directory and return the local path.
+class GetTestData:
+    def __init__(self, temporary_directory_for_test_data: TemporaryDirectoryForTestData) -> None:
+        self.temporary_directory_for_test_data = temporary_directory_for_test_data
 
+    def __call__(self, path: str, gzipped: bool = False) -> str:
+        """Download the test data to a temporary directory and return the local path.
         Parameters
         ----------
         path : str
@@ -94,7 +100,7 @@ def get_test_data(temporary_directory_for_test_data):
         if _offline():
             raise RuntimeError("Offline mode: cannot download test data, add @pytest.mark.skipif(not offline(),...)")
 
-        target = temporary_directory_for_test_data(path)
+        target = self.temporary_directory_for_test_data(path)
 
         if os.path.exists(target):
             return target
@@ -121,12 +127,20 @@ def get_test_data(temporary_directory_for_test_data):
 
         return target
 
-    return _get_test_data
-
 
 @pytest.fixture()
-def get_test_archive(temporary_directory_for_test_data, get_test_data) -> callable:
-    def _get_test_archive(path: str) -> str:
+def get_test_data(temporary_directory_for_test_data: TemporaryDirectoryForTestData) -> GetTestData:
+    return GetTestData(temporary_directory_for_test_data)
+
+
+class GetTestArchive:
+    def __init__(
+        self, temporary_directory_for_test_data: TemporaryDirectoryForTestData, get_test_data: GetTestData
+    ) -> None:
+        self.temporary_directory_for_test_data = temporary_directory_for_test_data
+        self.get_test_data = get_test_data
+
+    def __call__(self, path: str) -> Path:
         """Download an archive file (.zip, .tar, .tar.gz, .tar.bz2, .tar.xz) to a temporary directory
         unpack it, and return the local path to the directory containing the extracted files.
 
@@ -134,8 +148,6 @@ def get_test_archive(temporary_directory_for_test_data, get_test_data) -> callab
         ----------
         path : str
             The relative path to the test data.
-        extension : str, optional
-            The extension to add to the extracted directory, by default '.extracted'
 
         Returns
         -------
@@ -143,12 +155,12 @@ def get_test_archive(temporary_directory_for_test_data, get_test_data) -> callab
             The local path to the downloaded test data.
         """
 
-        target = Path(temporary_directory_for_test_data(path, archive=True))
+        target = Path(self.temporary_directory_for_test_data(path, archive=True))
 
         if os.path.exists(target):
             return target
 
-        archive = get_test_data(path)
+        archive = self.get_test_data(path)
 
         shutil.unpack_archive(archive, os.path.dirname(target) + ".tmp")
         os.rename(os.path.dirname(target) + ".tmp", target)
@@ -157,7 +169,12 @@ def get_test_archive(temporary_directory_for_test_data, get_test_data) -> callab
 
         return target
 
-    return _get_test_archive
+
+@pytest.fixture()
+def get_test_archive(
+    temporary_directory_for_test_data: TemporaryDirectoryForTestData, get_test_data: GetTestData
+) -> GetTestArchive:
+    return GetTestArchive(temporary_directory_for_test_data, get_test_data)
 
 
 def packages_installed(*names: str) -> bool:
@@ -231,28 +248,27 @@ def _run_slow_tests() -> bool:
     bool
         True if the SLOW_TESTS environment variable is set, False otherwise.
     """
-    return int(os.environ.get("SLOW_TESTS", 0))
+    return bool(int(os.environ.get("SLOW_TESTS", 0)))
 
 
 @lru_cache(maxsize=None)
 def _offline() -> bool:
     """Check if we are offline."""
     from urllib import request
+    from urllib.error import URLError
 
     try:
         request.urlopen("https://anemoi.ecmwf.int", timeout=1)
         return False
-    except request.URLError:
+    except URLError:
         return True
 
-    return False
-
 
 skip_if_offline = pytest.mark.skipif(_offline(), reason="No internet connection")
 skip_slow_tests = pytest.mark.skipif(not _run_slow_tests(), reason="Skipping slow tests")
 
 
-def skip_missing_packages(*names: str) -> callable:
+def skip_missing_packages(*names: str) -> pytest.MarkDecorator:
     """Skip a test if any of the specified packages are missing.
 
     Parameters
@@ -268,16 +284,17 @@ def skip_missing_packages(*names: str) -> callable:
 
     missing = [f"'{p}'" for p in _missing_packages(*names)]
 
-    if len(missing) == 0:
-        return lambda f: f
+    reason = ""
 
     if len(missing) == 1:
-        return pytest.mark.skipif(True, reason=f"Package {missing[0]} is not installed")
+        reason = f"Package {missing[0]} is not installed"
+    elif len(missing):
+        reason = f"Packages {list_to_human(missing)} are not installed"
 
-    return pytest.mark.skipif(True, reason=f"Packages {list_to_human(missing)} are not installed")
+    return pytest.mark.skipif(len(missing) > 0, reason=reason)
 
 
-def skip_if_missing_command(cmd: str) -> callable:
+def skip_if_missing_command(cmd: str) -> pytest.MarkDecorator:
     """Skip a test if the specified command is not available.
 
     Parameters
@@ -293,13 +310,10 @@ def skip_if_missing_command(cmd: str) -> callable:
 
     import shutil
 
-    if shutil.which(cmd):
-        return lambda f: f
+    return pytest.mark.skipif(not shutil.which(cmd), reason=f"Command '{cmd}' is not available")
 
-    return pytest.mark.skipif(True, reason=f"Command '{cmd}' is not available")
 
-
-def cli_testing(package: str, cmd: str, *args: list[str]) -> None:
+def cli_testing(package: str, cmd: str, *args: str) -> None:
     """Run a CLI command for testing purposes.
 
     Parameters
@@ -309,7 +323,7 @@ def cli_testing(package: str, cmd: str, *args: list[str]) -> None:
         Can be 'anemoi-datasets' or 'anemoi.datasets'.
     cmd : str
         The command to run.
-    *args : list[str]
+    *args : str
         Additional arguments to pass to the command.
     """
 
@@ -323,16 +337,16 @@ def cli_testing(package: str, cmd: str, *args: list[str]) -> None:
         version=version,
         description=f"Testing the '{cmd}' CLI command from the '{package}' package.",
         commands=COMMANDS,
-        test_arguments=(cmd,) + args,
+        test_arguments=[cmd] + list(args),
     )
 
 
-def run_tests(globals: dict[str, callable]) -> None:
+def run_tests(globals: dict[str, Callable[[], None]]) -> None:
     """Run all test functions that start with 'test_'.
 
     Parameters
     ----------
-    globals : dict[str, callable]
+    globals : dict[str, Callable[[], None]]
         The global namespace containing the test functions.
 
     Example
@@ -357,7 +371,6 @@ def run_tests(globals: dict[str, callable]) -> None:
 
     for name, obj in list(globals.items()):
         if name.startswith("test_") and callable(obj):
-
             pytestmark = getattr(obj, "pytestmark", None)
             if pytestmark is not None:
                 if not isinstance(pytestmark, list):

{anemoi_utils-0.4.31.dist-info → anemoi_utils-0.4.32.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: anemoi-utils
-Version: 0.4.31
+Version: 0.4.32
 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

{anemoi_utils-0.4.31.dist-info → anemoi_utils-0.4.32.dist-info}/RECORD

@@ -1,6 +1,6 @@
 anemoi/utils/__init__.py,sha256=uVhpF-VjIl_4mMywOVtgTutgsdIsqz-xdkwxeMhzuag,730
 anemoi/utils/__main__.py,sha256=6LlE4MYrPvqqrykxXh7XMi50UZteUY59NeM8P9Zs2dU,910
-anemoi/utils/_version.py,sha256=bvzZRPAHPCx967KBj1M9nnZf0LAd256lffiAVfk3-ok,706
+anemoi/utils/_version.py,sha256=oAm79fUiHcXTCTEkFD4DV2bxk8dDUofRGFcRzCcXEdU,513
 anemoi/utils/caching.py,sha256=wKkpsACniNCFK1nc5Tw18EAv9FJGYdhs5p8qsr8i_FI,6153
 anemoi/utils/checkpoints.py,sha256=U197rvPUD1_XBA-VphgA0staFkgx2TzDoBdbnch-I7Y,9550
 anemoi/utils/cli.py,sha256=p4sup42X7JW47AKM3IQn4_0-KUAlc5ceBMj8FYmSdlc,6500
@@ -19,7 +19,7 @@ anemoi/utils/rules.py,sha256=YtJcwkyBJwPjHlM4ZM6icGJXLCRZmcuHCXc-SSR8wgw,6856
 anemoi/utils/s3.py,sha256=bBVlfg3R4sJYOfgrSkhX7MxSVUQEur4LjE86ug8vkNw,4052
 anemoi/utils/sanitise.py,sha256=XkQzibDbu-VFJkJC4WcB9ovkcTkVAynXtkn1Tlc2CC4,4019
 anemoi/utils/sanitize.py,sha256=43ZKDcfVpeXSsJ9TFEc9aZnD6oe2cUh151XnDspM98M,462
-anemoi/utils/testing.py,sha256=DeTAkmg-RCMPXBBRUy_Gti5UJriUPRKT6ruE3JL2GVc,10372
+anemoi/utils/testing.py,sha256=MKKX43mDwLhEeuMaTt05TFvXvSq6j8yW5jWENKoSiBY,11145
 anemoi/utils/text.py,sha256=9M7VepzZLL-jGfFGXDqNxjwpNl7tiU8arkkOqhT9iSE,14361
 anemoi/utils/timer.py,sha256=_leKMYza2faM7JKlGE7LCNy13rbdPnwaCF7PSrI_NmI,3895
 anemoi/utils/commands/__init__.py,sha256=5u_6EwdqYczIAgJfCwRSyQAYFEqh2ZuHHT57g9g7sdI,808
@@ -39,9 +39,9 @@ anemoi/utils/remote/s3.py,sha256=BWI4bUmZHBvvqU6idewyg4ApxTlhCtX3cpwjeheCSo4,213
 anemoi/utils/remote/ssh.py,sha256=xNtsawh8okytCKRehkRCVExbHZj-CRUQNormEHglfuw,8088
 anemoi/utils/schemas/__init__.py,sha256=nkinKlsPLPXEjfTYQT1mpKC4cvs-14w_zBkDRxakwxw,698
 anemoi/utils/schemas/errors.py,sha256=lgOXzVTYzAE0qWQf3OZ42vCWixv8lilSqLLhzARBmvI,1831
-anemoi_utils-0.4.31.dist-info/licenses/LICENSE,sha256=8HznKF1Vi2IvfLsKNE5A2iVyiri3pRjRPvPC9kxs6qk,11354
-anemoi_utils-0.4.31.dist-info/METADATA,sha256=EcYf4exSKrdV2BR1W4xJ3sH6e5FMn8L2KOCnL-4fmrI,15668
-anemoi_utils-0.4.31.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-anemoi_utils-0.4.31.dist-info/entry_points.txt,sha256=LENOkn88xzFQo-V59AKoA_F_cfYQTJYtrNTtf37YgHY,60
-anemoi_utils-0.4.31.dist-info/top_level.txt,sha256=DYn8VPs-fNwr7fNH9XIBqeXIwiYYd2E2k5-dUFFqUz0,7
-anemoi_utils-0.4.31.dist-info/RECORD,,
+anemoi_utils-0.4.32.dist-info/licenses/LICENSE,sha256=8HznKF1Vi2IvfLsKNE5A2iVyiri3pRjRPvPC9kxs6qk,11354
+anemoi_utils-0.4.32.dist-info/METADATA,sha256=WyYYg-sVWEvRSZH9-uyqAdP3oemUq4DI97sZExxibD8,15668
+anemoi_utils-0.4.32.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+anemoi_utils-0.4.32.dist-info/entry_points.txt,sha256=LENOkn88xzFQo-V59AKoA_F_cfYQTJYtrNTtf37YgHY,60
+anemoi_utils-0.4.32.dist-info/top_level.txt,sha256=DYn8VPs-fNwr7fNH9XIBqeXIwiYYd2E2k5-dUFFqUz0,7
+anemoi_utils-0.4.32.dist-info/RECORD,,