Use local dir for build_temp if coverage enabled

ianthomas23 · ianthomas23 · commit bdfd2ff04302 · 2022-10-09T17:11:03.000+01:00
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -155,7 +155,7 @@ jobs:
         run: |
           # Upgrade pip and setuptools and wheel to get as clean an install as
           # possible.
-          python -m pip install --upgrade pip 'setuptools<64' wheel
+          python -m pip install --upgrade pip setuptools wheel
 
           # Install dependencies from PyPI.
           python -m pip install --upgrade $PRE \
@@ -224,9 +224,8 @@ jobs:
           git describe
 
           # Set flag in a delayed manner to avoid issues with installing other
-          # packages. Only enabling coverage on minimum versions run as both
-          # need building using --no-build-isolation.
-          if [[ "${{ matrix.name-suffix }}" == '(Minimum Versions)' ]]; then
+          # packages
+          if [[ "${{ runner.os }}" != 'macOS' ]]; then
             if [[ "$(lsb_release -r -s)" == "20.04" ]]; then
               export CPPFLAGS='--coverage -fprofile-abs-path'
             else
@@ -241,15 +240,15 @@ jobs:
 
           cat mplsetup.cfg
 
-          # All dependencies must have been pre-installed, so that the minver
-          # constraints are held.
           if [[ "${{ matrix.name-suffix }}" == '(Minimum Versions)' ]]; then
+            # Minimum versions run does not use build isolation so that it
+            # builds against the pre-installed minver dependencies.
             python -m pip install --no-deps --no-build-isolation -ve .
           else
             python -m pip install --no-deps -ve .
           fi
 
-          if [[ "${{ matrix.name-suffix }}" == '(Minimum Versions)' ]]; then
+          if [[ "${{ runner.os }}" != 'macOS' ]]; then
             unset CPPFLAGS
           fi
 
@@ -271,7 +270,7 @@ jobs:
             --extract coverage.info $PWD/src/'*' $PWD/lib/'*'
           lcov --list coverage.info
           find . -name '*.gc*' -delete
-        if: ${{ matrix.name-suffix == '(Minimum Versions)' }}
+        if: ${{ runner.os != 'macOS' }}
       - name: Upload code coverage
         uses: codecov/codecov-action@v3
 
diff --git a/setup.py b/setup.py
@@ -70,6 +70,12 @@ def has_flag(self, flagname):
 
 class BuildExtraLibraries(setuptools.command.build_ext.build_ext):
     def finalize_options(self):
+        # If coverage is enabled then need to keep the .o and .gcno files in a
+        # non-temporary directory otherwise coverage info is not collected.
+        cppflags = os.getenv('CPPFLAGS')
+        if cppflags and '--coverage' in cppflags:
+            self.build_temp = 'build'
+
         self.distribution.ext_modules[:] = [
             ext
             for package in good_packages
