Skip to content

Commit e0bb771

Browse files
committed
combine
1 parent b8653f2 commit e0bb771

File tree

6 files changed

+10
-5
lines changed

6 files changed

+10
-5
lines changed

.drone.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@ steps:
4242
- coverage run --source=pytorch_lightning -m py.test pytorch_lightning tests -v --durations=25 # --flake8
4343
- python -m py.test benchmarks pl_examples -v --maxfail=2 --durations=0 # --flake8
4444
#- cd docs; make doctest; make coverage
45+
- coverage combine
4546
- coverage report
4647
# see: https://docs.codecov.io/docs/merging-reports
4748
- codecov --token $CODECOV_TOKEN --flags=gpu,pytest --name="GPU-coverage" --env=linux --build $DRONE_BUILD_NUMBER --commit $DRONE_COMMIT

.github/workflows/ci-test-base.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,8 @@ jobs:
7575
- name: Test Package [only]
7676
run: |
7777
# NOTE: run coverage on tests does not propagare faler status for Win, https://github.com/nedbat/coveragepy/issues/1003
78-
coverage run --source=pytorch_lightning -m pytest pytorch_lightning -v --junitxml=junit/test-results-${{ runner.os }}-${{ matrix.python-version }}-${{ matrix.requires }}.xml --ignore=pytorch_lightning/loggers/comet.py --ignore=pytorch_lightning/loggers/mlflow.py --ignore=pytorch_lightning/loggers/neptune.py --ignore=pytorch_lightning/loggers/test_tube.py --ignore=pytorch_lightning/loggers/wandb.py --ignore=pytorch_lightning/metrics/sklearns.py
78+
coverage run -m pytest pytorch_lightning -v --junitxml=junit/test-results-${{ runner.os }}-${{ matrix.python-version }}-${{ matrix.requires }}.xml --ignore=pytorch_lightning/loggers/comet.py --ignore=pytorch_lightning/loggers/mlflow.py --ignore=pytorch_lightning/loggers/neptune.py --ignore=pytorch_lightning/loggers/test_tube.py --ignore=pytorch_lightning/loggers/wandb.py --ignore=pytorch_lightning/metrics/sklearns.py
79+
coverage combine
7980
8081
- name: Upload pytest test results
8182
uses: actions/upload-artifact@master

.github/workflows/ci-testing.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,8 @@ jobs:
121121
- name: Tests
122122
run: |
123123
# NOTE: do not include coverage report here, see: https://github.com/nedbat/coveragepy/issues/1003
124-
coverage run --source=pytorch_lightning -m pytest pytorch_lightning tests -v --junitxml=junit/test-results-${{ runner.os }}-${{ matrix.python-version }}-${{ matrix.requires }}.xml
124+
coverage run -m pytest pytorch_lightning tests -v --junitxml=junit/test-results-${{ runner.os }}-${{ matrix.python-version }}-${{ matrix.requires }}.xml
125+
coverage combine
125126
126127
- name: Upload pytest test results
127128
uses: actions/upload-artifact@master

.github/workflows/pt-conda.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,8 @@ jobs:
8181
conda info
8282
conda list
8383
# NOTE: run coverage on tests does not propagare faler status for Win, https://github.com/nedbat/coveragepy/issues/1003
84-
coverage run --source=pytorch_lightning -m pytest pytorch_lightning tests -v --junitxml=junit/test-results-${{ runner.os }}-${{ matrix.python-version }}-${{ matrix.requires }}.xml
84+
coverage run -m pytest pytorch_lightning tests -v --junitxml=junit/test-results-${{ runner.os }}-${{ matrix.python-version }}-${{ matrix.requires }}.xml
85+
coverage combine
8586
coverage report
8687
shell: bash -l {0}
8788

dockers/tpu-tests/tpu_test_cases.jsonnet

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,9 @@ local tputests = base.BaseTest {
2121
command: utils.scriptCommand(
2222
|||
2323
cd pytorch-lightning
24-
coverage run --source=pytorch_lightning -m pytest tests/models/test_tpu.py -v
24+
coverage run -m pytest tests/models/test_tpu.py -v
2525
test_exit_code=$?
26+
coverage combine
2627
echo "\n||| END PYTEST LOGS |||\n"
2728
coverage xml
2829
cat coverage.xml | tr -d '\t'

setup.cfg

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ junit_duration_report = call
1818

1919
[coverage:run]
2020
concurrency=multiprocessing
21-
# source=pytorch_lightning
21+
source=pytorch_lightning
2222

2323
[coverage:report]
2424
exclude_lines =

0 commit comments

Comments
 (0)