diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 5f2d7def5..806ac9d4d 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -15,7 +15,7 @@ repos: args: [ '--maxkb=890' ] - id: check-case-conflict - repo: https://github.com/astral-sh/ruff-pre-commit - rev: v0.8.6 + rev: v0.9.1 hooks: # Run the linter. - id: ruff diff --git a/fmt-requirements.txt b/fmt-requirements.txt index b4507a2c5..9a4aec138 100644 --- a/fmt-requirements.txt +++ b/fmt-requirements.txt @@ -1 +1 @@ -ruff==0.8.6 +ruff==0.9.1 diff --git a/gooddata-fdw/gooddata_fdw/filter.py b/gooddata-fdw/gooddata_fdw/filter.py index 70f2d7259..a204a34de 100644 --- a/gooddata-fdw/gooddata_fdw/filter.py +++ b/gooddata-fdw/gooddata_fdw/filter.py @@ -115,8 +115,7 @@ def extract_filters_from_quals(quals: list[Qual], table_columns: dict[str, Colum new_filter = _qual_to_attribute_filter(filter_entity, qual) else: _log_info( - f"extract_filters_from_quals: field_name={qual.field_name} is not attribute, " - f"but {type(filter_entity)}" + f"extract_filters_from_quals: field_name={qual.field_name} is not attribute, but {type(filter_entity)}" ) if new_filter: filters.append(new_filter) diff --git a/gooddata-flexconnect/gooddata_flexconnect/function/flight_methods.py b/gooddata-flexconnect/gooddata_flexconnect/function/flight_methods.py index f345bc2b6..67e11de9c 100644 --- a/gooddata-flexconnect/gooddata_flexconnect/function/flight_methods.py +++ b/gooddata-flexconnect/gooddata_flexconnect/function/flight_methods.py @@ -65,7 +65,7 @@ def _extract_invocation_payload( payload = orjson.loads(descriptor.command) except Exception: raise ErrorInfo.bad_argument( - "Incorrect FlexConnect function invocation. The invocation payload is " "not a valid JSON." + "Incorrect FlexConnect function invocation. The invocation payload is not a valid JSON." ) fun = payload.get("functionName") diff --git a/gooddata-flexconnect/gooddata_flexconnect/function/function_registry.py b/gooddata-flexconnect/gooddata_flexconnect/function/function_registry.py index 7b4d530fe..5e437bc97 100644 --- a/gooddata-flexconnect/gooddata_flexconnect/function/function_registry.py +++ b/gooddata-flexconnect/gooddata_flexconnect/function/function_registry.py @@ -55,7 +55,7 @@ def _check_function(self, fun: type[FlexConnectFunction]) -> str: if fun.Schema is None: raise ValueError( - f"FlexConnect function '{fun.Name}' implemented in class {fun.__name__} d" f"oes not specify schema." + f"FlexConnect function '{fun.Name}' implemented in class {fun.__name__} does not specify schema." ) return fun.Name diff --git a/gooddata-flight-server/gooddata_flight_server/server/flight_rpc/flight_server.py b/gooddata-flight-server/gooddata_flight_server/server/flight_rpc/flight_server.py index 1741b434d..6e116d68c 100644 --- a/gooddata-flight-server/gooddata_flight_server/server/flight_rpc/flight_server.py +++ b/gooddata-flight-server/gooddata_flight_server/server/flight_rpc/flight_server.py @@ -30,12 +30,10 @@ P = ParamSpec("P") -def rpc_decorator() -> ( - Callable[ - [Callable[Concatenate[Any, pyarrow.flight.ServerCallContext, P], T]], - Callable[Concatenate[Any, pyarrow.flight.ServerCallContext, P], T], - ] -): +def rpc_decorator() -> Callable[ + [Callable[Concatenate[Any, pyarrow.flight.ServerCallContext, P], T]], + Callable[Concatenate[Any, pyarrow.flight.ServerCallContext, P], T], +]: def _factory( fun: Callable[Concatenate[Any, pyarrow.flight.ServerCallContext, P], T], ) -> Callable[Concatenate[Any, pyarrow.flight.ServerCallContext, P], T]: diff --git a/gooddata-flight-server/gooddata_flight_server/server/flight_rpc/flight_service.py b/gooddata-flight-server/gooddata_flight_server/server/flight_rpc/flight_service.py index 0dc3249d0..9eec16d83 100644 --- a/gooddata-flight-server/gooddata_flight_server/server/flight_rpc/flight_service.py +++ b/gooddata-flight-server/gooddata_flight_server/server/flight_rpc/flight_service.py @@ -264,9 +264,7 @@ def _shutdown_server(self) -> None: def wait_for_stop(self, timeout: Optional[float] = None) -> bool: if self._flight_shutdown_thread is None: # this is really some mess in the caller code.. did not call stop() but tries to wait for it.. - raise AssertionError( - "Flight server stop() was not issued yet attempting to wait for " "the server to stop." - ) + raise AssertionError("Flight server stop() was not issued yet attempting to wait for the server to stop.") if self._flight_shutdown_thread.is_alive(): self._flight_shutdown_thread.join(timeout=timeout) diff --git a/gooddata-sdk/gooddata_sdk/catalog/export/service.py b/gooddata-sdk/gooddata_sdk/catalog/export/service.py index 6321eccba..3e5222bf0 100644 --- a/gooddata-sdk/gooddata_sdk/catalog/export/service.py +++ b/gooddata-sdk/gooddata_sdk/catalog/export/service.py @@ -78,9 +78,9 @@ def _get_exported_content( Raises: ValueError: If the server is not able to return a response or if the input values are invalid. """ - assert ( - timeout > 0 and retry > 0 and max_retry > 0 - ), f"Timeout value '{timeout}' or retry value '{retry}' or max retry value '{max_retry}' is negative." + assert timeout > 0 and retry > 0 and max_retry > 0, ( + f"Timeout value '{timeout}' or retry value '{retry}' or max retry value '{max_retry}' is negative." + ) assert timeout > retry, f"Retry value {retry} cannot be higher than timeout value {timeout}" assert retry <= max_retry, f"Retry value {retry} must be smaller or the same as max retry value {max_retry}" response = get_func(workspace_id=workspace_id, export_id=export_id, _preload_content=False) diff --git a/gooddata-sdk/gooddata_sdk/catalog/organization/service.py b/gooddata-sdk/gooddata_sdk/catalog/organization/service.py index dc0548884..8825f14d1 100644 --- a/gooddata-sdk/gooddata_sdk/catalog/organization/service.py +++ b/gooddata-sdk/gooddata_sdk/catalog/organization/service.py @@ -404,7 +404,7 @@ def update_identity_provider(self, identity_provider: CatalogIdentityProvider) - self._entities_api.update_entity_identity_providers(identity_provider.id, identity_provider_document) except NotFoundException: raise ValueError( - f"Can not update {identity_provider.id} identity provider. " f"This identity provider does not exist." + f"Can not update {identity_provider.id} identity provider. This identity provider does not exist." ) # Layout APIs diff --git a/gooddata-sdk/gooddata_sdk/compute/model/filter.py b/gooddata-sdk/gooddata_sdk/compute/model/filter.py index ced180768..edc40f4bc 100644 --- a/gooddata-sdk/gooddata_sdk/compute/model/filter.py +++ b/gooddata-sdk/gooddata_sdk/compute/model/filter.py @@ -157,8 +157,7 @@ def __init__(self, dataset: ObjId, granularity: str, from_shift: int, to_shift: if granularity not in _GRANULARITY: raise ValueError( - f"Invalid relative date filter granularity '{granularity}'." - f"It is expected to be one of: {_GRANULARITY}" + f"Invalid relative date filter granularity '{granularity}'. It is expected to be one of: {_GRANULARITY}" ) self._dataset = dataset @@ -373,8 +372,7 @@ def __init__( else: if not isinstance(values, (int, float)) and len(values) != 1: raise ValueError( - f"Invalid number of values for {operator}. " - f"Expected single int, float or one-sized list or tuple." + f"Invalid number of values for {operator}. Expected single int, float or one-sized list or tuple." ) # Convert int to float as AFM model filters accept float values self._values = (float(values),) if isinstance(values, (int, float)) else values @@ -456,8 +454,7 @@ def __init__( if operator not in _RANKING_OPERATORS: raise ValueError( - f"Invalid ranking filter operator type '{operator}'." - f"It is expected to be one of: {_RANKING_OPERATORS}" + f"Invalid ranking filter operator type '{operator}'. It is expected to be one of: {_RANKING_OPERATORS}" ) self._metrics = [_extract_id_or_local_id(m) for m in metrics] @@ -504,6 +501,5 @@ def description(self, labels: dict[str, str], format_locale: Optional[str] = Non ) metric_ids = [m.id if isinstance(m, ObjId) else m for m in self.metrics] return ( - f"{self.operator.capitalize()} {self.value}{dimensionality_str} " - f"{labels.get(metric_ids[0], metric_ids[0])}" + f"{self.operator.capitalize()} {self.value}{dimensionality_str} {labels.get(metric_ids[0], metric_ids[0])}" ) diff --git a/tox-requirements.txt b/tox-requirements.txt index 959e5f558..691074d87 100644 --- a/tox-requirements.txt +++ b/tox-requirements.txt @@ -1,2 +1,2 @@ -tox~=4.20.0 -tox-uv~=1.12.0 +tox~=4.23.2 +tox-uv~=1.17.0