Merge branch 'main' into codecov-entrypoint

codecov · Jan 14, 2025 · 8de4357 · 8de4357
2 parents 491938c + d700630
commit 8de4357
Show file tree

Hide file tree

Showing 86 changed files with 2,379 additions and 756 deletions.
diff --git a/.github/workflows/build_assets.yml b/.github/workflows/build_assets.yml
@@ -1,3 +1,4 @@
+---
 name: Build Compiled Assets
 
 on:
@@ -18,8 +19,10 @@ jobs:
         include:
           - os: macos-latest
             TARGET: macos
+            # currently, wrapt pulls the arm64 version instead of the universal one, so the below is a hack
             CMD_REQS: >
-              mkdir -p pip-packages && cd pip-packages && pip wheel --no-cache-dir --no-binary tree_sitter,ijson,charset_normalizer,PyYAML .. && cd .. &&
+              mkdir -p pip-packages && cd pip-packages && pip wheel --no-cache-dir --no-binary tree_sitter,ijson,charset_normalizer,PyYAML .. &&
+              rm $(ls | grep wrapt) && pip download wrapt --platform=universal2 --only-binary=:all: && pip install $(ls | grep wrapt) --force-reinstall && cd .. &&
               pip install --no-deps --no-index --find-links=pip-packages pip-packages/*
             CMD_BUILD: >
               STATICCODECOV_LIB_PATH=$(find build/ -maxdepth 1 -type d -name 'lib.*' -print -quit | xargs -I {} sh -c "find {} -type f -name 'staticcodecov*' -print -quit | sed 's|^./||'") &&
@@ -31,8 +34,7 @@ jobs:
           - os: ubuntu-20.04
             TARGET: ubuntu
             CMD_REQS: >
-              pip install -r requirements.txt
-              pip install .
+              pip install -r requirements.txt && pip install .
             CMD_BUILD: >
               STATICCODECOV_LIB_PATH=$(find build/ -maxdepth 1 -type d -name 'lib.*' -print -quit | xargs -I {} sh -c "find {} -type f -name 'staticcodecov*' -print -quit | sed 's|^./||'") &&
               pyinstaller --add-binary ${STATICCODECOV_LIB_PATH}:. --copy-metadata codecov-cli --hidden-import staticcodecov_languages -F codecov_cli/main.py &&
@@ -42,8 +44,7 @@ jobs:
           - os: windows-latest
             TARGET: windows
             CMD_REQS: >
-              pip install -r requirements.txt
-              pip install .
+              pip install -r requirements.txt && pip install .
             CMD_BUILD: >
               pyinstaller --add-binary "build\lib.win-amd64-cpython-311\staticcodecov_languages.cp311-win_amd64.pyd;." --copy-metadata codecov-cli --hidden-import staticcodecov_languages -F codecov_cli\main.py &&
               Copy-Item -Path ".\dist\main.exe" -Destination ".\dist\codecovcli_windows.exe"
@@ -93,10 +94,10 @@ jobs:
           - distro: "python:3.11-alpine3.18"
             arch: x86_64
             distro_name: alpine
-          - distro: "python:3.11"
+          - distro: "python:3.11-bullseye"
             arch: arm64
             distro_name: linux
-            
+
     steps:
     - uses: actions/checkout@v4
       with:
@@ -129,6 +130,3 @@ jobs:
         asset_name: codecovcli_${{ matrix.distro_name }}_${{ matrix.arch }}
         tag: ${{ github.ref }}
         overwrite: true
-
-
-
diff --git a/.github/workflows/build_for_pypi.yml b/.github/workflows/build_for_pypi.yml
@@ -31,11 +31,11 @@ jobs:
         run: |
           pip install wheel
           python setup.py sdist bdist_wheel --plat-name=manylinux2014_x86_64
-          python setup.py bdist_wheel --plat-name=macosx-12.6-x86_64
+          python setup.py bdist_wheel --plat-name=macosx-12.6-universal2
           python setup.py bdist_wheel --plat-name=win_amd64
       - name: Publish package to PyPi
         if: inputs.publish == true
         uses: pypa/gh-action-pypi-publish@release/v1
-
-
-
+        with:
+          attestations: false
+          verbose: true
diff --git a/.github/workflows/ci-job.yml b/.github/workflows/ci-job.yml
@@ -0,0 +1,41 @@
+# This workflow will install Python dependencies, run tests and lint with a variety of Python versions
+# For more information see: https://help.github.com/actions/language-and-framework-guides/using-python-with-github-actions
+
+name: CLI CI Job
+
+on:
+  pull_request:
+  push:
+    branches:
+      - main
+
+jobs:
+  build-test-upload:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v4
+      with:
+        submodules: true
+        fetch-depth: 2
+    - name: Set up Python 3.12
+      uses: actions/setup-python@v5
+      with:
+        python-version: "3.12"
+    - name: Install dependencies
+      run: |
+        python -m pip install --upgrade pip
+        pip install -r requirements.txt
+        python -m pip install -e .
+        pip install -r tests/requirements.txt
+    - name: Test with pytest
+      run: |
+        pytest --cov --junitxml=3.12junit.xml
+
+    - name: Upload coverage to Codecov
+      uses: codecov/codecov-action@v5
+      with:
+        token: ${{ secrets.CODECOV_TOKEN }}
+        files: ./coverage.xml
+        flags: python3.12
+        fail_ci_if_error: true
+        verbose: true
diff --git a/.github/workflows/ci.yml b/.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
@@ -54,11 +48,11 @@ jobs:
       fail-fast: false
       matrix:
         include:
+          - python-version: "3.13"
           - python-version: "3.12"
           - python-version: "3.11"
           - python-version: "3.10"
           - python-version: "3.9"
-          - python-version: "3.8"
     steps:
     - uses: actions/checkout@v4
       with:
@@ -76,12 +70,18 @@ jobs:
         pip install -r tests/requirements.txt
     - name: Test with pytest
       run: |
-        pytest --cov --junitxml=junit.xml
+        pytest --cov --junitxml=${{matrix.python-version}}junit.xml
     - name: Dogfooding codecov-cli
       if: ${{ !github.event.pull_request.head.repo.fork && github.repository_owner == 'codecov' }}
       run: |
         codecovcli -v do-upload --fail-on-error -t ${{ secrets.CODECOV_TOKEN }} --plugin pycoverage --flag python${{matrix.python-version}}
         codecovcli do-upload --report-type test_results --fail-on-error -t ${{ secrets.CODECOV_TOKEN }} --plugin pycoverage --flag python${{matrix.python-version}}
+    - name: Upload artifacts for test-results-processing
+      if: ${{ !cancelled() }}
+      uses: actions/upload-artifact@v4
+      with:
+        name: ${{matrix.python-version}}junit.xml
+        path: ${{matrix.python-version}}junit.xml
 
   static-analysis:
     runs-on: ubuntu-latest
@@ -118,10 +118,12 @@ jobs:
       - uses: actions/setup-python@v5
         with:
           python-version: "3.12"
-      - name: Install CLI
+      - name: Install dependencies for Dogfooding
         run: |
-          pip install -r requirements.txt -r tests/requirements.txt
-          pip install codecov-cli
+          python -m pip install --upgrade pip
+          pip install -r requirements.txt
+          python -m pip install -e .
+          pip install -r tests/requirements.txt
       - name: Label Analysis
         run: |
           BASE_SHA=$(git merge-base HEAD^ origin/main)
@@ -131,38 +133,32 @@ jobs:
         run: |
           codecovcli --codecov-yml-path=codecov.yml do-upload --plugin pycoverage --plugin compress-pycoverage --fail-on-error -t ${{ secrets.CODECOV_TOKEN }} --flag smart-labels
 
-  test-process-test-results-cmd:
+  process-test-results:
+    if: ${{ always() }}
+    needs: build-test-upload
     runs-on: ubuntu-latest
-    permissions:
-      pull-requests: write
-    strategy:
-      fail-fast: false
-      matrix:
-        include:
-          - python-version: "3.12"
-          - python-version: "3.11"
-          - python-version: "3.10"
-          - python-version: "3.9"
-          - python-version: "3.8"
     steps:
-    - uses: actions/checkout@v4
-      with:
-        submodules: true
-        fetch-depth: 2
-    - name: Set up Python ${{matrix.python-version}}
-      uses: actions/setup-python@v5
-      with:
-        python-version: "${{matrix.python-version}}"
-    - name: Install dependencies
-      run: |
-        python -m pip install --upgrade pip
-        pip install -r requirements.txt
-        python -m pip install -e .
-        pip install -r tests/requirements.txt
-    - name: Test with pytest
-      run: |
-        pytest --cov --junitxml=junit.xml
-    - name: Dogfooding codecov-cli
-      if: ${{ !cancelled() }}
-      run: |
-        codecovcli process-test-results --provider-token ${{ secrets.GITHUB_TOKEN }}
+      - uses: actions/checkout@v4
+        with:
+          submodules: true
+          fetch-depth: 2
+      - uses: actions/setup-python@v5
+        with:
+          python-version: "3.12"
+      - name: Install dependencies for Dogfooding
+        run: |
+          python -m pip install --upgrade pip
+          pip install -r requirements.txt
+          python -m pip install -e .
+          pip install -r tests/requirements.txt
+      - name: Download all test results
+        uses: actions/download-artifact@v4
+        with:
+          pattern: "*junit.xml"
+          path: "test_results"
+          merge-multiple: true
+
+      - name: Dogfooding codecov-cli
+        if: ${{ !cancelled() && github.ref && contains(github.ref, 'pull') }}
+        run: |
+          codecovcli process-test-results --dir test_results --github-token ${{ secrets.GITHUB_TOKEN }}
diff --git a/Makefile b/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}"),)
@@ -16,4 +30,4 @@ else
 	@echo "Tagging new release ${version}"
 	git tag -a ${version} -m "Autogenerated release tag for codecov-cli"
 	git push origin ${version}
-endif
+endif
diff --git a/README.md b/README.md
@@ -240,14 +240,15 @@ are ignored by codecov (including README and configuration files)
 
 `Usage: codecovcli empty-upload [OPTIONS]`
 
-Options:
-  -C, --sha, --commit-sha TEXT    Commit SHA (with 40 chars)  [required]
-  -Z, --fail-on-error             Exit with non-zero code in case of error
-  --git-service [github|gitlab|bitbucket|github_enterprise|gitlab_enterprise|bitbucket_server]
-  -t, --token TEXT                Codecov upload token
-  -r, --slug TEXT                 owner/repo slug used instead of the private
-                                  repo token in Self-hosted
-  -h, --help                      Show this message and exit.
+|           Options            |                                        Description                                         |  usage   |
+| :--------------------------: | :----------------------------------------------------------------------------------------: | :------: |
+| -C, --sha, --commit-sha TEXT |                                 Commit SHA (with 40 chars)                                 | Required |
+|       -t, --token TEXT       |                                    Codecov upload token                                    | Required |
+|       -r, --slug TEXT        |           owner/repo slug used instead of the private repo token in Self-hosted            | Optional |
+|           --force            |                   Always emit passing checks regardless of changed files                   | Optional |
+|     -Z, --fail-on-error      |                          Exit with non-zero code in case of error                          | Optional |
+|        --git-service         | Options: github, gitlab, bitbucket, github_enterprise, gitlab_enterprise, bitbucket_server | Optional |
+|          -h, --help          |                                Show this message and exit.                                 | Optional |
 
 # How to Use Local Upload
 
@@ -282,7 +283,7 @@ The CLI can perform basic static analysis on Python code today. This static anal
 
 # Contributions
 
-This repository, like all of Codecov's repositories, strives to follow our general [Contributing guidlines](https://github.com/codecov/contributing). If you're considering making a contribution to this repository, we encourage review of our Contributing guidelines first. 
+This repository, like all of Codecov's repositories, strives to follow our general [Contributing guidelines](https://github.com/codecov/contributing). If you're considering making a contribution to this repository, we encourage review of our Contributing guidelines first. 
 
 ## Requirements
 

diff --git a/codecov_cli/commands/base_picking.py b/codecov_cli/commands/base_picking.py
@@ -4,8 +4,10 @@
 import click
 
 from codecov_cli.fallbacks import 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
+from codecov_cli.types import CommandContext
 
 logger = logging.getLogger("codecovcli")
 
@@ -45,24 +47,19 @@
 )
 @click.pass_context
 def pr_base_picking(
-    ctx,
+    ctx: CommandContext,
     base_sha: str,
     pr: typing.Optional[int],
     slug: typing.Optional[str],
     token: typing.Optional[str],
     service: typing.Optional[str],
 ):
     enterprise_url = ctx.obj.get("enterprise_url")
+    args = get_cli_args(ctx)
     logger.debug(
         "Starting base picking process",
         extra=dict(
-            extra_log_attributes=dict(
-                pr=pr,
-                slug=slug,
-                token=token,
-                service=service,
-                enterprise_url=enterprise_url,
-            )
+            extra_log_attributes=args,
         ),
     )
 
@@ -72,4 +69,4 @@ def pr_base_picking(
         )
         return
 
-    base_picking_logic(base_sha, pr, slug, token, service, enterprise_url)
+    base_picking_logic(base_sha, pr, slug, token, service, enterprise_url, args)