From 0dc6ee70c4a11efd2f62f0480f613bc98443a273 Mon Sep 17 00:00:00 2001
From: Paul Kehrer <paul.l.kehrer@gmail.com>
Date: Sat, 30 Apr 2022 12:20:51 -0600
Subject: [PATCH 1/2] switch to doing python coverage in actions (#7154)

codecov still used for rust
---
 .coveragerc                                | 10 ++++--
 .github/actions/upload-coverage/action.yml | 15 +++++----
 .github/workflows/ci.yml                   | 37 ++++++++++++++++++++--
 3 files changed, 50 insertions(+), 12 deletions(-)

diff --git a/.coveragerc b/.coveragerc
index ef820f0d4c6e..0c3a5a0f338f 100644
--- a/.coveragerc
+++ b/.coveragerc
@@ -1,5 +1,6 @@
 [run]
 branch = True
+relative_files = True
 source =
     cryptography
     tests/
@@ -7,9 +8,12 @@ source =
 [paths]
 source =
    src/cryptography
-   .tox/*/lib*/python*/site-packages/cryptography
-   .tox\*\Lib\site-packages\cryptography
-   .tox/pypy/site-packages/cryptography
+   *.tox/*/lib*/python*/site-packages/cryptography
+   *.tox\*\Lib\site-packages\cryptography
+   *.tox/pypy/site-packages/cryptography
+tests =
+   tests/
+   *tests\
 
 [report]
 exclude_lines =
diff --git a/.github/actions/upload-coverage/action.yml b/.github/actions/upload-coverage/action.yml
index d06566da81a2..4793e62a96c1 100644
--- a/.github/actions/upload-coverage/action.yml
+++ b/.github/actions/upload-coverage/action.yml
@@ -11,10 +11,13 @@ runs:
 
   steps:
     - run: |
-        PATH="/venv/bin:${PATH}"
-        curl -o codecov.sh -f https://codecov.io/bash || \
-          curl -o codecov.sh -f https://codecov.io/bash || \
-          curl -o codecov.sh -f https://codecov.io/bash
-
-        bash codecov.sh -n "${{ inputs.name }}"
+        COVERAGE_UUID=$(python3 -c "import uuid; print(uuid.uuid4())")
+        echo "::set-output name=COVERAGE_UUID::${COVERAGE_UUID}"
+        mv .coverage .coverage.${COVERAGE_UUID}
+      id: coverage-uuid
       shell: bash
+    - uses: actions/upload-artifact@v3.0.0
+      with:
+        name: coverage-${{ steps.coverage-uuid.outputs.COVERAGE_UUID }}
+        path: ".coverage.*"
+        if-no-files-found: ignore
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 2cf48497b1db..fb53d51cafd3 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -342,6 +342,13 @@ jobs:
             sed -E -i 's/SF:src\/(.*)/SF:src\/rust\/src\/\1/g' ../../pytest-rust-cov.lcov
             sed -E -i 's/SF:src\/(.*)/SF:src\/rust\/src\/\1/g' ../../cargo-test-rust-cov.lcov
 
+      # We use codecov solely for rust coverage now, not Python
+      - run: |
+          curl -o codecov.sh -f https://codecov.io/bash || \
+            curl -o codecov.sh -f https://codecov.io/bash || \
+            curl -o codecov.sh -f https://codecov.io/bash
+          bash codecov.sh -n "Rust Coverage" -f '*.lcov' -X coveragepy
+
       - uses: ./.github/actions/upload-coverage
         with:
           name: "Rust Coverage"
@@ -575,6 +582,30 @@ jobs:
     needs: [linux, linux-distros, linux-rust, linux-rust-coverage, macos, windows, linux-downstream]
     if: ${{ always() }}
     steps:
-    - run: echo "😢"; exit 1
-      if: ${{ needs.linux.result != 'success' || needs.linux-distros.result != 'success' || needs.linux-rust.result != 'success' || needs.linux-rust-coverage.result != 'success' || needs.macos.result != 'success' || needs.windows.result != 'success' || needs.linux-downstream.result != 'success' }}
-    - run: echo "🎉"
+      - uses: actions/checkout@v2.4.0
+        timeout-minutes: 3
+        with:
+          persist-credentials: false
+      - run: echo "😢"; exit 1
+        if: ${{ needs.linux.result != 'success' || needs.linux-distros.result != 'success' || needs.linux-rust.result != 'success' || needs.linux-rust-coverage.result != 'success' || needs.macos.result != 'success' || needs.windows.result != 'success' || needs.linux-downstream.result != 'success' }}
+      - run: echo "🎉"
+      - name: Setup python
+        uses: actions/setup-python@v3.1.2
+        with:
+          python-version: '3.10'
+      - run: pip install coverage
+      - name: Download coverage data
+        uses: actions/download-artifact@v3.0.0
+      - run: mv **/.coverage* .
+      - name: Combine coverage and fail if it's <100%.
+        run: |
+          python -m coverage combine
+          python -m coverage html
+          python -m coverage report --fail-under=100
+      - name: Upload HTML report.
+        uses: actions/upload-artifact@v3.0.0
+        with:
+          name: _html-report
+          path: htmlcov
+          if-no-files-found: ignore
+        if: ${{ always() }}

From 26f8683db81604b2eb7c6a26fdfc06343e378f58 Mon Sep 17 00:00:00 2001
From: Paul Kehrer <paul.l.kehrer@gmail.com>
Date: Sat, 30 Apr 2022 13:27:41 -0600
Subject: [PATCH 2/2] update python version of downstreams for mitmproxy

---
 .github/workflows/ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index fb53d51cafd3..43da403cc4cd 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -514,7 +514,7 @@ jobs:
         RUST:
           - stable
         PYTHON:
-          - 3.8
+          - 3.9
     name: "Downstream tests for ${{ matrix.DOWNSTREAM }}"
     timeout-minutes: 15
     steps: