fix(python): update template for Taskgraph 7+

The template was still setting things up with the old file structure.
mozilla-releng · Sep 3, 2024 · afefc07 · afefc07
1 parent 032c45b
commit afefc07
Show file tree

Hide file tree

Showing 9 changed files with 6 additions and 15 deletions.
diff --git a/reps/hooks.py b/reps/hooks.py
@@ -142,12 +142,6 @@ def pre_commit_autoupdate(items: CookiecutterContext):
     run(["pre-commit", "autoupdate"])
 
 
-@hook("post-gen-py")
-@hook("post-gen-base")
-def lock_taskgraph_requirements(items: CookiecutterContext):
-    run(["pip-compile", "requirements.in", "--generate-hashes"], cwd="taskcluster")
-
-
 @hook("post-gen-base")
 def taskgraph_init(items: CookiecutterContext):
     run(["taskgraph", "init"])
diff --git a/reps/templates/python/{{cookiecutter.__project_slug}}/.taskcluster.yml b/reps/templates/python/{{cookiecutter.__project_slug}}/.taskcluster.yml
@@ -223,7 +223,7 @@ tasks:
                           features:
                               taskclusterProxy: true
 
-                          image: mozillareleases/taskgraph:decision-f19bfa3ae9dbc19190149445bfc38ad966b713336e44342c7643b3f7f1e0b023@sha256:ddcc7348db272885e8ea32825f698bfafa4727401099531cd8239d3d458b39aa
+                          image: mozillareleases/taskgraph:decision-latest
                           maxRunTime: 1800
 
                           command:

diff --git a/..._project_slug}}/taskcluster/ci/config.yml → ...r.__project_slug}}/taskcluster/config.yml b/..._project_slug}}/taskcluster/ci/config.yml → ...r.__project_slug}}/taskcluster/config.yml
diff --git a/...ct_slug}}/taskcluster/ci/codecov/kind.yml → ...slug}}/taskcluster/kinds/codecov/kind.yml b/...ct_slug}}/taskcluster/ci/codecov/kind.yml → ...slug}}/taskcluster/kinds/codecov/kind.yml
diff --git a/...ug}}/taskcluster/ci/docker-image/kind.yml → ...}/taskcluster/kinds/docker-image/kind.yml b/...ug}}/taskcluster/ci/docker-image/kind.yml → ...}/taskcluster/kinds/docker-image/kind.yml
diff --git a/...ject_slug}}/taskcluster/ci/fetch/kind.yml → ...t_slug}}/taskcluster/kinds/fetch/kind.yml b/...ject_slug}}/taskcluster/ci/fetch/kind.yml → ...t_slug}}/taskcluster/kinds/fetch/kind.yml
diff --git a/...oject_slug}}/taskcluster/ci/test/kind.yml → ...ct_slug}}/taskcluster/kinds/test/kind.yml b/...oject_slug}}/taskcluster/ci/test/kind.yml → ...ct_slug}}/taskcluster/kinds/test/kind.yml
diff --git a/reps/templates/python/{{cookiecutter.__project_slug}}/taskcluster/requirements.in b/reps/templates/python/{{cookiecutter.__project_slug}}/taskcluster/requirements.in
diff --git a/test/test_template_python.py b/test/test_template_python.py
@@ -28,15 +28,13 @@ def test_generated_files(reps_new):
         "pyproject.toml",
         "poetry.lock",
         f"src/{name}/__init__.py",
-        "taskcluster/ci/codecov/kind.yml",
-        "taskcluster/ci/config.yml",
-        "taskcluster/ci/docker-image/kind.yml",
-        "taskcluster/ci/fetch/kind.yml",
-        "taskcluster/ci/test/kind.yml",
+        "taskcluster/config.yml",
         "taskcluster/docker/fetch/Dockerfile",
         "taskcluster/docker/python/Dockerfile",
-        "taskcluster/requirements.in",
-        "taskcluster/requirements.txt",
+        "taskcluster/kinds/codecov/kind.yml",
+        "taskcluster/kinds/docker-image/kind.yml",
+        "taskcluster/kinds/fetch/kind.yml",
+        "taskcluster/kinds/test/kind.yml",
         "taskcluster/scripts/codecov-upload.py",
         "taskcluster/scripts/pyenv-setup",
         "taskcluster/scripts/poetry-setup",