merge queue: embarking main (aa1cdfe) and #904 together

mergify_cli/__init__.py

@@ -15,11 +15,5 @@
 
 from __future__ import annotations
 
-import importlib.metadata
-
-import rich.console
-
-
-console = rich.console.Console(log_path=False, log_time=False)
-
-VERSION = importlib.metadata.version("mergify-cli")
+from mergify_cli._globals import VERSION as VERSION
+from mergify_cli._globals import console as console

mergify_cli/_globals.py

@@ -0,0 +1,25 @@
+#
+#  Copyright © 2021-2024 Mergify SAS
+#
+# Licensed under the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License. You may obtain
+# a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+# License for the specific language governing permissions and limitations
+# under the License.
+
+from __future__ import annotations
+
+import importlib.metadata
+
+import rich.console
+
+
+console = rich.console.Console(log_path=False, log_time=False)
+
+VERSION = importlib.metadata.version("mergify-cli")

mergify_cli/ci/scopes/cli.py

@@ -124,16 +124,16 @@ class DetectedScope(pydantic.BaseModel):
     scopes: set[str]
 
     def save_to_file(self, file: str) -> None:
-        with pathlib.Path(file).open("w", encoding="utf-8") as f:
-            f.write(self.model_dump_json())
+        pathlib.Path(file).write_text(self.model_dump_json(), encoding="utf-8")
 
     @classmethod
     def load_from_file(cls, filename: str) -> DetectedScope:
-        with pathlib.Path(filename).open("r", encoding="utf-8") as f:
-            try:
-                return cls.model_validate_json(f.read())
-            except pydantic.ValidationError as e:
-                raise InvalidDetectedScopeError(str(e))
+        try:
+            return cls.model_validate_json(
+                pathlib.Path(filename).read_text(encoding="utf-8"),
+            )
+        except pydantic.ValidationError as e:
+            raise InvalidDetectedScopeError(str(e)) from e
 
 
 def detect(

pyproject.toml

@@ -26,7 +26,7 @@ mergify = "mergify_cli.cli:main"
 dev = [
     "mypy==1.19.1",
     "mypy-extensions==1.1.0",
-    "ruff==0.14.9",
+    "ruff==0.14.11",
     "pytest==9.0.2",
     "poethepoet==0.40.0",
     "pytest-asyncio==1.3.0",