From 4433d3244f65cf750ecdda224ec4d985639f092e Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Mon, 3 Feb 2025 18:21:38 +0000 Subject: [PATCH 1/2] chore: pre-commit autoupdate MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit updates: - [github.com/astral-sh/ruff-pre-commit: v0.8.6 → v0.9.4](https://github.com/astral-sh/ruff-pre-commit/compare/v0.8.6...v0.9.4) - [github.com/codespell-project/codespell: v2.3.0 → v2.4.1](https://github.com/codespell-project/codespell/compare/v2.3.0...v2.4.1) --- .pre-commit-config.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index a85c7226f..979414bd8 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -15,7 +15,7 @@ repos: exclude: template - id: check-added-large-files - repo: https://github.com/astral-sh/ruff-pre-commit - rev: v0.8.6 + rev: v0.9.4 hooks: - id: ruff args: [--fix, --exit-non-zero-on-fix] @@ -26,7 +26,7 @@ repos: - id: yamllint exclude: template - repo: https://github.com/codespell-project/codespell - rev: v2.3.0 + rev: v2.4.1 hooks: - id: codespell entry: codespell -I .codespell-ignore-words.txt From c6cf4b2fde059d3a07ed8f206185eeee45693d4e Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Mon, 3 Feb 2025 18:21:45 +0000 Subject: [PATCH 2/2] style: pre-commit.ci auto fixes [...] --- src/taskgraph/actions/registry.py | 12 ++++++------ src/taskgraph/config.py | 3 +-- src/taskgraph/main.py | 4 ++-- src/taskgraph/parameters.py | 3 +-- src/taskgraph/transforms/fetch.py | 2 +- src/taskgraph/transforms/task.py | 8 ++++---- src/taskgraph/util/dependencies.py | 6 +++--- src/taskgraph/util/docker.py | 3 +-- src/taskgraph/util/set_name.py | 6 +++--- test/test_generator.py | 6 +++--- test/test_main.py | 8 ++++---- test/test_scripts_fetch_content.py | 4 +++- 12 files changed, 32 insertions(+), 33 deletions(-) diff --git a/src/taskgraph/actions/registry.py b/src/taskgraph/actions/registry.py index 25ea272b8..de9d3b676 100644 --- a/src/taskgraph/actions/registry.py +++ b/src/taskgraph/actions/registry.py @@ -145,18 +145,18 @@ def register_callback_action( def register_callback(cb): assert isinstance(name, str), "name must be a string" assert isinstance(order, int), "order must be an integer" - assert callable(schema) or is_json( - schema - ), "schema must be a JSON compatible object" + assert callable(schema) or is_json(schema), ( + "schema must be a JSON compatible object" + ) assert isinstance(cb, FunctionType), "callback must be a function" # Allow for json-e > 25 chars in the symbol. if "$" not in symbol: assert 1 <= len(symbol) <= 25, "symbol must be between 1 and 25 characters" assert isinstance(symbol, str), "symbol must be a string" - assert not mem[ - "registered" - ], "register_callback_action must be used as decorator" + assert not mem["registered"], ( + "register_callback_action must be used as decorator" + ) assert cb_name not in callbacks, f"callback name {cb_name} is not unique" def action_builder(parameters, graph_config, decision_task_id): diff --git a/src/taskgraph/config.py b/src/taskgraph/config.py index ceef30261..e77434daf 100644 --- a/src/taskgraph/config.py +++ b/src/taskgraph/config.py @@ -142,8 +142,7 @@ def register(self): def vcs_root(self): if path.split(self.root_dir)[-1:] != ["taskcluster"]: raise Exception( - "Not guessing path to vcs root. " - "Graph config in non-standard location." + "Not guessing path to vcs root. Graph config in non-standard location." ) return os.path.dirname(self.root_dir) diff --git a/src/taskgraph/main.py b/src/taskgraph/main.py index 32335073b..ba670872b 100644 --- a/src/taskgraph/main.py +++ b/src/taskgraph/main.py @@ -326,7 +326,7 @@ def logfile(spec): "--tasks-regex", "--tasks", default=None, - help="only return tasks with labels matching this regular " "expression.", + help="only return tasks with labels matching this regular expression.", ) @argument( "--exclude-key", @@ -757,7 +757,7 @@ def action_callback(options): "--parameters", "-p", default="", - help="parameters file (.yml or .json; see " "`taskcluster/docs/parameters.rst`)`", + help="parameters file (.yml or .json; see `taskcluster/docs/parameters.rst`)`", ) @argument("--task-id", default=None, help="TaskId to which the action applies") @argument( diff --git a/src/taskgraph/parameters.py b/src/taskgraph/parameters.py index 80fd40475..158b7f6b1 100644 --- a/src/taskgraph/parameters.py +++ b/src/taskgraph/parameters.py @@ -286,8 +286,7 @@ def file_url(self, path, pretty=False): ) else: raise ParameterMismatch( - "Don't know how to determine file URL for non-github" - f"repo: {repo}" + f"Don't know how to determine file URL for non-githubrepo: {repo}" ) else: raise RuntimeError( diff --git a/src/taskgraph/transforms/fetch.py b/src/taskgraph/transforms/fetch.py index a38f0a9b7..38604bbfb 100644 --- a/src/taskgraph/transforms/fetch.py +++ b/src/taskgraph/transforms/fetch.py @@ -235,7 +235,7 @@ def create_fetch_url_task(config, name, fetch): ] if fetch.get("strip-components"): - args.extend(["--strip-components", f'{fetch["strip-components"]}']) + args.extend(["--strip-components", f"{fetch['strip-components']}"]) if fetch.get("add-prefix"): args.extend(["--add-prefix", fetch["add-prefix"]]) diff --git a/src/taskgraph/transforms/task.py b/src/taskgraph/transforms/task.py index 7e4e7137e..b340514ad 100644 --- a/src/taskgraph/transforms/task.py +++ b/src/taskgraph/transforms/task.py @@ -204,7 +204,7 @@ def _run_task_suffix(): UNKNOWN_GROUP_NAME = ( - "Treeherder group {} (from {}) has no name; " "add it to taskcluster/config.yml" + "Treeherder group {} (from {}) has no name; add it to taskcluster/config.yml" ) V2_ROUTE_TEMPLATES = [ @@ -372,9 +372,9 @@ def build_docker_worker_payload(config, task, task_def): if "in-tree" in image: name = image["in-tree"] docker_image_task = "docker-image-" + image["in-tree"] - assert "docker-image" not in task.get( - "dependencies", () - ), "docker-image key in dependencies object is reserved" + assert "docker-image" not in task.get("dependencies", ()), ( + "docker-image key in dependencies object is reserved" + ) task.setdefault("dependencies", {})["docker-image"] = docker_image_task image = { diff --git a/src/taskgraph/util/dependencies.py b/src/taskgraph/util/dependencies.py index d33aa3d7f..f6c35bf96 100644 --- a/src/taskgraph/util/dependencies.py +++ b/src/taskgraph/util/dependencies.py @@ -14,9 +14,9 @@ def group_by(name, schema=None): def wrapper(func): - assert ( - name not in GROUP_BY_MAP - ), f"duplicate group_by function name {name} ({func} and {GROUP_BY_MAP[name]})" + assert name not in GROUP_BY_MAP, ( + f"duplicate group_by function name {name} ({func} and {GROUP_BY_MAP[name]})" + ) GROUP_BY_MAP[name] = func func.schema = schema return func diff --git a/src/taskgraph/util/docker.py b/src/taskgraph/util/docker.py index 88c5d662e..2a1990eac 100644 --- a/src/taskgraph/util/docker.py +++ b/src/taskgraph/util/docker.py @@ -239,8 +239,7 @@ def parse_volumes(image): v = line.split(None, 1)[1] if v.startswith(b"["): raise ValueError( - "cannot parse array syntax for VOLUME; " - "convert to multiple entries" + "cannot parse array syntax for VOLUME; convert to multiple entries" ) volumes |= {volume.decode("utf-8") for volume in v.split()} diff --git a/src/taskgraph/util/set_name.py b/src/taskgraph/util/set_name.py index 4c27a9cca..db0e01c4a 100644 --- a/src/taskgraph/util/set_name.py +++ b/src/taskgraph/util/set_name.py @@ -11,9 +11,9 @@ def set_name(name, schema=None): def wrapper(func): - assert ( - name not in SET_NAME_MAP - ), f"duplicate set_name function name {name} ({func} and {SET_NAME_MAP[name]})" + assert name not in SET_NAME_MAP, ( + f"duplicate set_name function name {name} ({func} and {SET_NAME_MAP[name]})" + ) SET_NAME_MAP[name] = func func.schema = schema return func diff --git a/test/test_generator.py b/test/test_generator.py index c41eabacc..50df38fe2 100644 --- a/test/test_generator.py +++ b/test/test_generator.py @@ -199,9 +199,9 @@ def test_load_tasks_for_kind(monkeypatch): ) def test_default_loader(config, expected_transforms): loader = Kind("", "", config, {})._get_loader() - assert ( - loader is default_loader - ), "Default Kind loader should be taskgraph.loader.default.loader" + assert loader is default_loader, ( + "Default Kind loader should be taskgraph.loader.default.loader" + ) loader("", "", config, {}, []) assert config["transforms"] == expected_transforms diff --git a/test/test_main.py b/test/test_main.py index 43d518f8d..ad59ea520 100644 --- a/test/test_main.py +++ b/test/test_main.py @@ -250,8 +250,8 @@ def test_init_taskgraph(mocker, tmp_path, project_root, repo_with_upstream): config.write_text( dedent( f""" - cookiecutters_dir: {d / 'cookiecutters'} - replay_dir: {d / 'replay'} + cookiecutters_dir: {d / "cookiecutters"} + replay_dir: {d / "replay"} """ ) ) @@ -302,8 +302,8 @@ def test_init_taskgraph_unsupported(mocker, tmp_path, repo_with_upstream): config.write_text( dedent( f""" - cookiecutters_dir: {d / 'cookiecutters'} - replay_dir: {d / 'replay'} + cookiecutters_dir: {d / "cookiecutters"} + replay_dir: {d / "replay"} """ ) ) diff --git a/test/test_scripts_fetch_content.py b/test/test_scripts_fetch_content.py index aa8694a46..ea7efe44f 100644 --- a/test/test_scripts_fetch_content.py +++ b/test/test_scripts_fetch_content.py @@ -175,4 +175,6 @@ def test_should_repack_archive( orig, dest, strip_components, add_prefix ) == expected - ), f"Failed for orig: {orig}, dest: {dest}, strip_components: {strip_components}, add_prefix: {add_prefix}, expected {expected} but received {not expected}" + ), ( + f"Failed for orig: {orig}, dest: {dest}, strip_components: {strip_components}, add_prefix: {add_prefix}, expected {expected} but received {not expected}" + )