codecov-cli 11.0.2__tar.gz → 11.1.0__tar.gz

{codecov_cli-11.0.2/codecov_cli.egg-info → codecov_cli-11.1.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: codecov-cli
-Version: 11.0.2
+Version: 11.1.0
 Summary: Codecov Command Line Interface
 Author-email: Tom Hu <thomas.hu@sentry.io>
 Maintainer-email: Codecov Support <support@codecov.io>

codecov_cli-11.1.0/codecov_cli/branding.py

@@ -0,0 +1,6 @@
+from enum import Enum
+
+
+class Branding(Enum):
+    CODECOV = "codecov"
+    PREVENT = "prevent"

{codecov_cli-11.0.2 → codecov_cli-11.1.0}/codecov_cli/commands/base_picking.py

@@ -4,7 +4,12 @@ import typing
 import click
 import sentry_sdk
 
-from codecov_cli.fallbacks import CodecovOption, FallbackFieldEnum
+from codecov_cli.fallbacks import (
+    BrandedCodecovOption,
+    BrandedOption,
+    CodecovOption,
+    FallbackFieldEnum,
+)
 from codecov_cli.helpers.args import get_cli_args
 from codecov_cli.helpers.encoder import slug_without_subgroups_is_invalid
 from codecov_cli.services.commit.base_picking import base_picking_logic
@@ -29,16 +34,17 @@ logger = logging.getLogger("codecovcli")
 )
 @click.option(
     "--slug",
-    cls=CodecovOption,
+    cls=BrandedCodecovOption,
     fallback_field=FallbackFieldEnum.slug,
     help="owner/repo slug",
-    envvar="CODECOV_SLUG",
+    envvar="SLUG",
 )
 @click.option(
     "-t",
     "--token",
+    cls=BrandedOption,
     help="Codecov upload token",
-    envvar="CODECOV_TOKEN",
+    envvar="TOKEN",
 )
 @click.option(
     "--service",

{codecov_cli-11.0.2 → codecov_cli-11.1.0}/codecov_cli/fallbacks.py

@@ -39,3 +39,18 @@ class CodecovOption(click.Option):
                 if res is not None:
                     return res
         return None
+
+
+class BrandedOption(click.Option):
+    def resolve_envvar_value(self, ctx: click.Context) -> typing.Optional[str]:
+        actual_var = self.envvar
+        self.envvar = [
+            f"{brand.value.upper()}_{actual_var}" for brand in ctx.obj["branding"]
+        ]
+        res = super().resolve_envvar_value(ctx)
+        self.envvar = actual_var
+        return res
+
+
+class BrandedCodecovOption(CodecovOption, BrandedOption):
+    pass

{codecov_cli-11.0.2 → codecov_cli-11.1.0}/codecov_cli/helpers/ci_adapters/github_actions.py

@@ -66,21 +66,21 @@ class GithubActionsCIAdapter(CIAdapterBase):
         return os.getenv("GITHUB_REPOSITORY")
 
     def _get_branch(self):
-        branch = os.getenv("GITHUB_HEAD_REF")
-        if branch:
-            return branch
+        def remove_prefix(s: str, prefix: str) -> str:
+            if s.startswith(prefix):
+                return s[len(prefix) :]
+            return ""
 
-        branch_ref = os.getenv("GITHUB_REF")
+        head_ref = os.getenv("GITHUB_HEAD_REF", "")
+        ref = remove_prefix(os.getenv("GITHUB_REF", ""), "refs/heads/")
 
-        if not branch_ref:
-            return None
-
-        match = re.search(r"refs/heads/(.*)", branch_ref)
+        branch = head_ref or ref
 
-        if match is None:
-            return None
+        # branch format for merge queue CI runs:
+        # gh-readonly-queue/<branch-name>/<pr-number>-<pr-name>
+        if branch.startswith("gh-readonly-queue/"):
+            return branch.split("/")[1]
 
-        branch = match.group(1)
         return branch or None
 
     def _get_service(self):

{codecov_cli-11.0.2 → codecov_cli-11.1.0}/codecov_cli/helpers/options.py

@@ -1,6 +1,11 @@
 import click
 
-from codecov_cli.fallbacks import CodecovOption, FallbackFieldEnum
+from codecov_cli.fallbacks import (
+    BrandedCodecovOption,
+    BrandedOption,
+    CodecovOption,
+    FallbackFieldEnum,
+)
 from codecov_cli.helpers.git import GitService
 
 _global_options = [
@@ -31,16 +36,17 @@ _global_options = [
         "-t",
         "--token",
         help="Codecov upload token",
-        envvar="CODECOV_TOKEN",
+        cls=BrandedOption,
+        envvar="TOKEN",
     ),
     click.option(
         "-r",
         "--slug",
         "slug",
-        cls=CodecovOption,
+        cls=BrandedCodecovOption,
         fallback_field=FallbackFieldEnum.slug,
         help="owner/repo slug used instead of the private repo token in Self-hosted",
-        envvar="CODECOV_SLUG",
+        envvar="SLUG",
     ),
 ]
 

{codecov_cli-11.0.2 → codecov_cli-11.1.0}/codecov_cli/helpers/upload_type.py

@@ -9,7 +9,7 @@ class ReportType(Enum):
 def report_type_from_str(report_type_str: str) -> ReportType:
     if report_type_str == "coverage":
         return ReportType.COVERAGE
-    elif report_type_str == "test_results":
+    elif report_type_str.replace("-", "_") == "test_results":
         return ReportType.TEST_RESULTS
     else:
         raise ValueError(f"Invalid upload type: {report_type_str}")

{codecov_cli-11.0.2 → codecov_cli-11.1.0}/codecov_cli/main.py

@@ -5,7 +5,7 @@ import typing
 import click
 
 from codecov_cli import __version__
-from codecov_cli.opentelemetry import init_telem
+from codecov_cli.branding import Branding
 from codecov_cli.commands.base_picking import pr_base_picking
 from codecov_cli.commands.commit import create_commit
 from codecov_cli.commands.create_report_result import create_report_results
@@ -23,6 +23,7 @@ from codecov_cli.helpers.ci_adapters import get_ci_adapter, get_ci_providers_lis
 from codecov_cli.helpers.config import load_cli_config
 from codecov_cli.helpers.logging_utils import configure_logger
 from codecov_cli.helpers.versioning_systems import get_versioning_system
+from codecov_cli.opentelemetry import init_telem
 
 logger = logging.getLogger("codecovcli")
 
@@ -70,7 +71,7 @@ def cli(
         ctx.default_map = {ctx.invoked_subcommand: {"token": token}}
     ctx.obj["enterprise_url"] = enterprise_url
     ctx.obj["disable_telem"] = disable_telem
-
+    ctx.obj["branding"] = [Branding.CODECOV]
     init_telem(ctx.obj)
 
 

{codecov_cli-11.0.2 → codecov_cli-11.1.0/codecov_cli.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: codecov-cli
-Version: 11.0.2
+Version: 11.1.0
 Summary: Codecov Command Line Interface
 Author-email: Tom Hu <thomas.hu@sentry.io>
 Maintainer-email: Codecov Support <support@codecov.io>

{codecov_cli-11.0.2 → codecov_cli-11.1.0}/codecov_cli.egg-info/SOURCES.txt

@@ -4,6 +4,7 @@ README.md
 pyproject.toml
 setup.py
 codecov_cli/__init__.py
+codecov_cli/branding.py
 codecov_cli/fallbacks.py
 codecov_cli/main.py
 codecov_cli/opentelemetry.py
@@ -115,6 +116,7 @@ tests/__init__.py
 tests/conftest.py
 tests/factory.py
 tests/test_codecov_cli.py
+tests/test_fallbacks.py
 tests/test_helpers.py
 tests/test_types.py
 tests/ci_adapters/test_appveyor.py

{codecov_cli-11.0.2 → codecov_cli-11.1.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "codecov-cli"
-version = "11.0.2"
+version = "11.1.0"
 description = "Codecov Command Line Interface"
 readme = "README.md"
 license-files = ["LICENSE"]
@@ -23,6 +23,7 @@ dependencies = [
 [dependency-groups]
 dev = [
     "pre-commit==3.*",
+    "pyinstaller==6.*",
     "pytest==7.*",
     "pytest-asyncio==0.21.1",
     "pytest-cov==4.*",
@@ -42,7 +43,5 @@ build-backend = "setuptools.build_meta"
 packages = ["codecov_cli"]
 
 [tool.pytest.ini_options]
-env = [
-    "CODECOV_ENV=test",
-]
+env = ["CODECOV_ENV=test"]
 

{codecov_cli-11.0.2 → codecov_cli-11.1.0}/tests/ci_adapters/test_ghactions.py

@@ -207,6 +207,12 @@ class TestGithubActions(object):
             ({GithubActionsEnvEnum.GITHUB_REF: r"doesn't_match"}, None),
             ({GithubActionsEnvEnum.GITHUB_REF: r"refs/heads/"}, None),
             ({GithubActionsEnvEnum.GITHUB_REF: r"refs/heads/abc"}, "abc"),
+            (
+                {
+                    GithubActionsEnvEnum.GITHUB_REF: r"refs/heads/gh-readonly-queue/abc/pr-name-number"
+                },
+                "abc",
+            ),
         ],
     )
     def test_branch(self, env_dict, expected, mocker):

codecov_cli-11.1.0/tests/test_fallbacks.py

@@ -0,0 +1,33 @@
+import click
+
+from codecov_cli.fallbacks import BrandedOption
+from codecov_cli.branding import Branding
+
+from click.testing import CliRunner
+
+
+@click.group()
+@click.pass_context
+def cli(ctx):
+    ctx.obj = {}
+    ctx.obj["branding"] = [Branding.CODECOV, Branding.PREVENT]
+
+
+@cli.command()
+@click.option("--test", cls=BrandedOption, envvar="TEST")
+@click.pass_context
+def hello_world(ctx, test):
+    click.echo(f"{test}")
+
+
+def test_branded_option():
+    runner = CliRunner()
+
+    result = runner.invoke(cli, ["hello-world"], env={"CODECOV_TEST": "hello_codecov"})
+    assert result.output == "hello_codecov\n"
+
+    result = runner.invoke(cli, ["hello-world"], env={"PREVENT_TEST": "hello_prevent"})
+    assert result.output == "hello_prevent\n"
+
+    result = runner.invoke(cli, ["hello-world"])
+    assert result.output == "None\n"