diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 5b9bf9973f6..01486fbda9c 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -1,7 +1,7 @@ repos: - repo: https://github.com/astral-sh/ruff-pre-commit # Ruff version. - rev: v0.6.9 + rev: v0.14.1 hooks: # Run the linter. - id: ruff diff --git a/CHANGELOG.md b/CHANGELOG.md index 2c693841fc7..ae6f6ce71d6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -14,6 +14,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - docs: Added sqlcommenter example ([#4734](https://github.com/open-telemetry/opentelemetry-python/pull/4734)) +- build: bump ruff to 0.14.1 + ([#4782](https://github.com/open-telemetry/opentelemetry-python/pull/4782)) ## Version 1.38.0/0.59b0 (2025-10-16) diff --git a/dev-requirements.txt b/dev-requirements.txt index ff348b5424d..54b403be8bf 100644 --- a/dev-requirements.txt +++ b/dev-requirements.txt @@ -17,4 +17,4 @@ psutil==5.9.6 GitPython==3.1.41 pre-commit==3.7.0; python_version >= '3.9' pre-commit==3.5.0; python_version < '3.9' -ruff==0.6.9 +ruff==0.14.1 diff --git a/docs/examples/django/manage.py b/docs/examples/django/manage.py index 0a6f51e2596..75d9bc2c68b 100755 --- a/docs/examples/django/manage.py +++ b/docs/examples/django/manage.py @@ -30,7 +30,9 @@ def main(): DjangoInstrumentor().instrument() try: - from django.core.management import execute_from_command_line + from django.core.management import ( # noqa: PLC0415 + execute_from_command_line, + ) except ImportError as exc: raise ImportError( "Couldn't import Django. Are you sure it's installed and " diff --git a/opentelemetry-api/tests/propagators/test_propagators.py b/opentelemetry-api/tests/propagators/test_propagators.py index db2e329467c..6215b99727a 100644 --- a/opentelemetry-api/tests/propagators/test_propagators.py +++ b/opentelemetry-api/tests/propagators/test_propagators.py @@ -45,7 +45,7 @@ def test_propagators(propagators): ) # pylint: disable=import-outside-toplevel - import opentelemetry.propagate + import opentelemetry.propagate # noqa: PLC0415 reload(opentelemetry.propagate) @@ -66,7 +66,7 @@ def test_propagators(propagators): ) # pylint: disable=import-outside-toplevel - import opentelemetry.propagate + import opentelemetry.propagate # noqa: PLC0415 reload(opentelemetry.propagate) @@ -89,7 +89,7 @@ def test_propagators(propagators): ) # pylint: disable=import-outside-toplevel - import opentelemetry.propagate + import opentelemetry.propagate # noqa: PLC0415 reload(opentelemetry.propagate) @@ -141,7 +141,7 @@ def test_propagators(propagators): ) # pylint: disable=import-outside-toplevel - import opentelemetry.propagate + import opentelemetry.propagate # noqa: PLC0415 reload(opentelemetry.propagate) @@ -151,7 +151,7 @@ def test_propagators(propagators): def test_composite_propagators_error(self): with self.assertRaises(ValueError) as cm: # pylint: disable=import-outside-toplevel - import opentelemetry.propagate + import opentelemetry.propagate # noqa: PLC0415 reload(opentelemetry.propagate) diff --git a/opentelemetry-sdk/tests/metrics/exponential_histogram/test_exponential_bucket_histogram_aggregation.py b/opentelemetry-sdk/tests/metrics/exponential_histogram/test_exponential_bucket_histogram_aggregation.py index 91106ac4d61..820eb1070ab 100644 --- a/opentelemetry-sdk/tests/metrics/exponential_histogram/test_exponential_bucket_histogram_aggregation.py +++ b/opentelemetry-sdk/tests/metrics/exponential_histogram/test_exponential_bucket_histogram_aggregation.py @@ -1194,9 +1194,9 @@ def collect_and_validate(values, histogram) -> None: # pylint: disable=chained-comparison if value > lower_bound and value <= upper_bound: matches += 1 - assert ( - matches == count - ), f"index: {index}, count: {count}, scale: {scale}, lower_bound: {lower_bound}, upper_bound: {upper_bound}, matches: {matches}" + assert matches == count, ( + f"index: {index}, count: {count}, scale: {scale}, lower_bound: {lower_bound}, upper_bound: {upper_bound}, matches: {matches}" + ) assert sum(buckets) + result.zero_count == len(values) assert result.sum == sum(values) diff --git a/opentelemetry-sdk/tests/metrics/integration_test/test_cpu_time.py b/opentelemetry-sdk/tests/metrics/integration_test/test_cpu_time.py index 22f20002dea..8b9483d8326 100644 --- a/opentelemetry-sdk/tests/metrics/integration_test/test_cpu_time.py +++ b/opentelemetry-sdk/tests/metrics/integration_test/test_cpu_time.py @@ -233,9 +233,9 @@ def cpu_time_callback( ) def test_cpu_time_generator(self): - def cpu_time_generator() -> ( - Generator[Iterable[Observation], None, None] - ): + def cpu_time_generator() -> Generator[ + Iterable[Observation], None, None + ]: options = yield while True: self.assertIsInstance(options, CallbackOptions) diff --git a/opentelemetry-sdk/tests/metrics/test_import.py b/opentelemetry-sdk/tests/metrics/test_import.py index 5d656acce69..4e18a777749 100644 --- a/opentelemetry-sdk/tests/metrics/test_import.py +++ b/opentelemetry-sdk/tests/metrics/test_import.py @@ -24,7 +24,7 @@ def test_import_init(self): """ with self.assertNotRaises(Exception): - from opentelemetry.sdk.metrics import ( # noqa: F401 + from opentelemetry.sdk.metrics import ( # noqa: F401, PLC0415 Counter, Histogram, Meter, @@ -42,7 +42,7 @@ def test_import_export(self): """ with self.assertNotRaises(Exception): - from opentelemetry.sdk.metrics.export import ( # noqa: F401 + from opentelemetry.sdk.metrics.export import ( # noqa: F401, PLC0415 AggregationTemporality, ConsoleMetricExporter, DataPointT, @@ -69,7 +69,7 @@ def test_import_view(self): """ with self.assertNotRaises(Exception): - from opentelemetry.sdk.metrics.view import ( # noqa: F401 + from opentelemetry.sdk.metrics.view import ( # noqa: F401, PLC0415 Aggregation, DefaultAggregation, DropAggregation,