mozilla-taskgraph 1.3.0__tar.gz → 1.3.2__tar.gz

mozilla-taskgraph-1.3.2/PKG-INFO

@@ -0,0 +1,25 @@
+Metadata-Version: 2.1
+Name: mozilla-taskgraph
+Version: 1.3.2
+Summary: Mozilla-specific transforms and utilities for Taskgraph
+Home-page: https://github.com/mozilla-releng/mozilla-taskgraph
+Classifier: Development Status :: 4 - Beta
+Classifier: Environment :: Console
+Classifier: License :: OSI Approved :: Mozilla Public License 2.0 (MPL 2.0)
+Classifier: Programming Language :: Python :: 3.8
+Classifier: Programming Language :: Python :: 3.9
+Classifier: Programming Language :: Python :: 3.10
+Classifier: Programming Language :: Python :: 3.11
+Classifier: Topic :: Software Development
+Description-Content-Type: text/markdown
+License-File: LICENSE
+
+[![Task Status](https://firefox-ci-tc.services.mozilla.com/api/github/v1/repository/mozilla-releng/mozilla-taskgraph/main/badge.svg)](https://firefox-ci-tc.services.mozilla.com/api/github/v1/repository/mozilla-releng/mozilla-taskgraph/main/latest)
+[![pre-commit.ci status](https://results.pre-commit.ci/badge/github/mozilla-releng/mozilla-taskgraph/main.svg)](https://results.pre-commit.ci/latest/github/taskcluster/taskgraph/main)
+[![Code Coverage](https://codecov.io/gh/mozilla-releng/mozilla-taskgraph/branch/main/graph/badge.svg?token=GJIV52ZQNP)](https://codecov.io/gh/mozilla-releng/mozilla-taskgraph)
+[![Pypi Version](https://badge.fury.io/py/mozilla-taskgraph.svg)](https://badge.fury.io/py/mozilla-taskgraph)
+[![Documentation Status](https://readthedocs.org/projects/mozilla-taskgraph/badge/?version=latest)](https://mozilla-taskgraph.readthedocs.io/en/latest/?badge=latest)
+[![License](https://img.shields.io/badge/license-MPL%202.0-orange.svg)](http://mozilla.org/MPL/2.0)
+
+# mozilla-taskgraph
+Mozilla-specific transforms and utilities for Taskgraph

{mozilla-taskgraph-1.3.0 → mozilla-taskgraph-1.3.2}/setup.py

@@ -12,10 +12,15 @@ with open(version_file) as fh:
 with open(os.path.join(project_dir, "requirements/base.in")) as fp:
     requirements = fp.read().splitlines()
 
+with open(os.path.join(project_dir, "README.md")) as fh:
+    long_description = fh.read()
+
 setup(
     name="mozilla-taskgraph",
     version=version,
     description="Mozilla-specific transforms and utilities for Taskgraph",
+    long_description=long_description,
+    long_description_content_type="text/markdown",
     url="https://github.com/mozilla-releng/mozilla-taskgraph",
     packages=find_packages("src"),
     package_dir={"": "src"},

{mozilla-taskgraph-1.3.0 → mozilla-taskgraph-1.3.2}/src/mozilla_taskgraph/worker_types.py

@@ -73,7 +73,7 @@ from voluptuous import Extra, Optional, Required
 )
 def build_bitrise_payload(config, task, task_def):
     bitrise = task["worker"]["bitrise"]
-    build_params = task_def["payload"] = bitrise.get("build_params") or {}
+    build_params = bitrise.get("build_params") or {}
     task_def["tags"]["worker-implementation"] = "scriptworker"
 
     scope_prefix = config.graph_config["scriptworker"]["scope-prefix"]
@@ -87,23 +87,40 @@ def build_bitrise_payload(config, task, task_def):
     build_params.setdefault("commit_hash", config.params["head_rev"])
     build_params.setdefault("branch_repo_owner", config.params["head_repository"])
 
-    if config.params["head_ref"]:
-        build_params.setdefault("branch", config.params["head_ref"])
+    def normref(ref, type="heads"):
+        if ref:
+            prefix = f"refs/{type}/"
+            if ref.startswith(prefix):
+                return ref[len(prefix) :]
+            # The ref is a different type than the requested one, return None
+            # to indicate this.
+            elif ref.startswith("refs/"):
+                return None
+        return ref
 
-    if config.params["head_tag"]:
-        build_params.setdefault("tag", config.params["head_tag"])
+    head_ref = normref(config.params["head_ref"])
+    head_tag = normref(config.params["head_tag"], type="tags")
+    base_ref = normref(config.params["base_ref"])
+
+    if head_ref:
+        build_params.setdefault("branch", head_ref)
+
+    if head_tag:
+        build_params.setdefault("tag", head_tag)
 
     if config.params["tasks_for"] == "github-pull-request":
         build_params.setdefault("pull_request_author", config.params["owner"])
 
-        if config.params["base_ref"]:
-            build_params.setdefault("branch_dest", config.params["base_ref"])
+        if base_ref:
+            build_params.setdefault("branch_dest", base_ref)
 
         if config.params["base_repository"]:
             build_params.setdefault(
                 "branch_dest_repo_owner", config.params["base_repository"]
             )
 
+    task_def["payload"] = {"build_params": build_params}
+
 
 @payload_builder(
     "scriptworker-shipit",

mozilla-taskgraph-1.3.2/src/mozilla_taskgraph.egg-info/PKG-INFO

@@ -0,0 +1,25 @@
+Metadata-Version: 2.1
+Name: mozilla-taskgraph
+Version: 1.3.2
+Summary: Mozilla-specific transforms and utilities for Taskgraph
+Home-page: https://github.com/mozilla-releng/mozilla-taskgraph
+Classifier: Development Status :: 4 - Beta
+Classifier: Environment :: Console
+Classifier: License :: OSI Approved :: Mozilla Public License 2.0 (MPL 2.0)
+Classifier: Programming Language :: Python :: 3.8
+Classifier: Programming Language :: Python :: 3.9
+Classifier: Programming Language :: Python :: 3.10
+Classifier: Programming Language :: Python :: 3.11
+Classifier: Topic :: Software Development
+Description-Content-Type: text/markdown
+License-File: LICENSE
+
+[![Task Status](https://firefox-ci-tc.services.mozilla.com/api/github/v1/repository/mozilla-releng/mozilla-taskgraph/main/badge.svg)](https://firefox-ci-tc.services.mozilla.com/api/github/v1/repository/mozilla-releng/mozilla-taskgraph/main/latest)
+[![pre-commit.ci status](https://results.pre-commit.ci/badge/github/mozilla-releng/mozilla-taskgraph/main.svg)](https://results.pre-commit.ci/latest/github/taskcluster/taskgraph/main)
+[![Code Coverage](https://codecov.io/gh/mozilla-releng/mozilla-taskgraph/branch/main/graph/badge.svg?token=GJIV52ZQNP)](https://codecov.io/gh/mozilla-releng/mozilla-taskgraph)
+[![Pypi Version](https://badge.fury.io/py/mozilla-taskgraph.svg)](https://badge.fury.io/py/mozilla-taskgraph)
+[![Documentation Status](https://readthedocs.org/projects/mozilla-taskgraph/badge/?version=latest)](https://mozilla-taskgraph.readthedocs.io/en/latest/?badge=latest)
+[![License](https://img.shields.io/badge/license-MPL%202.0-orange.svg)](http://mozilla.org/MPL/2.0)
+
+# mozilla-taskgraph
+Mozilla-specific transforms and utilities for Taskgraph

{mozilla-taskgraph-1.3.0 → mozilla-taskgraph-1.3.2}/test/test_worker_types.py

@@ -21,9 +21,11 @@ from mozilla_taskgraph import worker_types
             {},
             {
                 "payload": {
-                    "branch": "default",
-                    "branch_repo_owner": "http://example.com/head/repo",
-                    "commit_hash": "abcdef",
+                    "build_params": {
+                        "branch": "default",
+                        "branch_repo_owner": "http://example.com/head/repo",
+                        "commit_hash": "abcdef",
+                    },
                 },
                 "scopes": [
                     "foo:bitrise:app:some-app",
@@ -39,12 +41,14 @@ from mozilla_taskgraph import worker_types
             {"tasks_for": "github-pull-request"},
             {
                 "payload": {
-                    "branch": "default",
-                    "branch_dest": "123456",
-                    "branch_dest_repo_owner": "http://example.com/base/repo",
-                    "branch_repo_owner": "http://example.com/head/repo",
-                    "commit_hash": "abcdef",
-                    "pull_request_author": "some-owner",
+                    "build_params": {
+                        "branch": "default",
+                        "branch_dest": "123456",
+                        "branch_dest_repo_owner": "http://example.com/base/repo",
+                        "branch_repo_owner": "http://example.com/head/repo",
+                        "commit_hash": "abcdef",
+                        "pull_request_author": "some-owner",
+                    },
                 },
                 "scopes": ["foo:bitrise:app:some-app", "foo:bitrise:workflow:bar"],
                 "tags": {"worker-implementation": "scriptworker"},
@@ -62,16 +66,65 @@ from mozilla_taskgraph import worker_types
             },
             {
                 "payload": {
-                    "branch_repo_owner": "http://example.com/head/repo",
-                    "commit_hash": "abcdef",
-                    "pull_request_author": "some-owner",
-                    "tag": "some-tag",
+                    "build_params": {
+                        "branch_repo_owner": "http://example.com/head/repo",
+                        "commit_hash": "abcdef",
+                        "pull_request_author": "some-owner",
+                        "tag": "some-tag",
+                    }
                 },
                 "scopes": ["foo:bitrise:app:some-app", "foo:bitrise:workflow:bar"],
                 "tags": {"worker-implementation": "scriptworker"},
             },
             id="opposite params",  # this test helps hit other half of if statements
         ),
+        pytest.param(
+            {"bitrise": {"app": "some-app", "workflows": ["bar"]}},
+            {
+                "base_ref": "refs/heads/foo",
+                "base_repository": "",
+                "head_ref": "refs/heads/bar",
+                "head_tag": "refs/tags/some-tag",
+                "tasks_for": "github-pull-request",
+            },
+            {
+                "payload": {
+                    "build_params": {
+                        "branch": "bar",
+                        "branch_dest": "foo",
+                        "branch_repo_owner": "http://example.com/head/repo",
+                        "commit_hash": "abcdef",
+                        "pull_request_author": "some-owner",
+                        "tag": "some-tag",
+                    }
+                },
+                "scopes": ["foo:bitrise:app:some-app", "foo:bitrise:workflow:bar"],
+                "tags": {"worker-implementation": "scriptworker"},
+            },
+            id="normalize refs",
+        ),
+        pytest.param(
+            {"bitrise": {"app": "some-app", "workflows": ["bar"]}},
+            {
+                "base_ref": "refs/tags/foo",
+                "base_repository": "",
+                "head_ref": "refs/tags/bar",
+                "head_tag": "refs/heads/some-tag",
+                "tasks_for": "github-pull-request",
+            },
+            {
+                "payload": {
+                    "build_params": {
+                        "branch_repo_owner": "http://example.com/head/repo",
+                        "commit_hash": "abcdef",
+                        "pull_request_author": "some-owner",
+                    }
+                },
+                "scopes": ["foo:bitrise:app:some-app", "foo:bitrise:workflow:bar"],
+                "tags": {"worker-implementation": "scriptworker"},
+            },
+            id="normalize refs wrong type",
+        ),
     ),
 )
 def test_build_bitrise_payload(

mozilla-taskgraph-1.3.0/PKG-INFO

@@ -1,15 +0,0 @@
-Metadata-Version: 2.1
-Name: mozilla-taskgraph
-Version: 1.3.0
-Summary: Mozilla-specific transforms and utilities for Taskgraph
-Home-page: https://github.com/mozilla-releng/mozilla-taskgraph
-Classifier: Development Status :: 4 - Beta
-Classifier: Environment :: Console
-Classifier: License :: OSI Approved :: Mozilla Public License 2.0 (MPL 2.0)
-Classifier: Programming Language :: Python :: 3.8
-Classifier: Programming Language :: Python :: 3.9
-Classifier: Programming Language :: Python :: 3.10
-Classifier: Programming Language :: Python :: 3.11
-Classifier: Topic :: Software Development
-License-File: LICENSE
-Requires-Dist: taskcluster-taskgraph<8,>=5.4

mozilla-taskgraph-1.3.0/src/mozilla_taskgraph.egg-info/PKG-INFO

@@ -1,15 +0,0 @@
-Metadata-Version: 2.1
-Name: mozilla-taskgraph
-Version: 1.3.0
-Summary: Mozilla-specific transforms and utilities for Taskgraph
-Home-page: https://github.com/mozilla-releng/mozilla-taskgraph
-Classifier: Development Status :: 4 - Beta
-Classifier: Environment :: Console
-Classifier: License :: OSI Approved :: Mozilla Public License 2.0 (MPL 2.0)
-Classifier: Programming Language :: Python :: 3.8
-Classifier: Programming Language :: Python :: 3.9
-Classifier: Programming Language :: Python :: 3.10
-Classifier: Programming Language :: Python :: 3.11
-Classifier: Topic :: Software Development
-License-File: LICENSE
-Requires-Dist: taskcluster-taskgraph<8,>=5.4