fix: import error (#567)

* fix: import get_cli_args in get_report_results

* chore: address linting errors

* build: use ruff for linting and run linting

this uses ruff for linting, it adds a configuration for ignoring
certain rules (F401: unused import) and excluding certain directories
(default + languages/ + samples/)

* fix: remove as _ from except statements

* build: update ci to lint with make lint

Author: joseph-sentry

.github/workflows/ci.yml

@@ -16,16 +16,10 @@ jobs:
       - uses: actions/checkout@v4
         with:
           submodules: true
-      - name: Install dependencies
+      - name: Check linting with ruff
         run: |
-          python -m pip install --upgrade pip
-          pip install black==22.3.0 isort==5.10.1
-      - name: Check linting with black
-        run: |
-          black --check codecov_cli
-      - name: Check imports order with isort
-        run: |
-          isort --check --profile=black codecov_cli -p staticcodecov_languages
+          make lint
+
 
   codecov-startup:
     runs-on: ubuntu-latest

Makefile

@@ -2,12 +2,26 @@ name ?= codecovcli
 # Semantic versioning format https://semver.org/
 tag_regex := ^v([0-9]{1,}\.){2}[0-9]{1,}([-_]\w+)?$
 
+lint.install:
+	echo "Installing ruff..."
+	pip install -Iv ruff
+
+# The preferred method (for now) w.r.t. fixable rules is to manually update the makefile
+# with --fix and re-run 'make lint.' Since ruff is constantly adding rules this is a slight
+# amount of "needed" friction imo.
+lint.run:
+	ruff check --ignore F401 --exclude languages --exclude samples
+	ruff format --exclude languages --exclude samples
+
+lint.check:
+	echo "Linting..."
+	ruff check --ignore F401 --exclude languages --exclude samples
+	echo "Formatting..."
+	ruff format --check --exclude languages --exclude samples
+
 lint:
-	pip install black==22.3.0 isort==5.10.1
-	black codecov_cli
-	isort --profile=black codecov_cli -p staticcodecov_languages
-	black tests
-	isort --profile black tests
+	make lint.install
+	make lint.run
 
 tag.release:
 ifeq ($(shell echo ${version} | egrep "${tag_regex}"),)

codecov_cli/commands/get_report_results.py

@@ -3,12 +3,14 @@
 import click
 
 from codecov_cli.fallbacks import CodecovOption, FallbackFieldEnum
+from codecov_cli.helpers.args import get_cli_args
 from codecov_cli.helpers.encoder import encode_slug
 from codecov_cli.helpers.git import GitService
 from codecov_cli.helpers.options import global_options
 from codecov_cli.services.report import send_reports_result_get_request
 from codecov_cli.types import CommandContext
 
+
 logger = logging.getLogger("codecovcli")
 
 

codecov_cli/commands/labelanalysis.py

@@ -390,12 +390,12 @@ def _dry_run_list_output(
         logger.warning(f"label-analysis didn't run correctly. Error: {fallback_reason}")
 
     to_run_line = " ".join(
-        sorted(map(lambda l: f"'{l}'", runner_options))
-        + sorted(map(lambda l: f"'{l}'", labels_to_run))
+        sorted(map(lambda option: f"'{option}'", runner_options))
+        + sorted(map(lambda label: f"'{label}'", labels_to_run))
     )
     to_skip_line = " ".join(
-        sorted(map(lambda l: f"'{l}'", runner_options))
-        + sorted(map(lambda l: f"'{l}'", labels_to_skip))
+        sorted(map(lambda option: f"'{option}'", runner_options))
+        + sorted(map(lambda label: f"'{label}'", labels_to_skip))
     )
     # ⚠️ DON'T use logger
     # logger goes to stderr, we want it in stdout

codecov_cli/commands/process_test_results.py

@@ -103,9 +103,9 @@ def process_test_results(
         dir, exclude_folders, files, disable_search, report_type="test_results"
     )
 
-    upload_collection_results: List[
-        UploadCollectionResultFile
-    ] = file_finder.find_files()
+    upload_collection_results: List[UploadCollectionResultFile] = (
+        file_finder.find_files()
+    )
     if len(upload_collection_results) == 0:
         raise click.ClickException(
             "No JUnit XML files were found. Make sure to specify them using the --file option."

codecov_cli/helpers/args.py

@@ -20,12 +20,12 @@ def get_cli_args(ctx: click.Context):
     filtered_args = {}
     for k in args.keys():
         try:
-            if type(args[k]) == PosixPath:
+            if isinstance(args[k], PosixPath):
                 filtered_args[k] = str(args[k])
             else:
                 json.dumps(args[k])
                 filtered_args[k] = args[k]
-        except Exception as e:
+        except Exception:
             continue
 
     return filtered_args

codecov_cli/helpers/request.py

@@ -52,8 +52,7 @@ def backoff_time(curr_retry):
     return 2 ** (curr_retry - 1)
 
 
-class RetryException(Exception):
-    ...
+class RetryException(Exception): ...
 
 
 def retry_request(func):
@@ -73,7 +72,7 @@ def wrapper(*args, **kwargs):
                 requests.exceptions.ConnectionError,
                 requests.exceptions.Timeout,
                 RetryException,
-            ) as exp:
+            ):
                 logger.warning(
                     "Request failed. Retrying",
                     extra=dict(extra_log_attributes=dict(retry=retry)),

codecov_cli/plugins/pycoverage.py

@@ -54,7 +54,6 @@ def __init__(self, config: dict):
         self.config = PycoverageConfig(config)
 
     def run_preparation(self, collector) -> PreparationPluginReturn:
-
         if shutil.which("coverage") is None:
             logger.warning("coverage.py is not installed or can't be found.")
             return

codecov_cli/runners/dan_runner.py

@@ -54,7 +54,7 @@ def process_labelanalysis_result(self, result: LabelAnalysisRequestResult):
                 "DAN runner missing 'process_labelanalysis_result_command' configuration value"
             )
         command_list = []
-        if type(command) == list:
+        if isinstance(command, list):
             command_list.extend(command)
         else:
             command_list.append(command)

codecov_cli/runners/pytest_standard_runner.py

@@ -57,7 +57,6 @@ def get_available_params(cls) -> List[str]:
 
 
 class PytestStandardRunner(LabelAnalysisRunnerInterface):
-
     dry_run_runner_options = ["--cov-context=test"]
     params: PytestStandardRunnerConfigParams