style: fix linting errors (canonical#2229)

Fix linting errors from both the latest ruff and the latest pyright.

Author: lengau

.pre-commit-config.yaml

@@ -13,7 +13,7 @@ repos:
       - id: fix-byte-order-marker
       - id: mixed-line-ending
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: "v0.9.4"
+    rev: "v0.11.0"
     hooks:
       # Run the linter
       - id: ruff

charmcraft/application/commands/store.py

@@ -2416,7 +2416,9 @@ def run(self, parsed_args: argparse.Namespace) -> None:
         updates = store.set_resource_revisions_architectures(
             name=parsed_args.charm_name,
             resource_name=parsed_args.resource_name,
-            updates={revision: parsed_args.arch for revision in parsed_args.revisions},
+            updates=dict.fromkeys(
+                parsed_args.revisions, cast("list[str]", parsed_args.arch)
+            ),
         )
 
         fmt = parsed_args.format or cli.OutputFormat.TABLE

charmcraft/jujuignore.py

@@ -220,16 +220,18 @@ def match(self, path: str, is_dir: bool) -> bool:
 # juju itself always includes these before adding the contents of .jujuignore
 # NOTE that this diverges from Juju ignore list, which also ignores "version",
 # because we need the version file to populate the store
-default_juju_ignore = """
-.git
-.svn
-.hg
-.bzr
-.tox
-
-/build/
-/revision
-/venv
-
-.jujuignore
-""".split("\n")
+default_juju_ignore = [
+    "",
+    ".git",
+    ".svn",
+    ".hg",
+    ".bzr",
+    ".tox",
+    "",
+    "/build/",
+    "/revision",
+    "/venv",
+    "",
+    ".jujuignore",
+    "",
+]

charmcraft/utils/platform.py

@@ -1,4 +1,3 @@
-# noqa: A005 (This module shadows the stdlib platform module.)
 # Copyright 2023 Canonical Ltd.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");

charmcraft/utils/yaml.py

@@ -45,7 +45,7 @@ def _repr_str(dumper: yaml.SafeDumper, data: str) -> yaml.ScalarNode:
     return dumper.represent_scalar("tag:yaml.org,2002:str", data)
 
 
-def dump_yaml(data: Any) -> str:  # noqa: ANN401: yaml.dump takes anything, so why can't we?
+def dump_yaml(data: Any) -> str:  # noqa: ANN401 - yaml.dump takes anything, so why can't we?
     """Dump a craft model to a YAML string."""
     yaml.add_representer(str, _repr_str, Dumper=yaml.SafeDumper)
     yaml.add_representer(

tests/unit/commands/test_lifecycle.py

@@ -21,7 +21,6 @@
 
 import craft_cli
 import pytest
-import pytest_check
 from craft_cli.pytest_plugin import RecordingEmitter
 
 from charmcraft import application, models, services, utils
@@ -135,6 +134,7 @@ def test_pack_update_charm_libs_empty(
     emitter: RecordingEmitter,
     service_factory: services.ServiceFactory,
     mock_store_anonymous_client: mock.Mock,
+    check,
 ):
     simple_charm.charm_libs = [models.CharmLib(lib="my_charm.my_lib", version="0.1")]
     store_lib = Library("lib_id", "my_lib", "my_charm", 0, 1, "Lib contents", "hash")
@@ -143,7 +143,7 @@ def test_pack_update_charm_libs_empty(
 
     pack._update_charm_libs()
 
-    with pytest_check.check():
+    with check():
         emitter.assert_debug(repr(store_lib))
 
     path = fake_project_dir / utils.get_lib_path("my_charm", "my_lib", 0)

tests/unit/parts/plugins/test_python.py

@@ -54,6 +54,7 @@ def test_get_package_install_commands(
     constraints: list[str],
     requirements: list[str],
     packages: list[str],
+    check,
 ):
     spec = {
         "plugin": "python",
@@ -73,9 +74,9 @@ def test_get_package_install_commands(
 
     actual = python_plugin._get_package_install_commands()
 
-    with pytest_check.check():
+    with check():
         assert actual[0].startswith("/python -m pip")
-    with pytest_check.check():
+    with check():
         assert actual[1].startswith("/python -m pip")
     split_install_command = shlex.split(actual[0])
     for constraints_file in constraints:

tests/unit/utils/test_charmlibs.py

@@ -446,7 +446,7 @@ def test_getlibinternals_missing_internals_field(
 ):
     """Some internals field is not present."""
     monkeypatch.chdir(tmp_path)
-    kwargs = {arg: "" for arg in empty_args}
+    kwargs = dict.fromkeys(empty_args, "")
     test_path = _create_lib(**kwargs)
     with pytest.raises(CraftError) as err:
         get_lib_internals(lib_path=test_path)