avoid combining all coverage files

Author: daniel-sanche

.github/workflows/unittest.yml

@@ -161,16 +161,6 @@ jobs:
           # Unzip any zipped coverage results
           find .coverage-results -type f -name '*.zip' -exec unzip -o {} \;
 
-          # Find all coverage files and combine them.
-          # We find files starting with .coverage (excluding .coveragerc files and templates)
-          coverage_files=$(find .coverage-results . -type f -name '.coverage*' ! -name '.coveragerc*')
-          if [ -n "${coverage_files}" ]; then
-            coverage combine ${coverage_files}
-          else
-            echo "Error: No coverage files found to combine."
-            exit 1
-          fi
-
           # Find all modified packages
           if [[ "${TEST_ALL_PACKAGES}" == "true" ]]; then
             modified_packages=$(ls -d packages/*/ | cut -d/ -f1,2 | sort -u)
@@ -189,25 +179,45 @@ jobs:
               done
 
               (
-                pkg_log="/tmp/coverage-logs/${pkg//\//_}.log"
-                pkg_status="/tmp/coverage-logs/${pkg//\//_}.status"
+                pkg_name_clean=$(echo "${pkg}" | sed 's|/$||' | sed 's|/|_|g')
+                pkg_log="/tmp/coverage-logs/${pkg_name_clean}.log"
+                pkg_status="/tmp/coverage-logs/${pkg_name_clean}.status"
 
                 set +e
-                pushd "${pkg}" > /dev/null
-                if [ -f ".coveragerc" ]; then
-                  echo "Using package-specific configuration: ${pkg}/.coveragerc" > "${pkg_log}"
-                  if grep -q "fail_under" ".coveragerc"; then
-                    COVERAGE_FILE=../../.coverage coverage report --rcfile=".coveragerc" --include="$PWD/**" >> "${pkg_log}" 2>&1
+                
+                # Find coverage databases belonging specifically to this package across all Python versions
+                pkg_files=$(find .coverage-results/ -type f -name ".coverage.*.${pkg_name_clean}" -o -name ".coverage.*.${pkg_name_clean}.*")
+                
+                if [ -n "${pkg_files}" ]; then
+                  # Create a dedicated temp directory for combining this package's coverage databases
+                  temp_combine_dir="/tmp/combine-${pkg_name_clean}"
+                  mkdir -p "${temp_combine_dir}"
+                  cp ${pkg_files} "${temp_combine_dir}/"
+                  
+                  pushd "${pkg}" > /dev/null
+                  
+                  # Combine only this package's databases into a local .coverage database inside the package directory
+                  COVERAGE_FILE="${PWD}/.coverage" coverage combine "${temp_combine_dir}"/.coverage.* >> "${pkg_log}" 2>&1
+                  
+                  # Generate the coverage report using the package-specific local database
+                  if [ -f ".coveragerc" ]; then
+                    echo "Using package-specific configuration: ${pkg}/.coveragerc" > "${pkg_log}"
+                    if grep -q "fail_under" ".coveragerc"; then
+                      COVERAGE_FILE="${PWD}/.coverage" coverage report --rcfile=".coveragerc" --include="$PWD/**" >> "${pkg_log}" 2>&1
+                    else
+                      echo "No fail_under specified in ${pkg}/.coveragerc, enforcing default" >> "${pkg_log}"
+                      COVERAGE_FILE="${PWD}/.coverage" coverage report --rcfile=".coveragerc" --include="$PWD/**" --fail-under="${DEFAULT_FAIL_UNDER}" >> "${pkg_log}" 2>&1
+                    fi
                   else
-                    echo "No fail_under specified in ${pkg}/.coveragerc, enforcing default" >> "${pkg_log}"
-                    COVERAGE_FILE=../../.coverage coverage report --rcfile=".coveragerc" --include="$PWD/**" --fail-under="${DEFAULT_FAIL_UNDER}" >> "${pkg_log}" 2>&1
+                    echo "No .coveragerc found for ${pkg}, enforcing default" > "${pkg_log}"
+                    COVERAGE_FILE="${PWD}/.coverage" coverage report --include="$PWD/**" --fail-under="${DEFAULT_FAIL_UNDER}" >> "${pkg_log}" 2>&1
                   fi
+                  echo $? > "${pkg_status}"
+                  popd > /dev/null
                 else
-                  echo "No .coveragerc found for ${pkg}, enforcing default" > "${pkg_log}"
-                  COVERAGE_FILE=../../.coverage coverage report --include="$PWD/**" --fail-under="${DEFAULT_FAIL_UNDER}" >> "${pkg_log}" 2>&1
+                  echo "Warning: No coverage results found for ${pkg}" > "${pkg_log}"
+                  echo 1 > "${pkg_status}"
                 fi
-                echo $? > "${pkg_status}"
-                popd > /dev/null
                 set -e
               ) &
             fi
@@ -221,8 +231,9 @@ jobs:
 
           for pkg in ${modified_packages}; do
             if [ -d "${pkg}" ]; then
-              pkg_log="/tmp/coverage-logs/${pkg//\//_}.log"
-              pkg_status="/tmp/coverage-logs/${pkg//\//_}.status"
+              pkg_name_clean=$(echo "${pkg}" | sed 's|/$||' | sed 's|/|_|g')
+              pkg_log="/tmp/coverage-logs/${pkg_name_clean}.log"
+              pkg_status="/tmp/coverage-logs/${pkg_name_clean}.status"
 
               echo "============================================================"
               echo "Evaluating coverage for package: ${pkg}"