Merge pull request #770 from hkad98/ruff-improvements

Enable some rules for ruff

Author: hkad98

gooddata-dbt/gooddata_dbt/args.py

@@ -37,10 +37,7 @@ def set_gooddata_endpoint_args(parser: argparse.ArgumentParser) -> None:
     )
     # Alternative - use profile.yml file
     env_profiles = os.getenv("GOODDATA_PROFILES")
-    if env_profiles:
-        env_profiles_list = env_profiles.split(" ")
-    else:
-        env_profiles_list = []
+    env_profiles_list = env_profiles.split(" ") if env_profiles else []
     parser.add_argument(
         "-gp",
         "--gooddata-profiles",

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/errors/error_code.py

@@ -29,17 +29,15 @@ def _init_names(cls: Any) -> Any:
 
 
 _RetryFlagsLiteral: TypeAlias = Literal["any", "other", "here"]
+_FlagsMapping = {
+    Literal["any"]: _RETRY_ANY_FLAG,
+    Literal["here"]: _RETRY_HERE_FLAG,
+    Literal["other"]: _RETRY_OTHER_FLAG,
+}
 
 
 def _get_flags(retry: Optional[_RetryFlagsLiteral] = None) -> int:
-    if retry == "any":
-        return _RETRY_ANY_FLAG
-    elif retry == "here":
-        return _RETRY_HERE_FLAG
-    elif retry == "other":
-        return _RETRY_OTHER_FLAG
-
-    return 0x0
+    return _FlagsMapping.get(retry, 0x0)
 
 
 def _error_code(code: int, retry: Optional[_RetryFlagsLiteral] = None) -> int:

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