Merge pull request #4371 from radarhere/coverage

Fixed Python coverage on GitHub Actions

.ci/after_success.sh

@@ -1,19 +1,13 @@
 #!/bin/bash
 
 # gather the coverage data
-if [[ "$MATRIX_OS" == "macOS-latest" ]]; then
+pip3 install codecov
-    brew install lcov
+if [[ $MATRIX_DOCKER ]]; then
+  coverage xml --ignore-errors
 else
-    sudo apt-get -qq install lcov
+  coverage xml
 fi
 
-lcov --capture --directory . -b . --output-file coverage.info
-#  filter to remove system headers
-lcov --remove coverage.info '/usr/*' -o coverage.filtered.info
-
-pip install codecov
-coverage report
-
 if [[ $TRAVIS ]]; then
     codecov
 fi

.github/workflows/test-docker.yml

@@ -41,20 +41,25 @@ jobs:
       run: |
         # The Pillow user in the docker container is UID 1000
         sudo chown -R 1000 $GITHUB_WORKSPACE
-        docker run -v $GITHUB_WORKSPACE:/Pillow pythonpillow/${{ matrix.docker }}:${{ matrix.dockerTag }}
+        docker run --name pillow_container  -v $GITHUB_WORKSPACE:/Pillow pythonpillow/${{ matrix.docker }}:${{ matrix.dockerTag }}
         sudo chown -R runner $GITHUB_WORKSPACE
 
     - name: After success
       if: success()
       run: |
         PATH="$PATH:~/.local/bin"
+        docker start pillow_container
+        pil_path=`docker exec pillow_container /vpy3/bin/python -c 'import os, PIL;print(os.path.realpath(os.path.dirname(PIL.__file__)))'`
+        docker stop pillow_container
+        sudo mkdir -p $pil_path
+        sudo cp src/PIL/*.py $pil_path
         .ci/after_success.sh
       env:
-        COVERALLS_REPO_TOKEN: ${{ secrets.COVERALLS_REPO_TOKEN }}
+        MATRIX_DOCKER: ${{ matrix.docker }}
 
     - name: Prepare coverage token
       if: success() && github.repository == 'python-pillow/Pillow'
-      run: cp .github/codecov-upstream.yml .codecov.yml
+      run: cp .github/codecov-upstream.yml codecov.yml
 
     - name: Upload coverage
       if: success()

.github/workflows/test-windows.yml

@@ -364,15 +364,22 @@ jobs:
         name: errors
         path: Tests/errors
 
+    - name: After success
+      if: success()
+      run: |
+        .ci/after_success.sh
+      shell: pwsh
+
     - name: Prepare coverage token
       if: success() && github.repository == 'python-pillow/Pillow'
-      run: cp .github/codecov-upstream.yml .codecov.yml
+      run: cp .github/codecov-upstream.yml codecov.yml
 
     - name: Upload coverage
       if: success()
       uses: codecov/codecov-action@v1
       with:
           token: ${{ secrets.CODECOV_TOKEN }}
+          file: ./coverage.xml
           name: ${{ runner.os }} Python ${{ matrix.python-version }}
 
     - name: Build wheel

.github/workflows/test.yml

@@ -87,12 +87,10 @@ jobs:
       if: success()
       run: |
         .ci/after_success.sh
-      env:
-        MATRIX_OS: ${{ matrix.os }}
 
     - name: Prepare coverage token
       if: success() && github.repository == 'python-pillow/Pillow'
-      run: cp .github/codecov-upstream.yml .codecov.yml
+      run: cp .github/codecov-upstream.yml codecov.yml
 
     - name: Upload coverage
       if: success()

MANIFEST.in

@@ -18,10 +18,10 @@ graft docs
 # build/src control detritus
 exclude .appveyor.yml
 exclude .coveragerc
-exclude .codecov.yml
 exclude .editorconfig
 exclude .readthedocs.yml
 exclude azure-pipelines.yml
+exclude codecov.yml
 global-exclude .git*
 global-exclude *.pyc
 global-exclude *.so