feat: utilize almost majority of UP rules

JIRA: TRIVIAL
risk: low

gooddata-dbt/tests/test_tables.py

@@ -13,7 +13,7 @@
 
 
 def _read_json(path: Union[str, Path]) -> dict:
-    with open(path, "r") as f:
+    with open(path) as f:
         return json.load(f)
 
 

gooddata-fdw/gooddata_fdw/_version.py

@@ -1,7 +1,4 @@
 # (C) 2021 GoodData Corporation
-try:
-    from importlib import metadata
-except ImportError:
-    import importlib_metadata as metadata  # type: ignore # mypy issue #1153
+from importlib import metadata
 
 __version__: str = metadata.version("gooddata-fdw")

gooddata-fdw/gooddata_fdw/executor.py

@@ -1,7 +1,8 @@
 # (C) 2022 GoodData Corporation
 from __future__ import annotations
 
-from typing import Any, Generator, NamedTuple, Optional
+from collections.abc import Generator
+from typing import Any, NamedTuple, Optional
 
 from gooddata_sdk import GoodDataSdk
 

gooddata-fdw/gooddata_fdw/fdw.py

@@ -19,7 +19,7 @@
 
 class GoodDataForeignDataWrapper(ForeignDataWrapper):
     def __init__(self, options: dict[str, str], columns: dict[str, ColumnDefinition]) -> None:
-        super(GoodDataForeignDataWrapper, self).__init__(options, columns)
+        super().__init__(options, columns)
         _log_debug(f"initializing (options={options}, columns={columns})")
 
         # Table options contain also foreign server options

gooddata-fdw/gooddata_fdw/result_reader.py

@@ -1,7 +1,8 @@
 # (C) 2022 GoodData Corporation
 from __future__ import annotations
 
-from typing import Any, Generator
+from collections.abc import Generator
+from typing import Any
 
 from gooddata_sdk import ExecutionTable
 from gooddata_sdk.type_converter import DBTypeConverterStore

gooddata-fdw/tests/conftest.py

@@ -20,7 +20,7 @@ def pytest_addoption(parser):
 @pytest.fixture(scope="session")
 def test_config(request):
     config_path = Path(request.config.getoption("--gd-test-config"))
-    with open(config_path, "rt") as f:
+    with open(config_path) as f:
         config = yaml.safe_load(f)
 
     return config

gooddata-flight-server/gooddata_flight_server/_version.py

@@ -1,8 +1,5 @@
 # (C) 2024 GoodData Corporation
-try:
-    from importlib import metadata
-except ImportError:
-    import importlib_metadata as metadata  # type: ignore # mypy issue #1153
+from importlib import metadata
 
 try:
     __version__ = metadata.version("gooddata-flight-server")

gooddata-flight-server/gooddata_flight_server/flexfun/flex_fun_registry.py

@@ -1,6 +1,6 @@
 #  (C) 2024 GoodData Corporation
 import importlib
-from typing import Iterable
+from collections.abc import Iterable
 
 import structlog
 

gooddata-flight-server/gooddata_flight_server/flexfun/flex_fun_task.py

@@ -1,5 +1,6 @@
 #  (C) 2024 GoodData Corporation
-from typing import Iterable, Optional, Union
+from collections.abc import Iterable
+from typing import Optional, Union
 
 import pyarrow
 import structlog

gooddata-flight-server/gooddata_flight_server/flexfun/flight_methods.py

@@ -1,5 +1,6 @@
 #  (C) 2024 GoodData Corporation
-from typing import Generator, Optional
+from collections.abc import Generator
+from typing import Optional
 
 import orjson
 import pyarrow.flight

gooddata-flight-server/gooddata_flight_server/server/flight_rpc/flight_server.py

@@ -9,7 +9,8 @@
 -  FlightServerMethods - base class containing typed definitions of all Flight RPC Methods
 """
 
-from typing import Generator, Optional, Union
+from collections.abc import Generator
+from typing import Optional, Union
 
 import pyarrow.flight
 from typing_extensions import TypeAlias

gooddata-flight-server/gooddata_flight_server/server/flight_rpc/server_methods.py

@@ -1,5 +1,5 @@
 # (C) 2024 GoodData Corporation
-from typing import Generator
+from collections.abc import Generator
 
 import pyarrow.flight
 

gooddata-flight-server/gooddata_flight_server/tasks/task_result.py

@@ -1,8 +1,9 @@
 #  (C) 2024 GoodData Corporation
 import abc
 import threading
+from collections.abc import Generator, Iterable
 from dataclasses import dataclass
-from typing import Generator, Iterable, Optional, Union, final
+from typing import Optional, Union, final
 
 import pyarrow.flight
 from readerwriterlock import rwlock

gooddata-flight-server/gooddata_flight_server/tasks/temporal_container.py

@@ -1,8 +1,9 @@
 # (C) 2024 GoodData Corporation
 import threading
 import time
+from collections.abc import Iterator
 from dataclasses import dataclass
-from typing import Any, Callable, Generic, Iterator, Optional, TypeVar
+from typing import Any, Callable, Generic, Optional, TypeVar
 
 import structlog
 from readerwriterlock import rwlock

gooddata-flight-server/gooddata_flight_server/tasks/thread_task_executor.py

@@ -2,10 +2,11 @@
 import abc
 import threading
 import time
+from collections.abc import Generator
 from concurrent.futures import CancelledError, Future, ThreadPoolExecutor
 from contextlib import contextmanager
 from dataclasses import dataclass
-from typing import Any, Generator, Optional, Union
+from typing import Any, Optional, Union
 
 import opentelemetry.context as otelctx
 import pyarrow.flight

gooddata-flight-server/tests/server/conftest.py

@@ -2,9 +2,10 @@
 import contextlib
 import os
 import socket
+from collections.abc import Iterable
 from contextlib import closing
 from pathlib import Path
-from typing import Iterable, Union
+from typing import Union
 
 import pytest
 from gooddata_flight_server.flexfun.flight_methods import (

gooddata-flight-server/tests/server/test_server.py

@@ -1,6 +1,6 @@
 #  (C) 2024 GoodData Corporation
 import os
-from typing import Generator
+from collections.abc import Generator
 
 import pyarrow.flight
 import pytest

gooddata-pandas/gooddata_pandas/_version.py

@@ -1,7 +1,4 @@
 # (C) 2021 GoodData Corporation
-try:
-    from importlib import metadata
-except ImportError:
-    import importlib_metadata as metadata  # type: ignore # mypy issue #1153
+from importlib import metadata
 
 __version__: str = metadata.version("gooddata-pandas")

gooddata-pandas/tests/__init__.py

@@ -9,7 +9,7 @@ def _load_test_env():
         test_env = find_dotenv(".env.test", raise_error_if_not_found=True)
 
         return dotenv_values(test_env)
-    except IOError:
+    except OSError:
         return dict()
 
 

gooddata-pandas/tests/conftest.py

@@ -18,7 +18,7 @@ def pytest_addoption(parser):
 @pytest.fixture(scope="session")
 def test_config(request):
     config_path = Path(request.config.getoption("--gd-test-config"))
-    with open(config_path, "rt") as f:
+    with open(config_path) as f:
         config = yaml.safe_load(f)
 
     return config

gooddata-pandas/tests/good_pandas/test_good_pandas.py

@@ -13,7 +13,7 @@
 
 
 def load_profiles_content(path: Union[str, Path]) -> dict:
-    with open(path, "r", encoding="utf-8") as f:
+    with open(path, encoding="utf-8") as f:
         return yaml.safe_load(f)
 
 

gooddata-sdk/gooddata_sdk/_version.py

@@ -1,8 +1,5 @@
 # (C) 2021 GoodData Corporation
-try:
-    from importlib import metadata
-except ImportError:
-    import importlib_metadata as metadata  # type: ignore # mypy issue #1153
+from importlib import metadata
 
 try:
     __version__ = metadata.version("gooddata-sdk")

gooddata-sdk/gooddata_sdk/catalog/data_source/service.py

@@ -42,7 +42,7 @@ class CatalogDataSourceService(CatalogServiceBase):
     """
 
     def __init__(self, api_client: GoodDataApiClient) -> None:
-        super(CatalogDataSourceService, self).__init__(api_client)
+        super().__init__(api_client)
 
     # Entities methods are listed below
 

gooddata-sdk/gooddata_sdk/catalog/export/service.py

@@ -47,7 +47,7 @@ class ExportService(CatalogServiceBase):
     """
 
     def __init__(self, api_client: GoodDataApiClient) -> None:
-        super(ExportService, self).__init__(api_client)
+        super().__init__(api_client)
         """
         Initializes the ExportService with the GoodDataApiClient instance.
         Args:

gooddata-sdk/gooddata_sdk/catalog/organization/service.py

@@ -19,7 +19,7 @@
 
 class CatalogOrganizationService(CatalogServiceBase):
     def __init__(self, api_client: GoodDataApiClient) -> None:
-        super(CatalogOrganizationService, self).__init__(api_client)
+        super().__init__(api_client)
 
     def update_oidc_parameters(
         self,

gooddata-sdk/gooddata_sdk/catalog/permission/declarative_model/dashboard_permissions.py

@@ -1,5 +1,6 @@
 # (C) 2023 GoodData Corporation
-from typing import Optional, Type
+import builtins
+from typing import Optional
 
 import attr
 from gooddata_api_client.model.dashboard_permissions import DashboardPermissions
@@ -50,7 +51,7 @@ class CatalogRulePermission(Base):
     permissions: Optional[list[str]] = None
 
     @staticmethod
-    def client_class() -> Type[RulePermission]:  # noqa: UP006
+    def client_class() -> builtins.type[RulePermission]:  # noqa: UP006
         return RulePermission
 
 

gooddata-sdk/gooddata_sdk/catalog/permission/service.py

@@ -18,7 +18,7 @@
 
 class CatalogPermissionService(CatalogServiceBase):
     def __init__(self, api_client: GoodDataApiClient) -> None:
-        super(CatalogPermissionService, self).__init__(api_client)
+        super().__init__(api_client)
 
     def get_declarative_permissions(self, workspace_id: str) -> CatalogDeclarativeWorkspacePermissions:
         """Retrieve current set of permissions of the workspace in a declarative form.

gooddata-sdk/gooddata_sdk/catalog/workspace/content_service.py

@@ -57,7 +57,7 @@ class CatalogWorkspaceContentService(CatalogServiceBase):
     #  access returned object's properties
 
     def __init__(self, api_client: GoodDataApiClient) -> None:
-        super(CatalogWorkspaceContentService, self).__init__(api_client)
+        super().__init__(api_client)
 
     # Entities methods
 

gooddata-sdk/gooddata_sdk/catalog/workspace/declarative_model/workspace/workspace.py

@@ -158,9 +158,7 @@ def load_from_disk(cls, layout_organization_folder: Path) -> CatalogDeclarativeW
             )
         return cls(workspace_data_filters=workspace_data_filters)
 
-    def create_copy(
-        self, source_ws_id: str, target_ws_id: str
-    ) -> tuple["CatalogDeclarativeWorkspaceDataFilters", dict]:
+    def create_copy(self, source_ws_id: str, target_ws_id: str) -> tuple[CatalogDeclarativeWorkspaceDataFilters, dict]:
         self_copy = copy.deepcopy(self)
         # update workspace data filter settings
         for wdf in self_copy.workspace_data_filters:

gooddata-sdk/gooddata_sdk/catalog/workspace/service.py

@@ -48,7 +48,7 @@
 
 class CatalogWorkspaceService(CatalogServiceBase):
     def __init__(self, api_client: GoodDataApiClient) -> None:
-        super(CatalogWorkspaceService, self).__init__(api_client)
+        super().__init__(api_client)
         self._permissions_service = CatalogPermissionService(api_client)
 
     # Entities methods

gooddata-sdk/gooddata_sdk/client.py

@@ -3,7 +3,6 @@
 
 from __future__ import annotations
 
-from builtins import bytes
 from typing import Optional
 
 import gooddata_api_client as api_client

gooddata-sdk/gooddata_sdk/compute/model/attribute.py

@@ -18,7 +18,7 @@ def __init__(self, local_id: str, label: Union[ObjId, str], show_all_values: Opt
             label: identifier of the label to use for slicing or dicing; specified either as ObjId or str   the label id
             show_all_values: request show all values functionality for a given attribute
         """
-        super(Attribute, self).__init__()
+        super().__init__()
 
         self._local_id = local_id
         self._label = ObjId(label, "label") if isinstance(label, str) else label

gooddata-sdk/gooddata_sdk/compute/model/base.py

@@ -72,7 +72,7 @@ def as_api_model(self) -> OpenApiModel:
 
 class Filter(ExecModelEntity):
     def __init__(self) -> None:
-        super(Filter, self).__init__()
+        super().__init__()
 
         self._apply_on_result = None
 

gooddata-sdk/gooddata_sdk/compute/model/filter.py

@@ -76,7 +76,7 @@ def _to_identifier(val: Union[ObjId, str]) -> Union[afm_models.AfmLocalIdentifie
 
 class AttributeFilter(Filter):
     def __init__(self, label: Union[ObjId, str, Attribute], values: Optional[list[str]] = None) -> None:
-        super(AttributeFilter, self).__init__()
+        super().__init__()
 
         self._label = _extract_id_or_local_id(label)
         self._values = values or []
@@ -153,7 +153,7 @@ def description(self, labels: dict[str, str], format_locale: Optional[str] = Non
 
 class RelativeDateFilter(Filter):
     def __init__(self, dataset: ObjId, granularity: str, from_shift: int, to_shift: int) -> None:
-        super(RelativeDateFilter, self).__init__()
+        super().__init__()
 
         if granularity not in _GRANULARITY:
             raise ValueError(
@@ -248,7 +248,7 @@ class AllTimeFilter(Filter):
     """
 
     def __init__(self, dataset: ObjId) -> None:
-        super(AllTimeFilter, self).__init__()
+        super().__init__()
         self._dataset = dataset
 
     @property
@@ -264,7 +264,7 @@ def description(self, labels: dict[str, str], format_locale: Optional[str] = Non
 
 class AbsoluteDateFilter(Filter):
     def __init__(self, dataset: ObjId, from_date: str, to_date: str) -> None:
-        super(AbsoluteDateFilter, self).__init__()
+        super().__init__()
 
         self._dataset = dataset
         self._from_date = from_date
@@ -334,7 +334,7 @@ def description(self, labels: dict[str, str], format_locale: Optional[str] = Non
 
 class AllMetricValueFilter(Filter):
     def __init__(self, metric: Union[ObjId, str, Metric]) -> None:
-        super(AllMetricValueFilter, self).__init__()
+        super().__init__()
         self._metric = _extract_id_or_local_id(metric)
 
     @property
@@ -357,7 +357,7 @@ def __init__(
         values: Union[float, int, tuple[float, float]],
         treat_nulls_as: Union[float, None] = None,
     ) -> None:
-        super(MetricValueFilter, self).__init__()
+        super().__init__()
 
         if operator not in _METRIC_VALUE_FILTER_OPERATORS:
             raise ValueError(
@@ -452,7 +452,7 @@ def __init__(
         value: int,
         dimensionality: Optional[list[Union[str, ObjId, Attribute, Metric]]],
     ) -> None:
-        super(RankingFilter, self).__init__()
+        super().__init__()
 
         if operator not in _RANKING_OPERATORS:
             raise ValueError(