diff --git a/.circleci/config.yml b/.circleci/config.yml index 3bf72c3a6d..2cbddf2e3c 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -424,12 +424,10 @@ jobs: - run: name: Run tests command: .circleci/unittest/linux/scripts/run_test.sh - - run: - name: Post process - command: .circleci/unittest/linux/scripts/post_process.sh - store_test_results: path: test-results - + - store_artifacts: + path: test/htmlcov unittest_linux_gpu: <<: *binary_common machine: @@ -456,11 +454,10 @@ jobs: - run: name: Run tests command: docker run -t --gpus all -v $PWD:$PWD -w $PWD "${image_name}" .circleci/unittest/linux/scripts/run_test.sh - - run: - name: Post Process - command: docker run -t --gpus all -v $PWD:$PWD -w $PWD "${image_name}" .circleci/unittest/linux/scripts/post_process.sh - store_test_results: path: test-results + - store_artifacts: + path: test/htmlcov unittest_windows_cpu: <<: *binary_common @@ -479,11 +476,10 @@ jobs: - run: name: Run tests command: .circleci/unittest/windows/scripts/run_test.sh - - run: - name: Post process - command: .circleci/unittest/windows/scripts/post_process.sh - store_test_results: path: test-results + - store_artifacts: + path: test/htmlcov unittest_windows_gpu: <<: *binary_common @@ -505,11 +501,10 @@ jobs: - run: name: Run tests command: .circleci/unittest/windows/scripts/run_test.sh - - run: - name: Post process - command: .circleci/unittest/windows/scripts/post_process.sh - store_test_results: path: test-results + - store_artifacts: + path: test/htmlcov unittest_macos_cpu: <<: *binary_common @@ -532,11 +527,10 @@ jobs: - run: name: Run tests command: .circleci/unittest/linux/scripts/run_test.sh - - run: - name: Post process - command: .circleci/unittest/linux/scripts/post_process.sh - store_test_results: path: test-results + - store_artifacts: + path: test/htmlcov stylecheck: <<: *binary_common diff --git a/.circleci/config.yml.in b/.circleci/config.yml.in index 8e01b1da56..f15767041e 100644 --- a/.circleci/config.yml.in +++ b/.circleci/config.yml.in @@ -424,12 +424,10 @@ jobs: - run: name: Run tests command: .circleci/unittest/linux/scripts/run_test.sh - - run: - name: Post process - command: .circleci/unittest/linux/scripts/post_process.sh - store_test_results: path: test-results - + - store_artifacts: + path: test/htmlcov unittest_linux_gpu: <<: *binary_common machine: @@ -456,11 +454,10 @@ jobs: - run: name: Run tests command: docker run -t --gpus all -v $PWD:$PWD -w $PWD "${image_name}" .circleci/unittest/linux/scripts/run_test.sh - - run: - name: Post Process - command: docker run -t --gpus all -v $PWD:$PWD -w $PWD "${image_name}" .circleci/unittest/linux/scripts/post_process.sh - store_test_results: path: test-results + - store_artifacts: + path: test/htmlcov unittest_windows_cpu: <<: *binary_common @@ -479,11 +476,10 @@ jobs: - run: name: Run tests command: .circleci/unittest/windows/scripts/run_test.sh - - run: - name: Post process - command: .circleci/unittest/windows/scripts/post_process.sh - store_test_results: path: test-results + - store_artifacts: + path: test/htmlcov unittest_windows_gpu: <<: *binary_common @@ -505,11 +501,10 @@ jobs: - run: name: Run tests command: .circleci/unittest/windows/scripts/run_test.sh - - run: - name: Post process - command: .circleci/unittest/windows/scripts/post_process.sh - store_test_results: path: test-results + - store_artifacts: + path: test/htmlcov unittest_macos_cpu: <<: *binary_common @@ -532,11 +527,10 @@ jobs: - run: name: Run tests command: .circleci/unittest/linux/scripts/run_test.sh - - run: - name: Post process - command: .circleci/unittest/linux/scripts/post_process.sh - store_test_results: path: test-results + - store_artifacts: + path: test/htmlcov stylecheck: <<: *binary_common diff --git a/.circleci/unittest/linux/scripts/install.sh b/.circleci/unittest/linux/scripts/install.sh index 5638a28850..3b0cd4bc4c 100755 --- a/.circleci/unittest/linux/scripts/install.sh +++ b/.circleci/unittest/linux/scripts/install.sh @@ -56,5 +56,5 @@ fi ( set -x conda install -y -c conda-forge ${NUMBA_DEV_CHANNEL} 'librosa>=0.8.0' parameterized 'requests>=2.20' - pip install kaldi-io SoundFile codecov pytest pytest-cov scipy + pip install kaldi-io SoundFile coverage pytest pytest-cov scipy ) diff --git a/.circleci/unittest/linux/scripts/post_process.sh b/.circleci/unittest/linux/scripts/post_process.sh deleted file mode 100755 index a84a0dea55..0000000000 --- a/.circleci/unittest/linux/scripts/post_process.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/usr/bin/env bash - -set -e - -eval "$(./conda/bin/conda shell.bash hook)" -conda activate ./env - -codecov diff --git a/.circleci/unittest/linux/scripts/run_test.sh b/.circleci/unittest/linux/scripts/run_test.sh index e083743630..4e8d24748b 100755 --- a/.circleci/unittest/linux/scripts/run_test.sh +++ b/.circleci/unittest/linux/scripts/run_test.sh @@ -24,3 +24,4 @@ declare -a args=( cd test pytest "${args[@]}" torchaudio_unittest +coverage html diff --git a/.circleci/unittest/windows/scripts/install.sh b/.circleci/unittest/windows/scripts/install.sh index be0c890614..9ed4f203ad 100644 --- a/.circleci/unittest/windows/scripts/install.sh +++ b/.circleci/unittest/windows/scripts/install.sh @@ -44,5 +44,5 @@ fi ( set -x conda install -y -c conda-forge ${NUMBA_DEV_CHANNEL} 'librosa>=0.8.0' parameterized 'requests>=2.20' - pip install kaldi-io SoundFile codecov pytest pytest-cov scipy + pip install kaldi-io SoundFile coverage pytest pytest-cov scipy ) diff --git a/.circleci/unittest/windows/scripts/post_process.sh b/.circleci/unittest/windows/scripts/post_process.sh deleted file mode 100644 index b132113194..0000000000 --- a/.circleci/unittest/windows/scripts/post_process.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/usr/bin/env bash - -set -e - -eval "$(./conda/Scripts/conda.exe 'shell.bash' 'hook')" -conda activate ./env - -codecov diff --git a/.circleci/unittest/windows/scripts/run_test.sh b/.circleci/unittest/windows/scripts/run_test.sh index 7fdd1d4c6d..c6e7ffd37f 100644 --- a/.circleci/unittest/windows/scripts/run_test.sh +++ b/.circleci/unittest/windows/scripts/run_test.sh @@ -8,3 +8,4 @@ conda activate ./env python -m torch.utils.collect_env cd test pytest --cov=torchaudio --junitxml=../test-results/junit.xml -v --durations 20 torchaudio_unittest +coverage html