chore: bump pre-commit versions, plus small fixes

.pre-commit-config.yaml

@@ -1,6 +1,6 @@
 repos:
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.5.0
+    rev: v5.0.0
     hooks:
       - id: check-added-large-files
       - id: check-ast
@@ -18,15 +18,15 @@ repos:
       - id: detect-private-key
   # Run the Ruff linter.
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.4.5
+    rev: v0.11.2
     hooks:
       - id: ruff
         args: [ --preview ]
       - id: ruff-format
         args: [ --preview ]
   # Spellcheck the code.
   - repo: https://github.com/codespell-project/codespell
-    rev: v2.2.4
+    rev: v2.4.1
     hooks:
     - id: codespell
       additional_dependencies:

CHANGES.md

@@ -108,7 +108,7 @@
 * Change ops.main() so that you don't need to `type: ignore` it (#1345)
 * Expand the secret ID out to the full URI when only given the ID (#1358)
 * Add a JujuVersion property for Pebble log forwarding to Loki (#1370)
-* Pre-emptively raise `InvalidStatusError` instead of waiting for Juju:
+* Preemptively raise `InvalidStatusError` instead of waiting for Juju:
     * Make it an error to call `CollectStatusEvent.add_status` with error or unknown (#1386)
     * Document and validate settable status values in `_ModelBackend.set_status` (#1354)
 

ops/_private/harness.py

@@ -160,7 +160,7 @@ class ExecResult:
     stderr: Union[str, bytes] = b''
 
 
-ExecHandler = Callable[[ExecArgs], Union[None, ExecResult]]
+ExecHandler = Callable[[ExecArgs], Union[ExecResult, None]]
 
 
 @dataclasses.dataclass(frozen=True)
@@ -1796,8 +1796,7 @@ def revoke_secret(self, secret_id: str, observer: AppUnitOrName):
         # Model secrets:
         if secret.owner_name in [self.model.app.name, self.model.unit.name]:
             raise RuntimeError(
-                f'Secret {secret_id!r} owned by the charm under test, "'
-                f"can't call revoke_secret"
+                f"Secret {secret_id!r} owned by the charm under test, can't call revoke_secret"
             )
 
         relation_id = self._secret_relation_id_to(secret)
@@ -2119,7 +2118,7 @@ def run_action(
                         f'given {{"{key}":{params[key]!r}}}'
                     )
         action_under_test = _RunningAction(action_name, ActionOutput([], {}), params)
-        handler = getattr(self.charm.on, f"{action_name.replace('-', '_')}_action")
+        handler = getattr(self.charm.on, f'{action_name.replace("-", "_")}_action')
         self._backend._running_action = action_under_test
         self._action_id_counter += 1
         handler.emit(str(self._action_id_counter))

ops/framework.py

@@ -811,9 +811,9 @@ class SomeObject:
 
         method_name = observer.__name__
 
-        assert isinstance(observer.__self__, Object), (
-            "can't register observers " "that aren't `Object`s"
-        )
+        assert isinstance(
+            observer.__self__, Object
+        ), "can't register observers that aren't `Object`s"
         observer_obj = observer.__self__
 
         # Validate that the method has an acceptable call signature.

ops/model.py

@@ -1318,7 +1318,7 @@ def __repr__(self):
             fields.append(f'id={self._id!r}')
         if self._label is not None:
             fields.append(f'label={self._label!r}')
-        return f"<Secret {' '.join(fields)}>"
+        return f'<Secret {" ".join(fields)}>'
 
     @staticmethod
     def _canonicalize_id(id: str, model_uuid: Optional[str]) -> str:
@@ -2224,7 +2224,7 @@ def request(self, storage_name: str, count: int = 1):
         """
         if storage_name not in self._storage_map:
             raise ModelError(
-                f'cannot add storage {storage_name!r}:' ' it is not present in the charm metadata'
+                f'cannot add storage {storage_name!r}: it is not present in the charm metadata'
             )
         self._backend.storage_add(storage_name, count)
 
@@ -3913,12 +3913,12 @@ def validate_metric_label(cls, label_name: str):
     def format_metric_value(cls, value: Union[int, float]):
         if not isinstance(value, (int, float)):
             raise ModelError(
-                f'invalid metric value {value!r} provided:' ' must be a positive finite float'
+                f'invalid metric value {value!r} provided: must be a positive finite float'
             )
 
         if math.isnan(value) or math.isinf(value) or value < 0:
             raise ModelError(
-                f'invalid metric value {value!r} provided:' ' must be a positive finite float'
+                f'invalid metric value {value!r} provided: must be a positive finite float'
             )
         return str(value)
 

ops/pebble.py

@@ -663,12 +663,7 @@ def from_dict(cls, d: _ProgressDict) -> TaskProgress:
         )
 
     def __repr__(self):
-        return (
-            'TaskProgress('
-            f'label={self.label!r}, '
-            f'done={self.done!r}, '
-            f'total={self.total!r})'
-        )
+        return f'TaskProgress(label={self.label!r}, done={self.done!r}, total={self.total!r})'
 
 
 class TaskID(str):
@@ -1088,12 +1083,7 @@ def from_dict(cls, d: _ServiceInfoDict) -> ServiceInfo:
         )
 
     def __repr__(self):
-        return (
-            'ServiceInfo('
-            f'name={self.name!r}, '
-            f'startup={self.startup}, '
-            f'current={self.current})'
-        )
+        return f'ServiceInfo(name={self.name!r}, startup={self.startup}, current={self.current})'
 
 
 class Check:
@@ -2604,7 +2594,7 @@ def _encode_multipart(
             source_io: _AnyStrFileLikeIO = source  # type: ignore
         boundary = binascii.hexlify(os.urandom(16))
         path_escaped = path.replace('"', '\\"').encode('utf-8')
-        content_type = f"multipart/form-data; boundary=\"{boundary.decode('utf-8')}\""
+        content_type = f'multipart/form-data; boundary="{boundary.decode("utf-8")}"'
 
         def generator() -> Generator[bytes, None, None]:
             yield b''.join([

test/test_framework.py

@@ -1982,7 +1982,8 @@ def test_breakpoint_good_names(self, request: pytest.FixtureRequest, name: str):
             '-',
             '...foo',
             'foo.bar',
-            'bar--' 'FOO',
+            'bar--',
+            'FOO',
             'FooBar',
             'foo bar',
             'foo_bar',

test/test_testing.py

@@ -361,7 +361,7 @@ def _on_cluster_relation_changed(self, event: ops.EventBase):
         harness.set_leader(False)
         harness.update_relation_data(rel_id, 'test-app', {'k': 'v3'})
         assert backend.relation_get(rel_id, 'test-app', is_app=True) == {'k': 'v3'}
-        assert len(harness.charm.observed_events), 1
+        assert len(harness.charm.observed_events) == 1
         assert isinstance(harness.charm.observed_events[0], ops.RelationEvent)
 
     def test_remove_relation(self, request: pytest.FixtureRequest):
@@ -5192,7 +5192,7 @@ def test_list_files_not_found_raises(
             client.list_files('/not/existing/file/')
         assert excinfo.value.code == 404
         assert excinfo.value.status == 'Not Found'
-        assert excinfo.value.message == 'stat /not/existing/file/: no ' 'such file or directory'
+        assert excinfo.value.message == 'stat /not/existing/file/: no such file or directory'
 
     def test_list_directory_object_itself(
         self,

testing/src/scenario/__init__.py

@@ -1,4 +1,3 @@
-#!/usr/bin/env python3
 # Copyright 2023 Canonical Ltd.
 # See LICENSE file for licensing details.
 

testing/src/scenario/_consistency_checker.py

@@ -1,4 +1,3 @@
-#!/usr/bin/env python3
 # Copyright 2023 Canonical Ltd.
 # See LICENSE file for licensing details.
 

testing/src/scenario/_ops_main_mock.py

@@ -1,4 +1,3 @@
-#!/usr/bin/env python3
 # Copyright 2023 Canonical Ltd.
 # See LICENSE file for licensing details.
 

testing/src/scenario/_runtime.py

@@ -1,4 +1,3 @@
-#!/usr/bin/env python3
 # Copyright 2023 Canonical Ltd.
 # See LICENSE file for licensing details.
 

testing/src/scenario/context.py

@@ -1,4 +1,3 @@
-#!/usr/bin/env python3
 # Copyright 2023 Canonical Ltd.
 # See LICENSE file for licensing details.
 

testing/src/scenario/errors.py

@@ -1,4 +1,3 @@
-#!/usr/bin/env python3
 # Copyright 2024 Canonical Ltd.
 # See LICENSE file for licensing details.
 

testing/src/scenario/logger.py

@@ -1,4 +1,3 @@
-#!/usr/bin/env python3
 # Copyright 2023 Canonical Ltd.
 # See LICENSE file for licensing details.
 

testing/src/scenario/mocking.py

@@ -1,4 +1,3 @@
-#!/usr/bin/env python3
 # Copyright 2023 Canonical Ltd.
 # See LICENSE file for licensing details.
 
@@ -428,8 +427,7 @@ def _check_can_manage_secret(
             )
         if secret.owner == "app" and not self.is_leader():
             understandable_error = SecretNotFoundError(
-                f"App-owned secret {secret.id!r} can only be "
-                f"managed by the leader.",
+                f"App-owned secret {secret.id!r} can only be managed by the leader.",
             )
             # charm-facing side: respect ops error
             raise ModelError("ERROR permission denied") from understandable_error

testing/src/scenario/state.py

@@ -1,4 +1,3 @@
-#!/usr/bin/env python3
 # Copyright 2023 Canonical Ltd.
 # See LICENSE file for licensing details.
 
@@ -1925,7 +1924,7 @@ class _Event:  # type: ignore
 
     path: str
     """The name of the event.
-    
+
     For example: ``start``, ``config_changed``, ``my_relation_joined``, or
     ``custom.MyConsumer.lib_changed``.
 

testing/tests/test_e2e/test_resource.py

@@ -1,4 +1,3 @@
-#!/usr/bin/env python3
 # Copyright 2024 Canonical Ltd.
 # See LICENSE file for licensing details.