Merge pull request #989 from xcube-dev/konstntokas-xxx-apply_pyupgrade

Used pyupgrade to automatically upgrade syntax for newer versions of the language

Author: konstntokas

CHANGES.md

@@ -90,6 +90,9 @@
 * Added project URLs and classifiers to `setup.py`, which will be shown in the
   left sidebar on the [PyPI xcube-core](https://pypi.org/project/xcube-core/) webpage.
 
+* Used [`pyupgrade`](https://github.com/asottile/pyupgrade) to automatically upgrade
+  language syntax for Python versions >= 3.9.  
+
 ## Changes in 1.5.1
 
 * Embedded [xcube-viewer 1.1.1](https://github.com/xcube-dev/xcube-viewer/releases/tag/v1.1.1).

test/cli/helpers.py

@@ -18,20 +18,20 @@
 
 
 class CliTest(unittest.TestCase, metaclass=ABCMeta):
-    def invoke_cli(self, args: List[str]):
+    def invoke_cli(self, args: list[str]):
         self.runner = click.testing.CliRunner(mix_stderr=False)
         # noinspection PyTypeChecker
         return self.runner.invoke(cli, args, catch_exceptions=False)
 
 
 class CliDataTest(CliTest, metaclass=ABCMeta):
-    def outputs(self) -> List[str]:
+    def outputs(self) -> list[str]:
         return []
 
     def time_periods(self) -> int:
         return 5
 
-    def chunks(self) -> Optional[Dict[str, int]]:
+    def chunks(self) -> Optional[dict[str, int]]:
         return None
 
     def setUp(self):

test/cli/test_compute.py

@@ -13,7 +13,7 @@
 
 
 class ComputeCliTest(CliDataTest):
-    def outputs(self) -> List[str]:
+    def outputs(self) -> list[str]:
         return [OUTPUT_PATH]
 
     def test_help_option(self):

test/cli/test_genpts.py

@@ -16,7 +16,7 @@
 
 
 class GenptsCliTest(CliDataTest):
-    def outputs(self) -> List[str]:
+    def outputs(self) -> list[str]:
         return [TEST_CSV, TEST_GEOJSON]
 
     def test_help_option(self):

test/cli/test_grid.py

@@ -96,7 +96,7 @@ def test_find_close_resolutions(self):
 
 class GridCliTest(unittest.TestCase):
     @classmethod
-    def invoke_cli(cls, args: List[str]):
+    def invoke_cli(cls, args: list[str]):
         runner = click.testing.CliRunner()
         return runner.invoke(cli, args)
 

test/cli/test_level.py

@@ -21,10 +21,10 @@ def test_help_option(self):
 class LevelDataTest(CliDataTest):
     TEST_OUTPUT = "test.levels"
 
-    def outputs(self) -> List[str]:
+    def outputs(self) -> list[str]:
         return [LevelDataTest.TEST_OUTPUT, "my.levels"]
 
-    def chunks(self) -> Optional[Dict[str, int]]:
+    def chunks(self) -> Optional[dict[str, int]]:
         return dict(time=1, lat=90, lon=180)
 
     def test_all_defaults(self):
@@ -64,7 +64,7 @@ def test_with_tile_size_and_num_levels(self):
         )
 
     def _assert_result_ok(
-        self, result, level_chunks: List[Tuple], output_path: str, message_regex: str
+        self, result, level_chunks: list[tuple], output_path: str, message_regex: str
     ):
         self.assertEqual(0, result.exit_code)
         self.assertRegex(result.stderr, message_regex)

test/cli/test_rectify.py

@@ -10,7 +10,7 @@
 
 
 class RectifyTest(CliDataTest):
-    def outputs(self) -> List[str]:
+    def outputs(self) -> list[str]:
         return ["out.zarr"]
 
     def test_rectify_without_vars(self):

test/cli/test_resample.py

@@ -18,7 +18,7 @@ def test_help_option(self):
 
 
 class ResampleDataTest(CliDataTest):
-    def outputs(self) -> List[str]:
+    def outputs(self) -> list[str]:
         return ["out.zarr", "resampled.zarr"]
 
     def test_all_defaults(self):

test/core/byoa/test_data/user_code/impl/algorithm.py

@@ -9,7 +9,7 @@
 
 
 def compute_chunk(
-    input_var_1: np.ndarray, input_var_2: np.ndarray, input_params: Dict[str, Any]
+    input_var_1: np.ndarray, input_var_2: np.ndarray, input_params: dict[str, Any]
 ) -> xr.Dataset:
     factor_1: float = input_params["factor_1"]
     factor_2: float = input_params["factor_2"]

test/core/diagnosticstore.py

@@ -5,7 +5,8 @@
 import time
 from collections.abc import MutableMapping
 from types import MethodType
-from typing import TypeVar, Iterator, List, Callable, Any, Tuple
+from typing import TypeVar, List, Callable, Any, Tuple
+from collections.abc import Iterator
 
 _KT = TypeVar("_KT")
 _VT = TypeVar("_VT")
@@ -17,7 +18,7 @@ class DiagnosticStore(MutableMapping):
     def __init__(
         self,
         delegate: MutableMapping,
-        observer: Callable[[int, float, str, List[Tuple[str, Any]]], None] = None,
+        observer: Callable[[int, float, str, list[tuple[str, Any]]], None] = None,
     ):
         self._delegate = delegate
         self._observer = observer or logging_observer()
@@ -26,10 +27,10 @@ def __init__(
         self._add_optional_method("rmdir", ["path"])
         self._add_optional_method("rename", ["from_path", "to_path"])
 
-    def _add_optional_method(self, method_name: str, arg_names: List[str]):
+    def _add_optional_method(self, method_name: str, arg_names: list[str]):
         if hasattr(self._delegate, method_name):
 
-            def method(_self, *args) -> List[str]:
+            def method(_self, *args) -> list[str]:
                 return _self.call_and_notify(
                     method_name, *[(arg_names[i], args[i]) for i in range(len(args))]
                 )

test/core/gen/test_gen.py

@@ -4,7 +4,8 @@
 
 import os
 import unittest
-from typing import Any, Dict, Optional, Sequence, Tuple
+from typing import Any, Dict, Optional, Tuple
+from collections.abc import Sequence
 
 import numpy as np
 import xarray as xr
@@ -731,7 +732,7 @@ def assert_cube_ok(
         self,
         cube: xr.Dataset,
         expected_time_dim: int,
-        expected_extra_attrs: Dict[str, Any],
+        expected_extra_attrs: dict[str, Any],
         expected_output_vars: Sequence[str] = ("analysed_sst",),
     ):
         self.assertEqual(
@@ -813,7 +814,7 @@ def gen_cube_wrapper(
     input_processor_name=None,
     processed_variables=None,
     output_variables=(("analysed_sst", None),),
-) -> Tuple[bool, Optional[str]]:
+) -> tuple[bool, Optional[str]]:
     output = None
 
     def output_monitor(msg):

test/core/gen2/local/test_generator.py

@@ -26,7 +26,7 @@
 
 
 class LocalCubeGeneratorTest(unittest.TestCase):
-    REQUEST: Dict[str, Any] = dict(
+    REQUEST: dict[str, Any] = dict(
         input_config=dict(store_id="memory", data_id="S2L2A.zarr"),
         cube_config=dict(
             variable_names=["B01", "B02", "B03"],

test/core/gen2/remote/server.py

@@ -30,15 +30,15 @@
 from xcube.util.temp import new_temp_dir
 from xcube.util.temp import new_temp_file
 
-Job = Tuple[
+Job = tuple[
     subprocess.Popen,  # process
     str,  # result_path
     str,  # start_time
-    Dict[str, Any],  # updated state object
+    dict[str, Any],  # updated state object
 ]
 
 STORES_CONFIG_PATH: str = ""
-JOBS: Dict[str, Job] = {}
+JOBS: dict[str, Job] = {}
 
 app = flask.Flask("test.core.gen2.remote.server")
 
@@ -147,7 +147,7 @@ def _get_generate_cube_result(
     process: Optional[subprocess.Popen],
     result_path: Optional[str],
     job_id: Optional[str],
-) -> Tuple[Dict[str, Any], int]:
+) -> tuple[dict[str, Any], int]:
     global JOBS
 
     if process is not None:
@@ -203,7 +203,7 @@ def _get_generate_cube_result(
 
 
 def _get_set_status_code(
-    result_json: Dict[str, Any], success_code: int = 200, failure_code: int = 400
+    result_json: dict[str, Any], success_code: int = 200, failure_code: int = 400
 ) -> int:
     status_code = result_json.get("status_code")
     if status_code is None:

test/core/gen2/remote/test_generator.py

@@ -22,8 +22,8 @@ def make_result(
     worked,
     total_work,
     failed=False,
-    output: List[str] = None,
-    job_result: Dict[str, Any] = None,
+    output: list[str] = None,
+    job_result: dict[str, Any] = None,
 ):
     json = {
         "job_id": "93",

test/core/gridmapping/test_cfconv.py

@@ -231,7 +231,7 @@ def test_cf_2d_data_vars(self):
         self.assertVarNames({"noise", "crs", "lon", "lat"}, set(), decode_cf=False)
 
     def assertVarNames(
-        self, exp_data_vars: Set[str], exp_coords: Set[str], decode_cf: bool
+        self, exp_data_vars: set[str], exp_coords: set[str], decode_cf: bool
     ):
         ds1 = xr.open_zarr("noise.zarr", decode_cf=decode_cf)
         self.assertEqual(exp_coords, set(ds1.coords))

test/core/mldataset/test_fs.py

@@ -5,7 +5,8 @@
 
 import math
 import unittest
-from typing import Optional, List, Mapping
+from typing import Optional, List
+from collections.abc import Mapping
 
 import fsspec
 import fsspec.core
@@ -85,10 +86,10 @@ def assert_io_ok(
         tile_size: Optional[int],
         use_saved_levels: bool,
         base_dataset_path: Optional[str],
-        expected_files: List[str],
+        expected_files: list[str],
         expected_num_levels: int,
         expected_agg_methods: Optional[Mapping[str, AggMethod]],
-        expected_tile_size: List[int],
+        expected_tile_size: list[int],
     ):
         fs = self.fs
         FsMultiLevelDataset.write_dataset(
@@ -105,7 +106,7 @@ def assert_io_ok(
         )
         self.assertTrue(fs.isdir(path))
         self.assertEqual(
-            set([f"/{path}/{f}" for f in expected_files]),
+            {f"/{path}/{f}" for f in expected_files},
             set(fs.listdir(path, detail=False)),
         )
 

test/core/resampling/test_rectify.py

@@ -733,7 +733,7 @@ def test_rectify_2x2_to_13x13_none(self):
 
     def _assert_shape_and_dim(
         self, target_ds, size, chunks=None, var_names=("rad",)
-    ) -> Tuple[xr.DataArray, ...]:
+    ) -> tuple[xr.DataArray, ...]:
         w, h = size
 
         self.assertIn("lon", target_ds)

test/core/store/fs/test_plugin.py

@@ -46,9 +46,9 @@ class FsDataStoreAndAccessorsPluginTest(unittest.TestCase):
     def test_find_data_store_extensions(self):
         extensions = find_data_store_extensions()
         self.assertTrue(len(extensions) >= len(expected_fs_store_ids))
-        self.assertEqual({"xcube.core.store"}, set(ext.point for ext in extensions))
+        self.assertEqual({"xcube.core.store"}, {ext.point for ext in extensions})
         self.assertTrue(
-            expected_fs_store_ids.issubset(set(ext.name for ext in extensions))
+            expected_fs_store_ids.issubset({ext.name for ext in extensions})
         )
         for ext in extensions:
             if ext.name not in expected_fs_store_ids:
@@ -70,10 +70,10 @@ def test_find_data_opener_extensions(self):
         extensions = find_data_opener_extensions()
         self.assertTrue(len(extensions) >= len(expected_fs_data_accessor_ids))
         self.assertEqual(
-            {"xcube.core.store.opener"}, set(ext.point for ext in extensions)
+            {"xcube.core.store.opener"}, {ext.point for ext in extensions}
         )
         self.assertTrue(
-            expected_fs_data_accessor_ids.issubset(set(ext.name for ext in extensions))
+            expected_fs_data_accessor_ids.issubset({ext.name for ext in extensions})
         )
         for ext in extensions:
             if ext.name not in expected_fs_data_accessor_ids:
@@ -89,10 +89,10 @@ def test_find_data_writer_extensions(self):
         extensions = find_data_writer_extensions()
         self.assertTrue(len(extensions) >= len(expected_fs_data_accessor_ids))
         self.assertEqual(
-            {"xcube.core.store.writer"}, set(ext.point for ext in extensions)
+            {"xcube.core.store.writer"}, {ext.point for ext in extensions}
         )
         self.assertTrue(
-            expected_fs_data_accessor_ids.issubset(set(ext.name for ext in extensions))
+            expected_fs_data_accessor_ids.issubset({ext.name for ext in extensions})
         )
         for ext in extensions:
             if ext.name not in expected_fs_data_accessor_ids:

test/core/store/fs/test_registry.py

@@ -325,13 +325,13 @@ def _assert_dataset_supported(
         data_store: FsDataStore,
         filename_ext: str,
         requested_dtype_alias: Optional[str],
-        expected_dtype_aliases: Set[str],
-        expected_return_type: Union[Type[xr.Dataset], Type[MultiLevelDataset]],
+        expected_dtype_aliases: set[str],
+        expected_return_type: Union[type[xr.Dataset], type[MultiLevelDataset]],
         expected_descriptor_type: Optional[
-            Union[Type[DatasetDescriptor], Type[MultiLevelDatasetDescriptor]]
+            Union[type[DatasetDescriptor], type[MultiLevelDatasetDescriptor]]
         ] = None,
-        write_params: Optional[Dict[str, Any]] = None,
-        open_params: Optional[Dict[str, Any]] = None,
+        write_params: Optional[dict[str, Any]] = None,
+        open_params: Optional[dict[str, Any]] = None,
         assert_data_ok: Optional[Callable[[Any], Any]] = None,
     ):
         """Call all DataStore operations to ensure data of type

test/core/store/fs/test_subset.py

@@ -25,7 +25,7 @@ class CommonTest(unittest.TestCase, ABC):
 
         @classmethod
         @abstractmethod
-        def get_fs_root(cls) -> Tuple[fsspec.AbstractFileSystem, str]:
+        def get_fs_root(cls) -> tuple[fsspec.AbstractFileSystem, str]:
             pass
 
         @classmethod
@@ -151,7 +151,7 @@ def test_include_exclude(self):
 
 class MemoryFsStoreSubsetTest(FsStoreSubset.CommonTest):
     @classmethod
-    def get_fs_root(cls) -> Tuple[fsspec.AbstractFileSystem, str]:
+    def get_fs_root(cls) -> tuple[fsspec.AbstractFileSystem, str]:
         fs = fsspec.get_filesystem_class("memory")()
         root = "xcube"
         fs.mkdirs(root, exist_ok=True)
@@ -166,7 +166,7 @@ def new_store(cls, **params) -> FsDataStore:
 
 class FileFsStoreSubsetTest(FsStoreSubset.CommonTest):
     @classmethod
-    def get_fs_root(cls) -> Tuple[fsspec.AbstractFileSystem, str]:
+    def get_fs_root(cls) -> tuple[fsspec.AbstractFileSystem, str]:
         return fsspec.get_filesystem_class("file")(), new_temp_dir()
 
     @classmethod
@@ -180,7 +180,7 @@ def new_store(cls, **params) -> FsDataStore:
 @unittest.skip("OSError: [Errno 5] Internal Server Error")
 class S3FsStoreSubsetTest(FsStoreSubset.CommonTest, S3Test):
     @classmethod
-    def get_fs_root(cls) -> Tuple[fsspec.AbstractFileSystem, str]:
+    def get_fs_root(cls) -> tuple[fsspec.AbstractFileSystem, str]:
         fs = fsspec.get_filesystem_class("s3")(**cls.get_storage_options())
         root = "xcube"
         fs.mkdirs(root, exist_ok=True)

test/core/store/ref/test_store.py

@@ -56,15 +56,15 @@ def create_ref_paths():
     return [cube_ref_path] + reference_file_paths
 
 
-def delete_ref_paths(ref_paths: List[str]):
+def delete_ref_paths(ref_paths: list[str]):
     fs = fsspec.filesystem("file")
     for ref_path in ref_paths:
         fs.delete(ref_path)
 
 
 # noinspection PyPep8Naming,PyUnresolvedReferences
 class KerchunkMixin:
-    ref_paths: List[str] = []
+    ref_paths: list[str] = []
 
     @classmethod
     def setUpClass(cls):

test/core/store/test_descriptor.py

@@ -58,7 +58,7 @@ def test_new_ml_dataset_descriptor(self):
     def assertExpectedDescriptor(
         self,
         descriptor: DataDescriptor,
-        expected_type: Type[DataDescriptor],
+        expected_type: type[DataDescriptor],
         expected_data_type_alias: str,
     ):
         self.assertIsInstance(descriptor, DatasetDescriptor)