remove obsolete version checks

Author: keewis

xarray/backends/plugins.py

@@ -3,7 +3,6 @@
 import functools
 import inspect
 import itertools
-import sys
 import warnings
 from collections.abc import Callable
 from importlib.metadata import entry_points
@@ -14,12 +13,7 @@
 
 if TYPE_CHECKING:
     import os
-    from importlib.metadata import EntryPoint
-
-    if sys.version_info >= (3, 10):
-        from importlib.metadata import EntryPoints
-    else:
-        EntryPoints = list[EntryPoint]
+    from importlib.metadata import EntryPoint, EntryPoints
     from io import BufferedIOBase
 
     from xarray.backends.common import AbstractDataStore
@@ -130,13 +124,8 @@ def list_engines() -> dict[str, BackendEntrypoint]:
     -----
     This function lives in the backends namespace (``engs=xr.backends.list_engines()``).
     If available, more information is available about each backend via ``engs["eng_name"]``.
-
-    # New selection mechanism introduced with Python 3.10. See GH6514.
     """
-    if sys.version_info >= (3, 10):
-        entrypoints = entry_points(group="xarray.backends")
-    else:
-        entrypoints = entry_points().get("xarray.backends", [])
+    entrypoints = entry_points(group="xarray.backends")
     return build_engines(entrypoints)
 
 

xarray/core/utils.py

@@ -63,7 +63,7 @@
 )
 from enum import Enum
 from pathlib import Path
-from typing import TYPE_CHECKING, Any, Generic, Literal, TypeVar, overload
+from typing import TYPE_CHECKING, Any, Generic, Literal, TypeGuard, TypeVar, overload
 
 import numpy as np
 import pandas as pd
@@ -275,34 +275,12 @@ def _is_scalar(value, include_0d):
     )
 
 
-# See GH5624, this is a convoluted way to allow type-checking to use `TypeGuard` without
-# requiring typing_extensions as a required dependency to _run_ the code (it is required
-# to type-check).
-try:
-    if sys.version_info >= (3, 10):
-        from typing import TypeGuard
-    else:
-        from typing import TypeGuard
-except ImportError:
-    if TYPE_CHECKING:
-        raise
-    else:
-
-        def is_scalar(value: Any, include_0d: bool = True) -> bool:
-            """Whether to treat a value as a scalar.
-
-            Any non-iterable, string, or 0-D array
-            """
-            return _is_scalar(value, include_0d)
+def is_scalar(value: Any, include_0d: bool = True) -> TypeGuard[Hashable]:
+    """Whether to treat a value as a scalar.
 
-else:
-
-    def is_scalar(value: Any, include_0d: bool = True) -> TypeGuard[Hashable]:
-        """Whether to treat a value as a scalar.
-
-        Any non-iterable, string, or 0-D array
-        """
-        return _is_scalar(value, include_0d)
+    Any non-iterable, string, or 0-D array
+    """
+    return _is_scalar(value, include_0d)
 
 
 def is_valid_numpy_dtype(dtype: Any) -> bool:

xarray/namedarray/dtypes.py

@@ -1,13 +1,7 @@
 from __future__ import annotations
 
 import functools
-import sys
-from typing import Any, Literal
-
-if sys.version_info >= (3, 10):
-    from typing import TypeGuard
-else:
-    from typing import TypeGuard
+from typing import Any, Literal, TypeGuard
 
 import numpy as np
 

xarray/namedarray/parallelcompat.py

@@ -7,7 +7,6 @@
 from __future__ import annotations
 
 import functools
-import sys
 from abc import ABC, abstractmethod
 from collections.abc import Callable, Iterable, Sequence
 from importlib.metadata import EntryPoint, entry_points
@@ -56,15 +55,8 @@ def list_chunkmanagers() -> dict[str, ChunkManagerEntrypoint[Any]]:
     chunkmanagers : dict
         Dictionary whose values are registered ChunkManagerEntrypoint subclass instances, and whose values
         are the strings under which they are registered.
-
-    Notes
-    -----
-    # New selection mechanism introduced with Python 3.10. See GH6514.
     """
-    if sys.version_info >= (3, 10):
-        entrypoints = entry_points(group="xarray.chunkmanagers")
-    else:
-        entrypoints = entry_points().get("xarray.chunkmanagers", ())
+    entrypoints = entry_points(group="xarray.chunkmanagers")
 
     return load_chunkmanagers(entrypoints)
 

xarray/namedarray/utils.py

@@ -1,7 +1,6 @@
 from __future__ import annotations
 
 import importlib
-import sys
 import warnings
 from collections.abc import Hashable, Iterable, Iterator, Mapping
 from functools import lru_cache
@@ -13,10 +12,7 @@
 from xarray.namedarray._typing import ErrorOptionsWithWarn, _DimsLike
 
 if TYPE_CHECKING:
-    if sys.version_info >= (3, 10):
-        from typing import TypeGuard
-    else:
-        from typing import TypeGuard
+    from typing import TypeGuard
 
     from numpy.typing import NDArray
 

xarray/tests/test_plugins.py

@@ -1,12 +1,7 @@
 from __future__ import annotations
 
 import sys
-from importlib.metadata import EntryPoint
-
-if sys.version_info >= (3, 10):
-    from importlib.metadata import EntryPoints
-else:
-    EntryPoints = list[EntryPoint]
+from importlib.metadata import EntryPoint, EntryPoints
 from unittest import mock
 
 import pytest
@@ -288,10 +283,7 @@ def test_refresh_engines() -> None:
     EntryPointMock1.name = "test1"
     EntryPointMock1.load.return_value = DummyBackendEntrypoint1
 
-    if sys.version_info >= (3, 10):
-        return_value = EntryPoints([EntryPointMock1])
-    else:
-        return_value = {"xarray.backends": [EntryPointMock1]}
+    return_value = EntryPoints([EntryPointMock1])
 
     with mock.patch("xarray.backends.plugins.entry_points", return_value=return_value):
         list_engines.cache_clear()
@@ -303,10 +295,7 @@ def test_refresh_engines() -> None:
     EntryPointMock2.name = "test2"
     EntryPointMock2.load.return_value = DummyBackendEntrypoint2
 
-    if sys.version_info >= (3, 10):
-        return_value2 = EntryPoints([EntryPointMock2])
-    else:
-        return_value2 = {"xarray.backends": [EntryPointMock2]}
+    return_value2 = EntryPoints([EntryPointMock2])
 
     with mock.patch("xarray.backends.plugins.entry_points", return_value=return_value2):
         refresh_engines()