Use multiprocessing only when dealing with ci-integration.

catalyst-cooperative · Dec 13, 2023 · 50eec4f · 50eec4f
1 parent c65426b
commit 50eec4f
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 6 deletions.
diff --git a/.github/workflows/pytest.yml b/.github/workflows/pytest.yml
@@ -177,27 +177,27 @@ jobs:
         env:
           COVERAGE_FILE: .coverage.ferc_to_sqlite
         run: |
-          coverage run \
+          coverage run --concurrency=multiprocessing \
             src/pudl/ferc_to_sqlite/cli.py --clobber ${{ env.ETL_COMMANDLINE_OPTIONS }} ${{ env.ETL_CONFIG }}
       - name: Run pudl_etl
         env:
           COVERAGE_FILE: .coverage.pudl_etl
         run: |
           alembic upgrade head
-          coverage run \
+          coverage run --concurrency=multiprocessing \
             src/pudl/etl/cli.py ${{ env.ETL_COMMANDLINE_OPTIONS }} ${{ env.ETL_CONFIG }}
       - name: Run integration tests
         env:
           COVERAGE_FILE: .coverage.pytest
         run: |
-          coverage run \
+          coverage run --concurrency=multiprocessing \
            -m pytest -n auto --live-dbs test/integration
       - name: Checksum coverage files
         run: ls .coverage* | xargs md5sum | sort
       - name: Generate coverage
         run: |
           coverage --version
-          coverage combine --append
+          coverage combine
           coverage xml
           coverage report
       - name: Upload coverage

diff --git a/Makefile b/Makefile
@@ -80,7 +80,6 @@ docs-clean:
 docs-build: docs-clean
 	doc8 docs/ README.rst
 	coverage run ${covargs} -- ${CONDA_PREFIX}/bin/sphinx-build -W -b html docs docs/_build/html
-	coverage combine
 	coverage xml
 
 ########################################################################################

diff --git a/pyproject.toml b/pyproject.toml
@@ -312,7 +312,6 @@ omit = [
     # Never hit by integration tests:
     "src/pudl/validate.py",
 ]
-concurrency = ["multiprocessing"]
 
 [tool.coverage.paths]
 # When running pudl tools installed with pip, the sources are imported