codecov-cli 0.3.3__tar.gz → 0.3.4__tar.gz

{codecov-cli-0.3.3/codecov_cli.egg-info → codecov-cli-0.3.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: codecov-cli
-Version: 0.3.3
+Version: 0.3.4
 Summary: Codecov Command Line Interface
 Author: Codecov
 Author-email: support@codecov.io

codecov-cli-0.3.4/codecov_cli/__init__.py

@@ -0,0 +1,4 @@
+with open("VERSION", encoding="utf-8") as f:
+    version_number = f.readline().strip()
+
+__version__ = version_number

{codecov-cli-0.3.3 → codecov-cli-0.3.4}/codecov_cli/commands/upload.py

@@ -65,6 +65,12 @@ _global_upload_options = [
         is_flag=True,
         default=False,
     ),
+    click.option(
+        "--disable-file-fixes",
+        help="Disable file fixes to ignore common lines from coverage (e.g. blank lines or empty brackets)",
+        is_flag=True,
+        default=False,
+    ),
     click.option(
         "-b",
         "--build",
@@ -178,6 +184,7 @@ def do_upload(
     coverage_files_search_exclude_folders: typing.List[pathlib.Path],
     coverage_files_search_explicitly_listed_files: typing.List[pathlib.Path],
     disable_search: bool,
+    disable_file_fixes: bool,
     token: typing.Optional[uuid.UUID],
     plugin_names: typing.List[str],
     branch: typing.Optional[str],
@@ -218,6 +225,7 @@ def do_upload(
                 git_service=git_service,
                 enterprise_url=enterprise_url,
                 disable_search=disable_search,
+                disable_file_fixes=disable_file_fixes,
                 handle_no_reports_found=handle_no_reports_found,
             )
         ),
@@ -254,4 +262,5 @@ def do_upload(
         enterprise_url=enterprise_url,
         disable_search=disable_search,
         handle_no_reports_found=handle_no_reports_found,
+        disable_file_fixes=disable_file_fixes,
     )

{codecov-cli-0.3.3 → codecov-cli-0.3.4}/codecov_cli/commands/upload_process.py

@@ -37,6 +37,7 @@ def upload_process(
     coverage_files_search_exclude_folders: typing.List[pathlib.Path],
     coverage_files_search_explicitly_listed_files: typing.List[pathlib.Path],
     disable_search: bool,
+    disable_file_fixes: bool,
     token: typing.Optional[uuid.UUID],
     plugin_names: typing.List[str],
     branch: typing.Optional[str],
@@ -72,6 +73,7 @@ def upload_process(
                 pull_request_number=pull_request_number,
                 git_service=git_service,
                 disable_search=disable_search,
+                disable_file_fixes=disable_file_fixes,
                 fail_on_error=fail_on_error,
                 handle_no_reports_found=handle_no_reports_found,
             )
@@ -123,4 +125,5 @@ def upload_process(
         dry_run=dry_run,
         git_service=git_service,
         handle_no_reports_found=handle_no_reports_found,
+        disable_file_fixes=disable_file_fixes,
     )

{codecov-cli-0.3.3 → codecov-cli-0.3.4}/codecov_cli/runners/python_standard_runner.py

@@ -1,17 +1,11 @@
 import logging
 import random
 import subprocess
-from contextlib import redirect_stdout
-from io import StringIO, TextIOWrapper
-from multiprocessing import Process, Queue, get_context
-from os import getcwd
-from queue import Empty
 from subprocess import CalledProcessError
-from sys import path, stdout
+from sys import stdout
 from typing import List, Optional
 
 import click
-import pytest
 
 from codecov_cli.runners.types import (
     LabelAnalysisRequestResult,
@@ -43,58 +37,6 @@ class PythonStandardRunnerConfigParams(dict):
         """
         return self.get("coverage_root", "./")
 
-    @property
-    def strict_mode(self) -> bool:
-        """
-        Run pytest from within Python instead of using subprocess.run
-        This is potentailly safer than using subprocess.run because it guarantees better that
-        the program running is indeed pytest.
-        But it might not work everytime due to import issues related to Python caching modules.
-        """
-        return self.get("strict_mode", False)
-
-
-def _include_curr_dir(method):
-    """
-    Account for the difference 'pytest' vs 'python -m pytest'
-    https://docs.pytest.org/en/7.1.x/how-to/usage.html#calling-pytest-through-python-m-pytest
-    Used only in strict_mode
-    """
-
-    def call_method(self, *args, **kwargs):
-        curr_dir = getcwd()
-        path.append(curr_dir)
-
-        result = method(self, *args, **kwargs)
-
-        path.remove(curr_dir)
-        return result
-
-    return call_method
-
-
-def _execute_pytest_subprocess(
-    pytest_args: List[str],
-    queue: Queue,
-    parent_stdout: TextIOWrapper,
-    capture_output: bool = True,
-):
-    """Runs pytest from python in a subprocess.
-    This is because we call it twice in the label-analysis process,
-    so we might have import errors if calling it directly.
-    Check the warning: https://docs.pytest.org/en/7.1.x/how-to/usage.html#calling-pytest-from-python-code
-
-    Returns the output value and pytest exit code via queue
-    """
-    subproces_stdout = parent_stdout
-    if capture_output:
-        subproces_stdout = StringIO()
-    with redirect_stdout(subproces_stdout):
-        result = pytest.main(pytest_args)
-    if capture_output:
-        queue.put({"output": subproces_stdout.getvalue()})
-    queue.put({"result": result})
-
 
 class PythonStandardRunner(LabelAnalysisRunnerInterface):
 
@@ -106,54 +48,6 @@ class PythonStandardRunner(LabelAnalysisRunnerInterface):
             config_params = {}
         self.params = PythonStandardRunnerConfigParams(config_params)
 
-    def _wait_pytest(self, pytest_process: Process, queue: Queue):
-        pytest_process.start()
-        result = None
-        output = None
-        while pytest_process.exitcode == 0 or pytest_process.exitcode == None:
-            from_queue = None
-            try:
-                from_queue = queue.get(timeout=1)
-            except Empty:
-                pass
-            if from_queue and "output" in from_queue:
-                output = from_queue["output"]
-            if from_queue and "result" in from_queue:
-                result = from_queue["result"]
-            if result is not None:
-                break
-        pytest_process.join()
-        return result, output
-
-    @_include_curr_dir
-    def _execute_pytest_strict(
-        self, pytest_args: List[str], capture_output: bool = True
-    ) -> str:
-        """Handles calling pytest from Python in a subprocess.
-        Raises Exception if pytest fails
-        Returns the complete pytest output
-        """
-        ctx = get_context(method="fork")
-        queue = ctx.Queue(2)
-        p = ctx.Process(
-            target=_execute_pytest_subprocess,
-            args=[pytest_args, queue, stdout, capture_output],
-        )
-        result, output = self._wait_pytest(p, queue)
-
-        if p.exitcode != 0 or (result != pytest.ExitCode.OK and result != 0):
-            message = f"Pytest exited with non-zero code {result}."
-            message += "\nThis is likely not a problem with label-analysis. Check pytest's output and options."
-            if capture_output:
-                # If pytest failed but we captured its output the user won't know what's wrong
-                # So we need to include that in the error message
-                message += "\nPYTEST OUTPUT:"
-                message += "\n" + output
-            else:
-                message += "\n(you can check pytest options on the logs before the test session start)"
-            raise click.ClickException(message)
-        return output
-
     def parse_captured_output_error(self, exp: CalledProcessError) -> str:
         result = ""
         for out_stream in [exp.stdout, exp.stderr]:
@@ -202,10 +96,7 @@ class PythonStandardRunner(LabelAnalysisRunnerInterface):
             ),
         )
 
-        if self.params.strict_mode:
-            output = self._execute_pytest_strict(options_to_use)
-        else:
-            output = self._execute_pytest(options_to_use)
+        output = self._execute_pytest(options_to_use)
         lines = output.split(sep="\n")
         test_names = list(line for line in lines if ("::" in line and "test" in line))
         return test_names
@@ -254,10 +145,7 @@ class PythonStandardRunner(LabelAnalysisRunnerInterface):
             "List of tests executed",
             extra=dict(extra_log_attributes=dict(executed_tests=tests_to_run)),
         )
-        if self.params.strict_mode:
-            output = self._execute_pytest_strict(command_array, capture_output=False)
-        else:
-            output = self._execute_pytest(command_array, capture_output=False)
+        output = self._execute_pytest(command_array, capture_output=False)
         logger.info(f"Finished running {len(tests_to_run)} tests successfully")
         logger.info(f"  pytest options: \"{' '.join(default_options)}\"")
         logger.debug(output)

{codecov-cli-0.3.3 → codecov-cli-0.3.4}/codecov_cli/services/staticanalysis/__init__.py

@@ -109,7 +109,14 @@ async def run_analysis_entrypoint(
                 for el in files_that_need_upload:
                     all_tasks.append(send_single_upload_put(client, all_data, el))
                     bar.update(1, all_data[el["filepath"]])
-                resps = await asyncio.gather(*all_tasks)
+                try:
+                    resps = await asyncio.gather(*all_tasks)
+                except asyncio.CancelledError:
+                    message = (
+                        "Unknown error cancelled the upload tasks.\n"
+                        + f"Uploaded {len(uploaded_files)}/{len(files_that_need_upload)} files successfully."
+                    )
+                    raise click.ClickException(message)
             for resp in resps:
                 if resp["succeeded"]:
                     uploaded_files.append(resp["filepath"])
@@ -188,35 +195,44 @@ async def process_files(
     )
 
 
-async def send_single_upload_put(client, all_data, el):
+async def send_single_upload_put(client, all_data, el) -> typing.Dict:
     retryable_statuses = (429,)
     presigned_put = el["raw_upload_location"]
     number_retries = 5
-    for current_retry in range(number_retries):
-        response = await client.put(
-            presigned_put, data=json.dumps(all_data[el["filepath"]])
-        )
-        if response.status_code < 300:
-            return {
-                "status_code": response.status_code,
-                "filepath": el["filepath"],
-                "succeeded": True,
-            }
-        if response.status_code in retryable_statuses:
-            await asyncio.sleep(2**current_retry)
+    try:
+        for current_retry in range(number_retries):
+            response = await client.put(
+                presigned_put, data=json.dumps(all_data[el["filepath"]])
+            )
+            if response.status_code < 300:
+                return {
+                    "status_code": response.status_code,
+                    "filepath": el["filepath"],
+                    "succeeded": True,
+                }
+            if response.status_code in retryable_statuses:
+                await asyncio.sleep(2**current_retry)
+        status_code = response.status_code
+        message_to_warn = response.text
+        exception = None
+    except httpx.HTTPError as exp:
+        status_code = None
+        exception = type(exp)
+        message_to_warn = str(exp)
     logger.warning(
-        "Unable to send data",
+        "Unable to send single_upload_put",
         extra=dict(
             extra_log_attributes=dict(
-                response=response.text,
+                message=message_to_warn,
+                exception=exception,
                 filepath=el["filepath"],
-                url=presigned_put,
-                latest_status_code=response.status_code,
+                latest_status_code=status_code,
             )
         ),
     )
     return {
-        "status_code": response.status_code,
+        "status_code": status_code,
+        "exception": exception,
         "filepath": el["filepath"],
         "succeeded": False,
     }

{codecov-cli-0.3.3 → codecov-cli-0.3.4}/codecov_cli/services/upload/__init__.py

@@ -50,6 +50,7 @@ def do_upload_logic(
     enterprise_url: typing.Optional[str],
     disable_search: bool = False,
     handle_no_reports_found: bool = False,
+    disable_file_fixes: bool = False,
 ):
     preparation_plugins = select_preparation_plugins(cli_config, plugin_names)
     coverage_file_selector = select_coverage_file_finder(
@@ -60,7 +61,7 @@ def do_upload_logic(
     )
     network_finder = select_network_finder(versioning_system)
     collector = UploadCollector(
-        preparation_plugins, network_finder, coverage_file_selector
+        preparation_plugins, network_finder, coverage_file_selector, disable_file_fixes
     )
     try:
         upload_data = collector.generate_upload_data()

{codecov-cli-0.3.3 → codecov-cli-0.3.4}/codecov_cli/services/upload/upload_collector.py

@@ -29,15 +29,17 @@ class UploadCollector(object):
         preparation_plugins: typing.List[PreparationPluginInterface],
         network_finder: NetworkFinder,
         coverage_file_finder: CoverageFileFinder,
+        disable_file_fixes: bool = False,
     ):
         self.preparation_plugins = preparation_plugins
         self.network_finder = network_finder
         self.coverage_file_finder = coverage_file_finder
+        self.disable_file_fixes = disable_file_fixes
 
     def _produce_file_fixes_for_network(
         self, network: typing.List[str]
     ) -> typing.List[UploadCollectionResultFileFixer]:
-        if not network:
+        if not network or self.disable_file_fixes:
             return []
         # patterns that we don't need to specify a reason for
         empty_line_regex = re.compile(r"^\s*$")

{codecov-cli-0.3.3 → codecov-cli-0.3.4/codecov_cli.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: codecov-cli
-Version: 0.3.3
+Version: 0.3.4
 Summary: Codecov Command Line Interface
 Author: Codecov
 Author-email: support@codecov.io

{codecov-cli-0.3.3 → codecov-cli-0.3.4}/codecov_cli.egg-info/requires.txt

@@ -1,8 +1,6 @@
 click==8.*
 httpx==0.23.*
 ijson==3.*
-pytest==7.*
-pytest-cov>=3
 pyyaml==6.*
 responses==0.21.*
 smart-open==6.*

{codecov-cli-0.3.3 → codecov-cli-0.3.4}/setup.py

@@ -8,8 +8,8 @@ here = path.abspath(path.dirname(__file__))
 with open(path.join(here, "README.md"), encoding="utf-8") as f:
     long_description = f.read()
 
-with open(path.join(here, "codecov_cli/__init__.py"), encoding="utf-8") as f:
-    version = f.read().split('"')[1]
+with open(path.join(here, "VERSION"), encoding="utf-8") as f:
+    version = f.readline().strip()
 
 setup(
     name="codecov-cli",
@@ -24,8 +24,6 @@ setup(
         "click==8.*",
         "httpx==0.23.*",
         "ijson==3.*",
-        "pytest==7.*",
-        "pytest-cov>=3",
         "pyyaml==6.*",
         "responses==0.21.*",
         "smart-open==6.*",

codecov-cli-0.3.3/codecov_cli/__init__.py

@@ -1 +0,0 @@
-__version__ = "0.3.3"