From ec0479b24f295b3e39ab336238759fca19df9337 Mon Sep 17 00:00:00 2001 From: Marco Gorelli Date: Fri, 12 Mar 2021 10:14:34 +0000 Subject: [PATCH 01/36] upload coverage --- .github/workflows/database.yml | 1 - ci/run_tests.sh | 10 +++++----- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/.github/workflows/database.yml b/.github/workflows/database.yml index b34373b82af1a..d353076941ddd 100644 --- a/.github/workflows/database.yml +++ b/.github/workflows/database.yml @@ -101,7 +101,6 @@ jobs: env: ENV_FILE: ci/deps/actions-37-cov.yaml PANDAS_TESTING_MODE: deprecate - COVERAGE: true services: mysql: diff --git a/ci/run_tests.sh b/ci/run_tests.sh index 593939431d5eb..435f2242a595b 100755 --- a/ci/run_tests.sh +++ b/ci/run_tests.sh @@ -9,10 +9,10 @@ if [[ "not network" == *"$PATTERN"* ]]; then export http_proxy=http://1.2.3.4 https_proxy=http://1.2.3.4; fi -if [ "$COVERAGE" ]; then - COVERAGE_FNAME="/tmp/test_coverage.xml" - COVERAGE="-s --cov=pandas --cov-report=xml:$COVERAGE_FNAME" -fi +# Always calculate and upload coverage, as coverage reports are merged by Codecov +# https://docs.codecov.io/docs/merging-reports +COVERAGE_FNAME="/tmp/test_coverage.xml" +COVERAGE="-s --cov=pandas --cov-report=xml:$COVERAGE_FNAME" # If no X server is found, we use xvfb to emulate it if [[ $(uname) == "Linux" && -z $DISPLAY ]]; then @@ -31,7 +31,7 @@ fi echo $PYTEST_CMD sh -c "$PYTEST_CMD" -if [[ "$COVERAGE" && $? == 0 && "$TRAVIS_BRANCH" == "master" ]]; then +if [[ $? == 0 ]]; then echo "uploading coverage" echo "bash <(curl -s https://codecov.io/bash) -Z -c -f $COVERAGE_FNAME" bash <(curl -s https://codecov.io/bash) -Z -c -f $COVERAGE_FNAME From 339ffe45b12b95d325b270ab6a745e80f9ea0a09 Mon Sep 17 00:00:00 2001 From: Marco Gorelli Date: Fri, 12 Mar 2021 10:32:57 +0000 Subject: [PATCH 02/36] add pytest-cov --- ci/deps/actions-37-cov.yaml | 1 + ci/deps/actions-37-locale.yaml | 1 + ci/deps/azure-37-locale_slow.yaml | 1 + ci/deps/azure-37-minimum_versions.yaml | 1 + ci/deps/azure-37-slow.yaml | 1 + ci/deps/azure-37.yaml | 1 + ci/deps/azure-38-locale.yaml | 1 + ci/deps/azure-38-numpydev.yaml | 1 + ci/deps/azure-38-slow.yaml | 1 + ci/deps/azure-38.yaml | 1 + ci/deps/azure-39.yaml | 1 + ci/deps/azure-macos-37.yaml | 1 + ci/deps/azure-windows-37.yaml | 1 + ci/deps/azure-windows-38.yaml | 1 + ci/deps/travis-37-arm64.yaml | 1 + 15 files changed, 15 insertions(+) diff --git a/ci/deps/actions-37-cov.yaml b/ci/deps/actions-37-cov.yaml index 5381caaa242cf..ec057ee2d2f84 100644 --- a/ci/deps/actions-37-cov.yaml +++ b/ci/deps/actions-37-cov.yaml @@ -7,6 +7,7 @@ dependencies: # tools - cython>=0.29.21 - pytest>=5.0.1 + - pytest-cov - pytest-xdist>=1.21 - hypothesis>=3.58.0 - pytest-cov>=2.10.1 # this is only needed in the coverage build, ref: GH 35737 diff --git a/ci/deps/actions-37-locale.yaml b/ci/deps/actions-37-locale.yaml index 551308f1d5fac..1d3794576220a 100644 --- a/ci/deps/actions-37-locale.yaml +++ b/ci/deps/actions-37-locale.yaml @@ -7,6 +7,7 @@ dependencies: # tools - cython>=0.29.21 - pytest>=5.0.1 + - pytest-cov - pytest-xdist>=1.21 - hypothesis>=3.58.0 diff --git a/ci/deps/azure-37-locale_slow.yaml b/ci/deps/azure-37-locale_slow.yaml index 0c47b1a72774f..82a8a9f0ae492 100644 --- a/ci/deps/azure-37-locale_slow.yaml +++ b/ci/deps/azure-37-locale_slow.yaml @@ -8,6 +8,7 @@ dependencies: # tools - cython>=0.29.21 - pytest>=5.0.1 + - pytest-cov - pytest-xdist>=1.21 - hypothesis>=3.58.0 - pytest-azurepipelines diff --git a/ci/deps/azure-37-minimum_versions.yaml b/ci/deps/azure-37-minimum_versions.yaml index 9cc158b76cd41..16e34f2812f42 100644 --- a/ci/deps/azure-37-minimum_versions.yaml +++ b/ci/deps/azure-37-minimum_versions.yaml @@ -7,6 +7,7 @@ dependencies: # tools - cython=0.29.21 - pytest=5.0.1 + - pytest-cov - pytest-xdist>=1.21 - hypothesis>=3.58.0 - pytest-azurepipelines diff --git a/ci/deps/azure-37-slow.yaml b/ci/deps/azure-37-slow.yaml index 5d097e397992c..fcacdaf632766 100644 --- a/ci/deps/azure-37-slow.yaml +++ b/ci/deps/azure-37-slow.yaml @@ -8,6 +8,7 @@ dependencies: # tools - cython>=0.29.21 - pytest>=5.0.1 + - pytest-cov - pytest-xdist>=1.21 - hypothesis>=3.58.0 - pytest-azurepipelines diff --git a/ci/deps/azure-37.yaml b/ci/deps/azure-37.yaml index 4fe3de161960c..58239bb83b984 100644 --- a/ci/deps/azure-37.yaml +++ b/ci/deps/azure-37.yaml @@ -8,6 +8,7 @@ dependencies: # tools - cython>=0.29.21 - pytest>=5.0.1 + - pytest-cov - pytest-xdist>=1.21 - hypothesis>=3.58.0 - pytest-azurepipelines diff --git a/ci/deps/azure-38-locale.yaml b/ci/deps/azure-38-locale.yaml index 26297a3066fa5..f39197ad256d6 100644 --- a/ci/deps/azure-38-locale.yaml +++ b/ci/deps/azure-38-locale.yaml @@ -7,6 +7,7 @@ dependencies: # tools - cython>=0.29.21 - pytest>=5.0.1 + - pytest-cov - pytest-xdist>=1.21 - pytest-asyncio>=0.12.0 - hypothesis>=3.58.0 diff --git a/ci/deps/azure-38-numpydev.yaml b/ci/deps/azure-38-numpydev.yaml index f11a3bcb28ab2..88ecd91eaf78c 100644 --- a/ci/deps/azure-38-numpydev.yaml +++ b/ci/deps/azure-38-numpydev.yaml @@ -6,6 +6,7 @@ dependencies: # tools - pytest>=5.0.1 + - pytest-cov - pytest-xdist>=1.21 - hypothesis>=3.58.0 - pytest-azurepipelines diff --git a/ci/deps/azure-38-slow.yaml b/ci/deps/azure-38-slow.yaml index 0a4107917f01a..2106f48755560 100644 --- a/ci/deps/azure-38-slow.yaml +++ b/ci/deps/azure-38-slow.yaml @@ -7,6 +7,7 @@ dependencies: # tools - cython>=0.29.21 - pytest>=5.0.1 + - pytest-cov - pytest-xdist>=1.21 - hypothesis>=3.58.0 diff --git a/ci/deps/azure-38.yaml b/ci/deps/azure-38.yaml index 89e8d28a139b7..0eb599d4a3547 100644 --- a/ci/deps/azure-38.yaml +++ b/ci/deps/azure-38.yaml @@ -8,6 +8,7 @@ dependencies: # tools - cython>=0.29.21 - pytest>=5.0.1 + - pytest-cov - pytest-xdist>=1.21 - hypothesis>=3.58.0 - pytest-azurepipelines diff --git a/ci/deps/azure-39.yaml b/ci/deps/azure-39.yaml index c4c84e73fa684..fa49641914fdc 100644 --- a/ci/deps/azure-39.yaml +++ b/ci/deps/azure-39.yaml @@ -7,6 +7,7 @@ dependencies: # tools - cython>=0.29.21 - pytest>=5.0.1 + - pytest-cov - pytest-xdist>=1.21 - hypothesis>=3.58.0 - pytest-azurepipelines diff --git a/ci/deps/azure-macos-37.yaml b/ci/deps/azure-macos-37.yaml index d667adddda859..ea7eaa20fe85e 100644 --- a/ci/deps/azure-macos-37.yaml +++ b/ci/deps/azure-macos-37.yaml @@ -6,6 +6,7 @@ dependencies: # tools - pytest>=5.0.1 + - pytest-cov - pytest-xdist>=1.21 - hypothesis>=3.58.0 - pytest-azurepipelines diff --git a/ci/deps/azure-windows-37.yaml b/ci/deps/azure-windows-37.yaml index e7ac4c783b855..cf3028dac5753 100644 --- a/ci/deps/azure-windows-37.yaml +++ b/ci/deps/azure-windows-37.yaml @@ -8,6 +8,7 @@ dependencies: # tools - cython>=0.29.21 - pytest>=5.0.1 + - pytest-cov - pytest-xdist>=1.21 - hypothesis>=3.58.0 - pytest-azurepipelines diff --git a/ci/deps/azure-windows-38.yaml b/ci/deps/azure-windows-38.yaml index 661d8813d32d2..3cd2168dad736 100644 --- a/ci/deps/azure-windows-38.yaml +++ b/ci/deps/azure-windows-38.yaml @@ -8,6 +8,7 @@ dependencies: # tools - cython>=0.29.21 - pytest>=5.0.1 + - pytest-cov - pytest-xdist>=1.21 - hypothesis>=3.58.0 - pytest-azurepipelines diff --git a/ci/deps/travis-37-arm64.yaml b/ci/deps/travis-37-arm64.yaml index 8df6104f43a50..404c752749776 100644 --- a/ci/deps/travis-37-arm64.yaml +++ b/ci/deps/travis-37-arm64.yaml @@ -7,6 +7,7 @@ dependencies: # tools - cython>=0.29.21 - pytest>=5.0.1 + - pytest-cov - pytest-xdist>=1.21 - hypothesis>=3.58.0 From e1e973ed62b5e62ccdaff0e9399ddf2ce3def9bb Mon Sep 17 00:00:00 2001 From: Marco Gorelli Date: Fri, 12 Mar 2021 11:11:37 +0000 Subject: [PATCH 03/36] debug coverage --- .github/workflows/database.yml | 2 +- ci/run_tests.sh | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/database.yml b/.github/workflows/database.yml index d353076941ddd..2c947644fab1b 100644 --- a/.github/workflows/database.yml +++ b/.github/workflows/database.yml @@ -173,7 +173,7 @@ jobs: - name: Upload coverage to Codecov uses: codecov/codecov-action@v1 with: - files: /tmp/test_coverage.xml + files: coverage.xml flags: unittests name: codecov-pandas fail_ci_if_error: true diff --git a/ci/run_tests.sh b/ci/run_tests.sh index 435f2242a595b..8c8fc9ff4b227 100755 --- a/ci/run_tests.sh +++ b/ci/run_tests.sh @@ -11,8 +11,8 @@ fi # Always calculate and upload coverage, as coverage reports are merged by Codecov # https://docs.codecov.io/docs/merging-reports -COVERAGE_FNAME="/tmp/test_coverage.xml" -COVERAGE="-s --cov=pandas --cov-report=xml:$COVERAGE_FNAME" +COVERAGE_FNAME="coverage.xml" +COVERAGE="-s --cov=pandas.io.formats.info --cov-report=xml:$COVERAGE_FNAME" # If no X server is found, we use xvfb to emulate it if [[ $(uname) == "Linux" && -z $DISPLAY ]]; then @@ -20,7 +20,7 @@ if [[ $(uname) == "Linux" && -z $DISPLAY ]]; then XVFB="xvfb-run " fi -PYTEST_CMD="${XVFB}pytest -m \"$PATTERN\" -n $PYTEST_WORKERS --dist=loadfile -s --strict-markers --durations=30 --junitxml=test-data.xml $TEST_ARGS $COVERAGE pandas" +PYTEST_CMD="${XVFB}pytest -m \"$PATTERN\" -n $PYTEST_WORKERS --dist=loadfile -s --strict-markers --durations=30 --junitxml=test-data.xml $TEST_ARGS $COVERAGE pandas/tests/io/formats/test_info.py" if [[ $(uname) != "Linux" && $(uname) != "Darwin" ]]; then # GH#37455 windows py38 build appears to be running out of memory From 3669e8588c5f230d4e771a166d469c11ff3be557 Mon Sep 17 00:00:00 2001 From: Marco Gorelli Date: Fri, 12 Mar 2021 11:27:42 +0000 Subject: [PATCH 04/36] cobertura --- ci/azure/posix.yml | 7 +++++++ ci/run_tests.sh | 5 ++--- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/ci/azure/posix.yml b/ci/azure/posix.yml index 4cb4eaf95f6f5..7ecfba8599426 100644 --- a/ci/azure/posix.yml +++ b/ci/azure/posix.yml @@ -105,3 +105,10 @@ jobs: source activate pandas-dev python ci/print_skipped.py displayName: 'Print skipped tests' + + - task: PublishCodeCoverageResults@1 + displayName: ‘Publish Cobertura Coverage Report’ + inputs: + codeCoverageTool: Cobertura + summaryFileLocation: ‘$(System.DefaultWorkingDirectory)/**/coverage.xml’ + reportDirectory: ‘$(System.DefaultWorkingDirectory)/**/htmlcov’ diff --git a/ci/run_tests.sh b/ci/run_tests.sh index 8c8fc9ff4b227..105240b19cfa4 100755 --- a/ci/run_tests.sh +++ b/ci/run_tests.sh @@ -11,8 +11,7 @@ fi # Always calculate and upload coverage, as coverage reports are merged by Codecov # https://docs.codecov.io/docs/merging-reports -COVERAGE_FNAME="coverage.xml" -COVERAGE="-s --cov=pandas.io.formats.info --cov-report=xml:$COVERAGE_FNAME" +COVERAGE="-s --cov=pandas.io.formats.info --junitxml=junit/test-results.xml --cov-report=xml --cov-report=html" # If no X server is found, we use xvfb to emulate it if [[ $(uname) == "Linux" && -z $DISPLAY ]]; then @@ -20,7 +19,7 @@ if [[ $(uname) == "Linux" && -z $DISPLAY ]]; then XVFB="xvfb-run " fi -PYTEST_CMD="${XVFB}pytest -m \"$PATTERN\" -n $PYTEST_WORKERS --dist=loadfile -s --strict-markers --durations=30 --junitxml=test-data.xml $TEST_ARGS $COVERAGE pandas/tests/io/formats/test_info.py" +PYTEST_CMD="${XVFB}pytest -m \"$PATTERN\" -n $PYTEST_WORKERS --dist=loadfile -s --strict-markers --durations=30 --junitxml=test-data.xml $COVERAGE pandas/tests/io/formats/test_info.py" if [[ $(uname) != "Linux" && $(uname) != "Darwin" ]]; then # GH#37455 windows py38 build appears to be running out of memory From 630722b0e7663c472677ef7d41686744044e3843 Mon Sep 17 00:00:00 2001 From: Marco Gorelli Date: Fri, 12 Mar 2021 11:37:01 +0000 Subject: [PATCH 05/36] indent --- ci/azure/posix.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ci/azure/posix.yml b/ci/azure/posix.yml index 7ecfba8599426..6f53edb72afd3 100644 --- a/ci/azure/posix.yml +++ b/ci/azure/posix.yml @@ -109,6 +109,6 @@ jobs: - task: PublishCodeCoverageResults@1 displayName: ‘Publish Cobertura Coverage Report’ inputs: - codeCoverageTool: Cobertura - summaryFileLocation: ‘$(System.DefaultWorkingDirectory)/**/coverage.xml’ - reportDirectory: ‘$(System.DefaultWorkingDirectory)/**/htmlcov’ + codeCoverageTool: Cobertura + summaryFileLocation: ‘$(System.DefaultWorkingDirectory)/**/coverage.xml’ + reportDirectory: ‘$(System.DefaultWorkingDirectory)/**/htmlcov’ From 8df6f80b70f45ded646af07988e50eebe4fa9008 Mon Sep 17 00:00:00 2001 From: Marco Gorelli Date: Fri, 12 Mar 2021 12:40:17 +0000 Subject: [PATCH 06/36] wip --- ci/run_tests.sh | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/ci/run_tests.sh b/ci/run_tests.sh index 105240b19cfa4..0cf7f94b2f910 100755 --- a/ci/run_tests.sh +++ b/ci/run_tests.sh @@ -11,7 +11,7 @@ fi # Always calculate and upload coverage, as coverage reports are merged by Codecov # https://docs.codecov.io/docs/merging-reports -COVERAGE="-s --cov=pandas.io.formats.info --junitxml=junit/test-results.xml --cov-report=xml --cov-report=html" +COVERAGE="--cov=pandas.io.formats.info --junitxml=junit/test-results.xml --cov-report=xml --cov-report=html" # If no X server is found, we use xvfb to emulate it if [[ $(uname) == "Linux" && -z $DISPLAY ]]; then @@ -19,7 +19,7 @@ if [[ $(uname) == "Linux" && -z $DISPLAY ]]; then XVFB="xvfb-run " fi -PYTEST_CMD="${XVFB}pytest -m \"$PATTERN\" -n $PYTEST_WORKERS --dist=loadfile -s --strict-markers --durations=30 --junitxml=test-data.xml $COVERAGE pandas/tests/io/formats/test_info.py" +PYTEST_CMD="${XVFB}pytest -m \"$PATTERN\" -n $PYTEST_WORKERS --dist=loadfile -s --strict-markers --durations=30 $COVERAGE pandas/tests/io/formats/test_info.py" if [[ $(uname) != "Linux" && $(uname) != "Darwin" ]]; then # GH#37455 windows py38 build appears to be running out of memory @@ -29,9 +29,3 @@ fi echo $PYTEST_CMD sh -c "$PYTEST_CMD" - -if [[ $? == 0 ]]; then - echo "uploading coverage" - echo "bash <(curl -s https://codecov.io/bash) -Z -c -f $COVERAGE_FNAME" - bash <(curl -s https://codecov.io/bash) -Z -c -f $COVERAGE_FNAME -fi From 95623e45a1c564d2daa0359cd6ef1c8ad4827001 Mon Sep 17 00:00:00 2001 From: Marco Gorelli Date: Fri, 12 Mar 2021 13:47:28 +0000 Subject: [PATCH 07/36] use correct path in print_skipped.py --- ci/print_skipped.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/print_skipped.py b/ci/print_skipped.py index 60e2f047235e6..3bb9aeeb256b0 100755 --- a/ci/print_skipped.py +++ b/ci/print_skipped.py @@ -27,7 +27,7 @@ def main(filename): if __name__ == "__main__": print("SKIPPED TESTS:") i = 1 - for test_data in main("test-data.xml"): + for test_data in main("junit/test-results.xml"): if test_data is None: print("-" * 80) else: From 7ea05a051ebd1021cfeab295927c81778c0f11ea Mon Sep 17 00:00:00 2001 From: Marco Gorelli Date: Fri, 12 Mar 2021 14:07:27 +0000 Subject: [PATCH 08/36] full run --- .github/workflows/database.yml | 6 +++--- ci/azure/posix.yml | 2 +- ci/azure/windows.yml | 2 +- ci/run_tests.sh | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/database.yml b/.github/workflows/database.yml index 2c947644fab1b..0f3195b95c528 100644 --- a/.github/workflows/database.yml +++ b/.github/workflows/database.yml @@ -86,7 +86,7 @@ jobs: uses: actions/upload-artifact@master with: name: Test results - path: test-data.xml + path: junit/test-results.xml if: failure() - name: Print skipped tests @@ -164,7 +164,7 @@ jobs: uses: actions/upload-artifact@master with: name: Test results - path: test-data.xml + path: junit/test-results.xml if: failure() - name: Print skipped tests @@ -173,7 +173,7 @@ jobs: - name: Upload coverage to Codecov uses: codecov/codecov-action@v1 with: - files: coverage.xml + files: junit/test-results.xml flags: unittests name: codecov-pandas fail_ci_if_error: true diff --git a/ci/azure/posix.yml b/ci/azure/posix.yml index 6f53edb72afd3..01030934203d3 100644 --- a/ci/azure/posix.yml +++ b/ci/azure/posix.yml @@ -97,7 +97,7 @@ jobs: condition: succeededOrFailed() inputs: failTaskOnFailedTests: true - testResultsFiles: 'test-data.xml' + testResultsFiles: 'junit/test-results.xml' testRunTitle: ${{ format('{0}-$(CONDA_PY)', parameters.name) }} displayName: 'Publish test results' diff --git a/ci/azure/windows.yml b/ci/azure/windows.yml index e510f4115b25f..60143ea4d1906 100644 --- a/ci/azure/windows.yml +++ b/ci/azure/windows.yml @@ -47,7 +47,7 @@ jobs: condition: succeededOrFailed() inputs: failTaskOnFailedTests: true - testResultsFiles: 'test-data.xml' + testResultsFiles: 'junit/test-results.xml' testRunTitle: ${{ format('{0}-$(CONDA_PY)', parameters.name) }} displayName: 'Publish test results' diff --git a/ci/run_tests.sh b/ci/run_tests.sh index 0cf7f94b2f910..c8385e5800143 100755 --- a/ci/run_tests.sh +++ b/ci/run_tests.sh @@ -11,7 +11,7 @@ fi # Always calculate and upload coverage, as coverage reports are merged by Codecov # https://docs.codecov.io/docs/merging-reports -COVERAGE="--cov=pandas.io.formats.info --junitxml=junit/test-results.xml --cov-report=xml --cov-report=html" +COVERAGE="--cov=pandas --junitxml=junit/test-results.xml --cov-report=xml --cov-report=html" # If no X server is found, we use xvfb to emulate it if [[ $(uname) == "Linux" && -z $DISPLAY ]]; then @@ -19,7 +19,7 @@ if [[ $(uname) == "Linux" && -z $DISPLAY ]]; then XVFB="xvfb-run " fi -PYTEST_CMD="${XVFB}pytest -m \"$PATTERN\" -n $PYTEST_WORKERS --dist=loadfile -s --strict-markers --durations=30 $COVERAGE pandas/tests/io/formats/test_info.py" +PYTEST_CMD="${XVFB}pytest -m \"$PATTERN\" -n $PYTEST_WORKERS --dist=loadfile -s --strict-markers --durations=30 $COVERAGE pandas" if [[ $(uname) != "Linux" && $(uname) != "Darwin" ]]; then # GH#37455 windows py38 build appears to be running out of memory From cc1f37fa2fb7116f59666ff5386fa88ff69c6e2d Mon Sep 17 00:00:00 2001 From: Marco Gorelli Date: Fri, 12 Mar 2021 14:55:58 +0000 Subject: [PATCH 09/36] try moving to ghactions --- .github/workflows/database.yml | 7 +++-- ci/azure/posix.yml | 57 ---------------------------------- ci/run_tests.sh | 15 ++++++--- 3 files changed, 15 insertions(+), 64 deletions(-) diff --git a/.github/workflows/database.yml b/.github/workflows/database.yml index 0f3195b95c528..b34373b82af1a 100644 --- a/.github/workflows/database.yml +++ b/.github/workflows/database.yml @@ -86,7 +86,7 @@ jobs: uses: actions/upload-artifact@master with: name: Test results - path: junit/test-results.xml + path: test-data.xml if: failure() - name: Print skipped tests @@ -101,6 +101,7 @@ jobs: env: ENV_FILE: ci/deps/actions-37-cov.yaml PANDAS_TESTING_MODE: deprecate + COVERAGE: true services: mysql: @@ -164,7 +165,7 @@ jobs: uses: actions/upload-artifact@master with: name: Test results - path: junit/test-results.xml + path: test-data.xml if: failure() - name: Print skipped tests @@ -173,7 +174,7 @@ jobs: - name: Upload coverage to Codecov uses: codecov/codecov-action@v1 with: - files: junit/test-results.xml + files: /tmp/test_coverage.xml flags: unittests name: codecov-pandas fail_ci_if_error: true diff --git a/ci/azure/posix.yml b/ci/azure/posix.yml index 01030934203d3..3378a6c98d839 100644 --- a/ci/azure/posix.yml +++ b/ci/azure/posix.yml @@ -14,63 +14,6 @@ jobs: CONDA_PY: "37" PATTERN: "not slow and not network" - ${{ if eq(parameters.name, 'Linux') }}: - py37_minimum_versions: - ENV_FILE: ci/deps/azure-37-minimum_versions.yaml - CONDA_PY: "37" - PATTERN: "not slow and not network and not clipboard" - - py37: - ENV_FILE: ci/deps/azure-37.yaml - CONDA_PY: "37" - PATTERN: "not slow and not network and not clipboard" - - py37_locale_slow: - ENV_FILE: ci/deps/azure-37-locale_slow.yaml - CONDA_PY: "37" - PATTERN: "slow" - LANG: "it_IT.utf8" - LC_ALL: "it_IT.utf8" - EXTRA_APT: "language-pack-it xsel" - - py37_slow: - ENV_FILE: ci/deps/azure-37-slow.yaml - CONDA_PY: "37" - PATTERN: "slow" - - py38: - ENV_FILE: ci/deps/azure-38.yaml - CONDA_PY: "38" - PATTERN: "not slow and not network and not clipboard" - - py38_slow: - ENV_FILE: ci/deps/azure-38-slow.yaml - CONDA_PY: "38" - PATTERN: "slow" - - py38_locale: - ENV_FILE: ci/deps/azure-38-locale.yaml - CONDA_PY: "38" - PATTERN: "not slow and not network" - # pandas does not use the language (zh_CN), but should support different encodings (utf8) - # we should test with encodings different than utf8, but doesn't seem like Ubuntu supports any - LANG: "zh_CN.utf8" - LC_ALL: "zh_CN.utf8" - EXTRA_APT: "language-pack-zh-hans xsel" - - py38_np_dev: - ENV_FILE: ci/deps/azure-38-numpydev.yaml - CONDA_PY: "38" - PATTERN: "not slow and not network" - TEST_ARGS: "-W error" - PANDAS_TESTING_MODE: "deprecate" - EXTRA_APT: "xsel" - - py39: - ENV_FILE: ci/deps/azure-39.yaml - CONDA_PY: "39" - PATTERN: "not slow and not network and not clipboard" - steps: - script: | if [ "$(uname)" == "Linux" ]; then diff --git a/ci/run_tests.sh b/ci/run_tests.sh index c8385e5800143..593939431d5eb 100755 --- a/ci/run_tests.sh +++ b/ci/run_tests.sh @@ -9,9 +9,10 @@ if [[ "not network" == *"$PATTERN"* ]]; then export http_proxy=http://1.2.3.4 https_proxy=http://1.2.3.4; fi -# Always calculate and upload coverage, as coverage reports are merged by Codecov -# https://docs.codecov.io/docs/merging-reports -COVERAGE="--cov=pandas --junitxml=junit/test-results.xml --cov-report=xml --cov-report=html" +if [ "$COVERAGE" ]; then + COVERAGE_FNAME="/tmp/test_coverage.xml" + COVERAGE="-s --cov=pandas --cov-report=xml:$COVERAGE_FNAME" +fi # If no X server is found, we use xvfb to emulate it if [[ $(uname) == "Linux" && -z $DISPLAY ]]; then @@ -19,7 +20,7 @@ if [[ $(uname) == "Linux" && -z $DISPLAY ]]; then XVFB="xvfb-run " fi -PYTEST_CMD="${XVFB}pytest -m \"$PATTERN\" -n $PYTEST_WORKERS --dist=loadfile -s --strict-markers --durations=30 $COVERAGE pandas" +PYTEST_CMD="${XVFB}pytest -m \"$PATTERN\" -n $PYTEST_WORKERS --dist=loadfile -s --strict-markers --durations=30 --junitxml=test-data.xml $TEST_ARGS $COVERAGE pandas" if [[ $(uname) != "Linux" && $(uname) != "Darwin" ]]; then # GH#37455 windows py38 build appears to be running out of memory @@ -29,3 +30,9 @@ fi echo $PYTEST_CMD sh -c "$PYTEST_CMD" + +if [[ "$COVERAGE" && $? == 0 && "$TRAVIS_BRANCH" == "master" ]]; then + echo "uploading coverage" + echo "bash <(curl -s https://codecov.io/bash) -Z -c -f $COVERAGE_FNAME" + bash <(curl -s https://codecov.io/bash) -Z -c -f $COVERAGE_FNAME +fi From 753c3ac55d94e1d6532cc7c9bb682b5e30932a35 Mon Sep 17 00:00:00 2001 From: Marco Gorelli Date: Fri, 12 Mar 2021 14:57:50 +0000 Subject: [PATCH 10/36] wip --- ci/azure/posix.yml | 9 +-------- ci/azure/windows.yml | 2 +- ci/print_skipped.py | 2 +- 3 files changed, 3 insertions(+), 10 deletions(-) diff --git a/ci/azure/posix.yml b/ci/azure/posix.yml index 3378a6c98d839..5c6504c34ca3c 100644 --- a/ci/azure/posix.yml +++ b/ci/azure/posix.yml @@ -40,7 +40,7 @@ jobs: condition: succeededOrFailed() inputs: failTaskOnFailedTests: true - testResultsFiles: 'junit/test-results.xml' + testResultsFiles: 'test-data.xml' testRunTitle: ${{ format('{0}-$(CONDA_PY)', parameters.name) }} displayName: 'Publish test results' @@ -48,10 +48,3 @@ jobs: source activate pandas-dev python ci/print_skipped.py displayName: 'Print skipped tests' - - - task: PublishCodeCoverageResults@1 - displayName: ‘Publish Cobertura Coverage Report’ - inputs: - codeCoverageTool: Cobertura - summaryFileLocation: ‘$(System.DefaultWorkingDirectory)/**/coverage.xml’ - reportDirectory: ‘$(System.DefaultWorkingDirectory)/**/htmlcov’ diff --git a/ci/azure/windows.yml b/ci/azure/windows.yml index 60143ea4d1906..e510f4115b25f 100644 --- a/ci/azure/windows.yml +++ b/ci/azure/windows.yml @@ -47,7 +47,7 @@ jobs: condition: succeededOrFailed() inputs: failTaskOnFailedTests: true - testResultsFiles: 'junit/test-results.xml' + testResultsFiles: 'test-data.xml' testRunTitle: ${{ format('{0}-$(CONDA_PY)', parameters.name) }} displayName: 'Publish test results' diff --git a/ci/print_skipped.py b/ci/print_skipped.py index 3bb9aeeb256b0..60e2f047235e6 100755 --- a/ci/print_skipped.py +++ b/ci/print_skipped.py @@ -27,7 +27,7 @@ def main(filename): if __name__ == "__main__": print("SKIPPED TESTS:") i = 1 - for test_data in main("junit/test-results.xml"): + for test_data in main("test-data.xml"): if test_data is None: print("-" * 80) else: From 25629d6a4e8b5a28848a52b087ef1da3a092a008 Mon Sep 17 00:00:00 2001 From: Marco Gorelli Date: Fri, 12 Mar 2021 15:02:07 +0000 Subject: [PATCH 11/36] stage posix file --- .github/workflows/posix.yml | 78 +++++++++++++++++++++++++++++++++++++ 1 file changed, 78 insertions(+) create mode 100644 .github/workflows/posix.yml diff --git a/.github/workflows/posix.yml b/.github/workflows/posix.yml new file mode 100644 index 0000000000000..50c133bee3e88 --- /dev/null +++ b/.github/workflows/posix.yml @@ -0,0 +1,78 @@ +name: Posix + +on: + push: + branches: [master] + pull_request: + branches: + - master + - 1.2.x + +jobs: + py37: + runs-on: ubuntu-latest + defaults: + run: + shell: bash -l {0} + strategy: + matrix: + env-file: [ + ci/deps/azure-37-minimum_versions.yaml, + ci/deps/azure-37.yaml, + ci/deps/azure-37-locale_slow.yaml, + ci/deps/azure-37-slow.yaml, + ci/deps/azure-38.yaml, + ci/deps/azure-38-slow.yaml, + ci/deps/azure-38-locale.yaml, + ci/deps/azure-38-numpydev.yaml, + ci/deps/azure-39.yaml + ] + fail-fast: true + + steps: + - name: Checkout + uses: actions/checkout@v1 + + - name: Cache conda + uses: actions/cache@v1 + env: + CACHE_NUMBER: 0 + with: + path: ~/conda_pkgs_dir + key: ${{ runner.os }}-conda-${{ env.CACHE_NUMBER }}-${{ + hashFiles('${{ os.matrix.env-file }}') }} + + - uses: conda-incubator/setup-miniconda@v2 + with: + activate-environment: pandas-dev + channel-priority: strict + environment-file: ${{ os.matrix.env-file }} + use-only-tar-bz2: true + + - name: Build Pandas + uses: ./.github/actions/build_pandas + + - name: Test + run: ci/run_tests.sh + if: always() + + - name: Build Version + run: pushd /tmp && python -c "import pandas; pandas.show_versions();" && popd + + - name: Publish test results + uses: actions/upload-artifact@master + with: + name: Test results + path: test-data.xml + if: failure() + + - name: Print skipped tests + run: python ci/print_skipped.py + + - name: Upload coverage to Codecov + uses: codecov/codecov-action@v1 + with: + files: /tmp/test_coverage.xml + flags: unittests + name: codecov-pandas + fail_ci_if_error: true From 21b0682acffcaa673ddbec421485a2fe4b5e31a8 Mon Sep 17 00:00:00 2001 From: Marco Gorelli Date: Fri, 12 Mar 2021 15:03:49 +0000 Subject: [PATCH 12/36] coverage: true --- .github/workflows/posix.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/posix.yml b/.github/workflows/posix.yml index 50c133bee3e88..c4396e6a3a128 100644 --- a/.github/workflows/posix.yml +++ b/.github/workflows/posix.yml @@ -9,7 +9,7 @@ on: - 1.2.x jobs: - py37: + pytest: runs-on: ubuntu-latest defaults: run: @@ -28,6 +28,8 @@ jobs: ci/deps/azure-39.yaml ] fail-fast: true + env: + COVERAGE: true steps: - name: Checkout From 36f96e9a1e0a3837a860473c3208aac329e2448c Mon Sep 17 00:00:00 2001 From: Marco Gorelli Date: Fri, 12 Mar 2021 15:06:12 +0000 Subject: [PATCH 13/36] fixup yml error --- .github/workflows/posix.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/posix.yml b/.github/workflows/posix.yml index c4396e6a3a128..bf793b242588e 100644 --- a/.github/workflows/posix.yml +++ b/.github/workflows/posix.yml @@ -42,13 +42,13 @@ jobs: with: path: ~/conda_pkgs_dir key: ${{ runner.os }}-conda-${{ env.CACHE_NUMBER }}-${{ - hashFiles('${{ os.matrix.env-file }}') }} + hashFiles('${{ matrix.env-file }}') }} - uses: conda-incubator/setup-miniconda@v2 with: activate-environment: pandas-dev channel-priority: strict - environment-file: ${{ os.matrix.env-file }} + environment-file: ${{ matrix.env-file }} use-only-tar-bz2: true - name: Build Pandas From 213a06f6cfb45d3ea0c9ea9c16ac03c9724104c1 Mon Sep 17 00:00:00 2001 From: Marco Gorelli Date: Fri, 12 Mar 2021 15:17:37 +0000 Subject: [PATCH 14/36] PYTEST_WORKERS --- .github/workflows/posix.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/posix.yml b/.github/workflows/posix.yml index bf793b242588e..2309d5e67ca57 100644 --- a/.github/workflows/posix.yml +++ b/.github/workflows/posix.yml @@ -30,6 +30,7 @@ jobs: fail-fast: true env: COVERAGE: true + PYTEST_WORKERS: "auto" steps: - name: Checkout From d0f456978ef0af788c9b040d4949eb020f1fc0e1 Mon Sep 17 00:00:00 2001 From: Marco Gorelli Date: Fri, 12 Mar 2021 15:34:22 +0000 Subject: [PATCH 15/36] remove pytest-azurepipelines --- ci/deps/azure-37-locale_slow.yaml | 2 +- ci/deps/azure-37-minimum_versions.yaml | 2 +- ci/deps/azure-37-slow.yaml | 2 +- ci/deps/azure-37.yaml | 1 - ci/deps/azure-38-locale.yaml | 2 +- ci/deps/azure-38-numpydev.yaml | 2 +- ci/deps/azure-38.yaml | 2 +- ci/deps/azure-39.yaml | 2 +- 8 files changed, 7 insertions(+), 8 deletions(-) diff --git a/ci/deps/azure-37-locale_slow.yaml b/ci/deps/azure-37-locale_slow.yaml index 82a8a9f0ae492..0d508aaca11cf 100644 --- a/ci/deps/azure-37-locale_slow.yaml +++ b/ci/deps/azure-37-locale_slow.yaml @@ -11,7 +11,7 @@ dependencies: - pytest-cov - pytest-xdist>=1.21 - hypothesis>=3.58.0 - - pytest-azurepipelines + - # pandas dependencies - beautifulsoup4=4.6.0 diff --git a/ci/deps/azure-37-minimum_versions.yaml b/ci/deps/azure-37-minimum_versions.yaml index 16e34f2812f42..81c6a8a124344 100644 --- a/ci/deps/azure-37-minimum_versions.yaml +++ b/ci/deps/azure-37-minimum_versions.yaml @@ -10,7 +10,7 @@ dependencies: - pytest-cov - pytest-xdist>=1.21 - hypothesis>=3.58.0 - - pytest-azurepipelines + - - psutil # pandas dependencies diff --git a/ci/deps/azure-37-slow.yaml b/ci/deps/azure-37-slow.yaml index fcacdaf632766..c38781e69085d 100644 --- a/ci/deps/azure-37-slow.yaml +++ b/ci/deps/azure-37-slow.yaml @@ -11,7 +11,7 @@ dependencies: - pytest-cov - pytest-xdist>=1.21 - hypothesis>=3.58.0 - - pytest-azurepipelines + - # pandas dependencies - beautifulsoup4 diff --git a/ci/deps/azure-37.yaml b/ci/deps/azure-37.yaml index 58239bb83b984..61f431256dd4a 100644 --- a/ci/deps/azure-37.yaml +++ b/ci/deps/azure-37.yaml @@ -11,7 +11,6 @@ dependencies: - pytest-cov - pytest-xdist>=1.21 - hypothesis>=3.58.0 - - pytest-azurepipelines # pandas dependencies - botocore>=1.11 diff --git a/ci/deps/azure-38-locale.yaml b/ci/deps/azure-38-locale.yaml index f39197ad256d6..b4bdf094da79a 100644 --- a/ci/deps/azure-38-locale.yaml +++ b/ci/deps/azure-38-locale.yaml @@ -11,7 +11,7 @@ dependencies: - pytest-xdist>=1.21 - pytest-asyncio>=0.12.0 - hypothesis>=3.58.0 - - pytest-azurepipelines + - # pandas dependencies - beautifulsoup4 diff --git a/ci/deps/azure-38-numpydev.yaml b/ci/deps/azure-38-numpydev.yaml index 88ecd91eaf78c..2276e95d4cbeb 100644 --- a/ci/deps/azure-38-numpydev.yaml +++ b/ci/deps/azure-38-numpydev.yaml @@ -9,7 +9,7 @@ dependencies: - pytest-cov - pytest-xdist>=1.21 - hypothesis>=3.58.0 - - pytest-azurepipelines + - # pandas dependencies - pytz diff --git a/ci/deps/azure-38.yaml b/ci/deps/azure-38.yaml index 0eb599d4a3547..409213c6ed668 100644 --- a/ci/deps/azure-38.yaml +++ b/ci/deps/azure-38.yaml @@ -11,7 +11,7 @@ dependencies: - pytest-cov - pytest-xdist>=1.21 - hypothesis>=3.58.0 - - pytest-azurepipelines + - # pandas dependencies - numpy diff --git a/ci/deps/azure-39.yaml b/ci/deps/azure-39.yaml index fa49641914fdc..fc830927340f6 100644 --- a/ci/deps/azure-39.yaml +++ b/ci/deps/azure-39.yaml @@ -10,7 +10,7 @@ dependencies: - pytest-cov - pytest-xdist>=1.21 - hypothesis>=3.58.0 - - pytest-azurepipelines + - # pandas dependencies - numpy From fff02175437c5a756d81fd16ee7a242b73771c0f Mon Sep 17 00:00:00 2001 From: Marco Gorelli Date: Fri, 12 Mar 2021 15:38:46 +0000 Subject: [PATCH 16/36] valid yaml --- ci/deps/azure-37-locale_slow.yaml | 2 +- ci/deps/azure-37-minimum_versions.yaml | 2 +- ci/deps/azure-37-slow.yaml | 2 +- ci/deps/azure-37.yaml | 1 + ci/deps/azure-38-locale.yaml | 2 +- ci/deps/azure-38-numpydev.yaml | 2 +- ci/deps/azure-38.yaml | 2 +- ci/deps/azure-39.yaml | 2 +- 8 files changed, 8 insertions(+), 7 deletions(-) diff --git a/ci/deps/azure-37-locale_slow.yaml b/ci/deps/azure-37-locale_slow.yaml index 0d508aaca11cf..92c85239a6be4 100644 --- a/ci/deps/azure-37-locale_slow.yaml +++ b/ci/deps/azure-37-locale_slow.yaml @@ -11,7 +11,7 @@ dependencies: - pytest-cov - pytest-xdist>=1.21 - hypothesis>=3.58.0 - - + # pandas dependencies - beautifulsoup4=4.6.0 diff --git a/ci/deps/azure-37-minimum_versions.yaml b/ci/deps/azure-37-minimum_versions.yaml index 81c6a8a124344..5153715a17fff 100644 --- a/ci/deps/azure-37-minimum_versions.yaml +++ b/ci/deps/azure-37-minimum_versions.yaml @@ -10,7 +10,7 @@ dependencies: - pytest-cov - pytest-xdist>=1.21 - hypothesis>=3.58.0 - - + - psutil # pandas dependencies diff --git a/ci/deps/azure-37-slow.yaml b/ci/deps/azure-37-slow.yaml index c38781e69085d..c707c088cf202 100644 --- a/ci/deps/azure-37-slow.yaml +++ b/ci/deps/azure-37-slow.yaml @@ -11,7 +11,7 @@ dependencies: - pytest-cov - pytest-xdist>=1.21 - hypothesis>=3.58.0 - - + # pandas dependencies - beautifulsoup4 diff --git a/ci/deps/azure-37.yaml b/ci/deps/azure-37.yaml index 61f431256dd4a..a8a098b836ee2 100644 --- a/ci/deps/azure-37.yaml +++ b/ci/deps/azure-37.yaml @@ -12,6 +12,7 @@ dependencies: - pytest-xdist>=1.21 - hypothesis>=3.58.0 + # pandas dependencies - botocore>=1.11 - fsspec>=0.7.4 diff --git a/ci/deps/azure-38-locale.yaml b/ci/deps/azure-38-locale.yaml index b4bdf094da79a..dc3a15dda95d8 100644 --- a/ci/deps/azure-38-locale.yaml +++ b/ci/deps/azure-38-locale.yaml @@ -11,7 +11,7 @@ dependencies: - pytest-xdist>=1.21 - pytest-asyncio>=0.12.0 - hypothesis>=3.58.0 - - + # pandas dependencies - beautifulsoup4 diff --git a/ci/deps/azure-38-numpydev.yaml b/ci/deps/azure-38-numpydev.yaml index 2276e95d4cbeb..69fb03b782b8b 100644 --- a/ci/deps/azure-38-numpydev.yaml +++ b/ci/deps/azure-38-numpydev.yaml @@ -9,7 +9,7 @@ dependencies: - pytest-cov - pytest-xdist>=1.21 - hypothesis>=3.58.0 - - + # pandas dependencies - pytz diff --git a/ci/deps/azure-38.yaml b/ci/deps/azure-38.yaml index 409213c6ed668..2e7338ae159a3 100644 --- a/ci/deps/azure-38.yaml +++ b/ci/deps/azure-38.yaml @@ -11,7 +11,7 @@ dependencies: - pytest-cov - pytest-xdist>=1.21 - hypothesis>=3.58.0 - - + # pandas dependencies - numpy diff --git a/ci/deps/azure-39.yaml b/ci/deps/azure-39.yaml index fc830927340f6..046e3603622ac 100644 --- a/ci/deps/azure-39.yaml +++ b/ci/deps/azure-39.yaml @@ -10,7 +10,7 @@ dependencies: - pytest-cov - pytest-xdist>=1.21 - hypothesis>=3.58.0 - - + # pandas dependencies - numpy From d6eefaeee12e2cf4988ea5bb161c47c90a8ca776 Mon Sep 17 00:00:00 2001 From: Marco Gorelli Date: Fri, 12 Mar 2021 15:52:52 +0000 Subject: [PATCH 17/36] pin pytest-cov --- ci/deps/azure-37-locale_slow.yaml | 2 +- ci/deps/azure-37-minimum_versions.yaml | 2 +- ci/deps/azure-37-slow.yaml | 2 +- ci/deps/azure-37.yaml | 2 +- ci/deps/azure-38-locale.yaml | 2 +- ci/deps/azure-38-numpydev.yaml | 2 +- ci/deps/azure-38-slow.yaml | 2 +- ci/deps/azure-38.yaml | 2 +- ci/deps/azure-39.yaml | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/ci/deps/azure-37-locale_slow.yaml b/ci/deps/azure-37-locale_slow.yaml index 92c85239a6be4..4b7e784cb72ed 100644 --- a/ci/deps/azure-37-locale_slow.yaml +++ b/ci/deps/azure-37-locale_slow.yaml @@ -8,7 +8,7 @@ dependencies: # tools - cython>=0.29.21 - pytest>=5.0.1 - - pytest-cov + - pytest-cov>=2.10.1 - pytest-xdist>=1.21 - hypothesis>=3.58.0 diff --git a/ci/deps/azure-37-minimum_versions.yaml b/ci/deps/azure-37-minimum_versions.yaml index 5153715a17fff..72c4418bec33c 100644 --- a/ci/deps/azure-37-minimum_versions.yaml +++ b/ci/deps/azure-37-minimum_versions.yaml @@ -7,7 +7,7 @@ dependencies: # tools - cython=0.29.21 - pytest=5.0.1 - - pytest-cov + - pytest-cov>=2.10.1 - pytest-xdist>=1.21 - hypothesis>=3.58.0 diff --git a/ci/deps/azure-37-slow.yaml b/ci/deps/azure-37-slow.yaml index c707c088cf202..11260509c4ff8 100644 --- a/ci/deps/azure-37-slow.yaml +++ b/ci/deps/azure-37-slow.yaml @@ -8,7 +8,7 @@ dependencies: # tools - cython>=0.29.21 - pytest>=5.0.1 - - pytest-cov + - pytest-cov>=2.10.1 - pytest-xdist>=1.21 - hypothesis>=3.58.0 diff --git a/ci/deps/azure-37.yaml b/ci/deps/azure-37.yaml index a8a098b836ee2..82fba422f7c7c 100644 --- a/ci/deps/azure-37.yaml +++ b/ci/deps/azure-37.yaml @@ -8,7 +8,7 @@ dependencies: # tools - cython>=0.29.21 - pytest>=5.0.1 - - pytest-cov + - pytest-cov>=2.10.1 - pytest-xdist>=1.21 - hypothesis>=3.58.0 diff --git a/ci/deps/azure-38-locale.yaml b/ci/deps/azure-38-locale.yaml index dc3a15dda95d8..b7d84307bb9b6 100644 --- a/ci/deps/azure-38-locale.yaml +++ b/ci/deps/azure-38-locale.yaml @@ -7,7 +7,7 @@ dependencies: # tools - cython>=0.29.21 - pytest>=5.0.1 - - pytest-cov + - pytest-cov>=2.10.1 - pytest-xdist>=1.21 - pytest-asyncio>=0.12.0 - hypothesis>=3.58.0 diff --git a/ci/deps/azure-38-numpydev.yaml b/ci/deps/azure-38-numpydev.yaml index 69fb03b782b8b..68f4f78bc3800 100644 --- a/ci/deps/azure-38-numpydev.yaml +++ b/ci/deps/azure-38-numpydev.yaml @@ -6,7 +6,7 @@ dependencies: # tools - pytest>=5.0.1 - - pytest-cov + - pytest-cov>=2.10.1 - pytest-xdist>=1.21 - hypothesis>=3.58.0 diff --git a/ci/deps/azure-38-slow.yaml b/ci/deps/azure-38-slow.yaml index 2106f48755560..9e0205300b9d6 100644 --- a/ci/deps/azure-38-slow.yaml +++ b/ci/deps/azure-38-slow.yaml @@ -7,7 +7,7 @@ dependencies: # tools - cython>=0.29.21 - pytest>=5.0.1 - - pytest-cov + - pytest-cov>=2.10.1 - pytest-xdist>=1.21 - hypothesis>=3.58.0 diff --git a/ci/deps/azure-38.yaml b/ci/deps/azure-38.yaml index 2e7338ae159a3..e325a307cf029 100644 --- a/ci/deps/azure-38.yaml +++ b/ci/deps/azure-38.yaml @@ -8,7 +8,7 @@ dependencies: # tools - cython>=0.29.21 - pytest>=5.0.1 - - pytest-cov + - pytest-cov>=2.10.1 - pytest-xdist>=1.21 - hypothesis>=3.58.0 diff --git a/ci/deps/azure-39.yaml b/ci/deps/azure-39.yaml index 046e3603622ac..6b81a71fcbf04 100644 --- a/ci/deps/azure-39.yaml +++ b/ci/deps/azure-39.yaml @@ -7,7 +7,7 @@ dependencies: # tools - cython>=0.29.21 - pytest>=5.0.1 - - pytest-cov + - pytest-cov>=2.10.1 - pytest-xdist>=1.21 - hypothesis>=3.58.0 From e9ba4be996e2dd99182b2dfafb6085f70b2fe209 Mon Sep 17 00:00:00 2001 From: Marco Gorelli Date: Fri, 12 Mar 2021 20:46:01 +0000 Subject: [PATCH 18/36] install extra --- .github/workflows/posix.yml | 5 +++++ .pre-commit-config.yaml | 4 ++-- pandas/core/internals/blocks.py | 2 +- pandas/io/pytables.py | 2 +- 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/.github/workflows/posix.yml b/.github/workflows/posix.yml index 2309d5e67ca57..6ce092dd9c982 100644 --- a/.github/workflows/posix.yml +++ b/.github/workflows/posix.yml @@ -45,6 +45,11 @@ jobs: key: ${{ runner.os }}-conda-${{ env.CACHE_NUMBER }}-${{ hashFiles('${{ matrix.env-file }}') }} + - name: Install extra + run: + sudo apt-get update + sudo apt-get install -y libc6-dev-i386 $EXTRA_APT + - uses: conda-incubator/setup-miniconda@v2 with: activate-environment: pandas-dev diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 99ba2feadbca7..f7db3631bc133 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -54,8 +54,8 @@ repos: rev: v0.1.7 hooks: - id: no-string-hints -- repo: https://github.com/asottile/pyupgrade - rev: v2.10.0 +- repo: https://github.com/MarcoGorelli/pyupgrade + rev: d2377ca4226ff8a3f1ad5324373671694322b9ff hooks: - id: pyupgrade args: [--py37-plus, --keep-runtime-typing] diff --git a/pandas/core/internals/blocks.py b/pandas/core/internals/blocks.py index b1a552cff2274..3d6d92579538e 100644 --- a/pandas/core/internals/blocks.py +++ b/pandas/core/internals/blocks.py @@ -833,7 +833,7 @@ def _replace_list( rb = [self if inplace else self.copy()] for i, (src, dest) in enumerate(pairs): - new_rb: List["Block"] = [] + new_rb: List[Block] = [] for blk in rb: m = masks[i] convert = i == src_len # only convert once at the end diff --git a/pandas/io/pytables.py b/pandas/io/pytables.py index 02a723902271e..99931123b0c81 100644 --- a/pandas/io/pytables.py +++ b/pandas/io/pytables.py @@ -4058,7 +4058,7 @@ def get_blk_items(mgr): tuple(b_items.tolist()): (b, b_items) for b, b_items in zip(blocks, blk_items) } - new_blocks: List["Block"] = [] + new_blocks: List[Block] = [] new_blk_items = [] for ea in values_axes: items = tuple(ea.values) From e5e0087fcaccc0a108be939b800b7c16c75bb09d Mon Sep 17 00:00:00 2001 From: Marco Gorelli Date: Fri, 12 Mar 2021 21:02:48 +0000 Subject: [PATCH 19/36] install extra --- .github/workflows/posix.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/posix.yml b/.github/workflows/posix.yml index 6ce092dd9c982..1b9cc8ed86839 100644 --- a/.github/workflows/posix.yml +++ b/.github/workflows/posix.yml @@ -47,8 +47,7 @@ jobs: - name: Install extra run: - sudo apt-get update - sudo apt-get install -y libc6-dev-i386 $EXTRA_APT + sudo apt-get update && sudo apt-get install -y libc6-dev-i386 $EXTRA_APT - uses: conda-incubator/setup-miniconda@v2 with: From 231def7d8716ae1832421760fd4a695f2f4f1cb0 Mon Sep 17 00:00:00 2001 From: Marco Gorelli Date: Sat, 13 Mar 2021 11:04:36 +0000 Subject: [PATCH 20/36] wip --- ci/deps/actions-37-cov.yaml | 1 - ci/deps/actions-37-locale.yaml | 1 - ci/deps/azure-37-locale_slow.yaml | 3 +-- ci/deps/azure-37-minimum_versions.yaml | 3 +-- ci/deps/azure-37-slow.yaml | 3 +-- ci/deps/azure-37.yaml | 3 +-- ci/deps/azure-38-locale.yaml | 3 +-- ci/deps/azure-38-numpydev.yaml | 3 +-- ci/deps/azure-38-slow.yaml | 1 - ci/deps/azure-38.yaml | 3 +-- ci/deps/azure-39.yaml | 3 +-- ci/deps/azure-macos-37.yaml | 1 - ci/deps/azure-windows-37.yaml | 1 - ci/deps/azure-windows-38.yaml | 1 - ci/deps/travis-37-arm64.yaml | 1 - 15 files changed, 8 insertions(+), 23 deletions(-) diff --git a/ci/deps/actions-37-cov.yaml b/ci/deps/actions-37-cov.yaml index ec057ee2d2f84..5381caaa242cf 100644 --- a/ci/deps/actions-37-cov.yaml +++ b/ci/deps/actions-37-cov.yaml @@ -7,7 +7,6 @@ dependencies: # tools - cython>=0.29.21 - pytest>=5.0.1 - - pytest-cov - pytest-xdist>=1.21 - hypothesis>=3.58.0 - pytest-cov>=2.10.1 # this is only needed in the coverage build, ref: GH 35737 diff --git a/ci/deps/actions-37-locale.yaml b/ci/deps/actions-37-locale.yaml index 1d3794576220a..551308f1d5fac 100644 --- a/ci/deps/actions-37-locale.yaml +++ b/ci/deps/actions-37-locale.yaml @@ -7,7 +7,6 @@ dependencies: # tools - cython>=0.29.21 - pytest>=5.0.1 - - pytest-cov - pytest-xdist>=1.21 - hypothesis>=3.58.0 diff --git a/ci/deps/azure-37-locale_slow.yaml b/ci/deps/azure-37-locale_slow.yaml index 4b7e784cb72ed..0c47b1a72774f 100644 --- a/ci/deps/azure-37-locale_slow.yaml +++ b/ci/deps/azure-37-locale_slow.yaml @@ -8,10 +8,9 @@ dependencies: # tools - cython>=0.29.21 - pytest>=5.0.1 - - pytest-cov>=2.10.1 - pytest-xdist>=1.21 - hypothesis>=3.58.0 - + - pytest-azurepipelines # pandas dependencies - beautifulsoup4=4.6.0 diff --git a/ci/deps/azure-37-minimum_versions.yaml b/ci/deps/azure-37-minimum_versions.yaml index 72c4418bec33c..9cc158b76cd41 100644 --- a/ci/deps/azure-37-minimum_versions.yaml +++ b/ci/deps/azure-37-minimum_versions.yaml @@ -7,10 +7,9 @@ dependencies: # tools - cython=0.29.21 - pytest=5.0.1 - - pytest-cov>=2.10.1 - pytest-xdist>=1.21 - hypothesis>=3.58.0 - + - pytest-azurepipelines - psutil # pandas dependencies diff --git a/ci/deps/azure-37-slow.yaml b/ci/deps/azure-37-slow.yaml index 11260509c4ff8..5d097e397992c 100644 --- a/ci/deps/azure-37-slow.yaml +++ b/ci/deps/azure-37-slow.yaml @@ -8,10 +8,9 @@ dependencies: # tools - cython>=0.29.21 - pytest>=5.0.1 - - pytest-cov>=2.10.1 - pytest-xdist>=1.21 - hypothesis>=3.58.0 - + - pytest-azurepipelines # pandas dependencies - beautifulsoup4 diff --git a/ci/deps/azure-37.yaml b/ci/deps/azure-37.yaml index 82fba422f7c7c..4fe3de161960c 100644 --- a/ci/deps/azure-37.yaml +++ b/ci/deps/azure-37.yaml @@ -8,10 +8,9 @@ dependencies: # tools - cython>=0.29.21 - pytest>=5.0.1 - - pytest-cov>=2.10.1 - pytest-xdist>=1.21 - hypothesis>=3.58.0 - + - pytest-azurepipelines # pandas dependencies - botocore>=1.11 diff --git a/ci/deps/azure-38-locale.yaml b/ci/deps/azure-38-locale.yaml index b7d84307bb9b6..26297a3066fa5 100644 --- a/ci/deps/azure-38-locale.yaml +++ b/ci/deps/azure-38-locale.yaml @@ -7,11 +7,10 @@ dependencies: # tools - cython>=0.29.21 - pytest>=5.0.1 - - pytest-cov>=2.10.1 - pytest-xdist>=1.21 - pytest-asyncio>=0.12.0 - hypothesis>=3.58.0 - + - pytest-azurepipelines # pandas dependencies - beautifulsoup4 diff --git a/ci/deps/azure-38-numpydev.yaml b/ci/deps/azure-38-numpydev.yaml index 68f4f78bc3800..f11a3bcb28ab2 100644 --- a/ci/deps/azure-38-numpydev.yaml +++ b/ci/deps/azure-38-numpydev.yaml @@ -6,10 +6,9 @@ dependencies: # tools - pytest>=5.0.1 - - pytest-cov>=2.10.1 - pytest-xdist>=1.21 - hypothesis>=3.58.0 - + - pytest-azurepipelines # pandas dependencies - pytz diff --git a/ci/deps/azure-38-slow.yaml b/ci/deps/azure-38-slow.yaml index 9e0205300b9d6..0a4107917f01a 100644 --- a/ci/deps/azure-38-slow.yaml +++ b/ci/deps/azure-38-slow.yaml @@ -7,7 +7,6 @@ dependencies: # tools - cython>=0.29.21 - pytest>=5.0.1 - - pytest-cov>=2.10.1 - pytest-xdist>=1.21 - hypothesis>=3.58.0 diff --git a/ci/deps/azure-38.yaml b/ci/deps/azure-38.yaml index e325a307cf029..89e8d28a139b7 100644 --- a/ci/deps/azure-38.yaml +++ b/ci/deps/azure-38.yaml @@ -8,10 +8,9 @@ dependencies: # tools - cython>=0.29.21 - pytest>=5.0.1 - - pytest-cov>=2.10.1 - pytest-xdist>=1.21 - hypothesis>=3.58.0 - + - pytest-azurepipelines # pandas dependencies - numpy diff --git a/ci/deps/azure-39.yaml b/ci/deps/azure-39.yaml index 6b81a71fcbf04..c4c84e73fa684 100644 --- a/ci/deps/azure-39.yaml +++ b/ci/deps/azure-39.yaml @@ -7,10 +7,9 @@ dependencies: # tools - cython>=0.29.21 - pytest>=5.0.1 - - pytest-cov>=2.10.1 - pytest-xdist>=1.21 - hypothesis>=3.58.0 - + - pytest-azurepipelines # pandas dependencies - numpy diff --git a/ci/deps/azure-macos-37.yaml b/ci/deps/azure-macos-37.yaml index ea7eaa20fe85e..d667adddda859 100644 --- a/ci/deps/azure-macos-37.yaml +++ b/ci/deps/azure-macos-37.yaml @@ -6,7 +6,6 @@ dependencies: # tools - pytest>=5.0.1 - - pytest-cov - pytest-xdist>=1.21 - hypothesis>=3.58.0 - pytest-azurepipelines diff --git a/ci/deps/azure-windows-37.yaml b/ci/deps/azure-windows-37.yaml index cf3028dac5753..e7ac4c783b855 100644 --- a/ci/deps/azure-windows-37.yaml +++ b/ci/deps/azure-windows-37.yaml @@ -8,7 +8,6 @@ dependencies: # tools - cython>=0.29.21 - pytest>=5.0.1 - - pytest-cov - pytest-xdist>=1.21 - hypothesis>=3.58.0 - pytest-azurepipelines diff --git a/ci/deps/azure-windows-38.yaml b/ci/deps/azure-windows-38.yaml index 3cd2168dad736..661d8813d32d2 100644 --- a/ci/deps/azure-windows-38.yaml +++ b/ci/deps/azure-windows-38.yaml @@ -8,7 +8,6 @@ dependencies: # tools - cython>=0.29.21 - pytest>=5.0.1 - - pytest-cov - pytest-xdist>=1.21 - hypothesis>=3.58.0 - pytest-azurepipelines diff --git a/ci/deps/travis-37-arm64.yaml b/ci/deps/travis-37-arm64.yaml index 404c752749776..8df6104f43a50 100644 --- a/ci/deps/travis-37-arm64.yaml +++ b/ci/deps/travis-37-arm64.yaml @@ -7,7 +7,6 @@ dependencies: # tools - cython>=0.29.21 - pytest>=5.0.1 - - pytest-cov - pytest-xdist>=1.21 - hypothesis>=3.58.0 From 7c5d5d45ca0dcef3e9397e8a606c22f01dca98a9 Mon Sep 17 00:00:00 2001 From: Marco Gorelli Date: Sat, 13 Mar 2021 11:15:36 +0000 Subject: [PATCH 21/36] wip --- ci/deps/azure-37-locale_slow.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/ci/deps/azure-37-locale_slow.yaml b/ci/deps/azure-37-locale_slow.yaml index 0c47b1a72774f..3792c0e78707d 100644 --- a/ci/deps/azure-37-locale_slow.yaml +++ b/ci/deps/azure-37-locale_slow.yaml @@ -14,11 +14,11 @@ dependencies: # pandas dependencies - beautifulsoup4=4.6.0 - - bottleneck=1.2.* + - bottleneck=1.2 - lxml - - matplotlib=3.0.0 - - numpy=1.16.* - - openpyxl=3.0.0 + - matplotlib=3.0 + - numpy=1.16 + - openpyxl=3.0 - python-dateutil - python-blosc - pytz=2017.3 From 318e2061e122b47a1bc7ccc9f8dbe1fe35c4ff64 Mon Sep 17 00:00:00 2001 From: Marco Gorelli Date: Sat, 13 Mar 2021 11:26:49 +0000 Subject: [PATCH 22/36] flexi --- .github/workflows/posix.yml | 2 +- ci/deps/azure-37-locale_slow.yaml | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/posix.yml b/.github/workflows/posix.yml index 1b9cc8ed86839..fd318360d2626 100644 --- a/.github/workflows/posix.yml +++ b/.github/workflows/posix.yml @@ -52,7 +52,7 @@ jobs: - uses: conda-incubator/setup-miniconda@v2 with: activate-environment: pandas-dev - channel-priority: strict + channel-priority: flexible environment-file: ${{ matrix.env-file }} use-only-tar-bz2: true diff --git a/ci/deps/azure-37-locale_slow.yaml b/ci/deps/azure-37-locale_slow.yaml index 3792c0e78707d..0c47b1a72774f 100644 --- a/ci/deps/azure-37-locale_slow.yaml +++ b/ci/deps/azure-37-locale_slow.yaml @@ -14,11 +14,11 @@ dependencies: # pandas dependencies - beautifulsoup4=4.6.0 - - bottleneck=1.2 + - bottleneck=1.2.* - lxml - - matplotlib=3.0 - - numpy=1.16 - - openpyxl=3.0 + - matplotlib=3.0.0 + - numpy=1.16.* + - openpyxl=3.0.0 - python-dateutil - python-blosc - pytz=2017.3 From ff9a9b734355b54969e2e8b6a3977393fae89b4d Mon Sep 17 00:00:00 2001 From: Marco Gorelli Date: Sat, 13 Mar 2021 12:28:21 +0000 Subject: [PATCH 23/36] wip --- .pre-commit-config.yaml | 4 ++-- ci/deps/azure-37-locale_slow.yaml | 1 + ci/deps/azure-37-minimum_versions.yaml | 1 + ci/deps/azure-37-slow.yaml | 1 + ci/deps/azure-37.yaml | 1 + ci/deps/azure-38-locale.yaml | 1 + ci/deps/azure-38-slow.yaml | 1 + ci/deps/azure-38.yaml | 1 + ci/deps/azure-39.yaml | 1 + 9 files changed, 10 insertions(+), 2 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index f7db3631bc133..99ba2feadbca7 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -54,8 +54,8 @@ repos: rev: v0.1.7 hooks: - id: no-string-hints -- repo: https://github.com/MarcoGorelli/pyupgrade - rev: d2377ca4226ff8a3f1ad5324373671694322b9ff +- repo: https://github.com/asottile/pyupgrade + rev: v2.10.0 hooks: - id: pyupgrade args: [--py37-plus, --keep-runtime-typing] diff --git a/ci/deps/azure-37-locale_slow.yaml b/ci/deps/azure-37-locale_slow.yaml index 0c47b1a72774f..82a8a9f0ae492 100644 --- a/ci/deps/azure-37-locale_slow.yaml +++ b/ci/deps/azure-37-locale_slow.yaml @@ -8,6 +8,7 @@ dependencies: # tools - cython>=0.29.21 - pytest>=5.0.1 + - pytest-cov - pytest-xdist>=1.21 - hypothesis>=3.58.0 - pytest-azurepipelines diff --git a/ci/deps/azure-37-minimum_versions.yaml b/ci/deps/azure-37-minimum_versions.yaml index 9cc158b76cd41..16e34f2812f42 100644 --- a/ci/deps/azure-37-minimum_versions.yaml +++ b/ci/deps/azure-37-minimum_versions.yaml @@ -7,6 +7,7 @@ dependencies: # tools - cython=0.29.21 - pytest=5.0.1 + - pytest-cov - pytest-xdist>=1.21 - hypothesis>=3.58.0 - pytest-azurepipelines diff --git a/ci/deps/azure-37-slow.yaml b/ci/deps/azure-37-slow.yaml index 5d097e397992c..fcacdaf632766 100644 --- a/ci/deps/azure-37-slow.yaml +++ b/ci/deps/azure-37-slow.yaml @@ -8,6 +8,7 @@ dependencies: # tools - cython>=0.29.21 - pytest>=5.0.1 + - pytest-cov - pytest-xdist>=1.21 - hypothesis>=3.58.0 - pytest-azurepipelines diff --git a/ci/deps/azure-37.yaml b/ci/deps/azure-37.yaml index 4fe3de161960c..58239bb83b984 100644 --- a/ci/deps/azure-37.yaml +++ b/ci/deps/azure-37.yaml @@ -8,6 +8,7 @@ dependencies: # tools - cython>=0.29.21 - pytest>=5.0.1 + - pytest-cov - pytest-xdist>=1.21 - hypothesis>=3.58.0 - pytest-azurepipelines diff --git a/ci/deps/azure-38-locale.yaml b/ci/deps/azure-38-locale.yaml index 26297a3066fa5..f39197ad256d6 100644 --- a/ci/deps/azure-38-locale.yaml +++ b/ci/deps/azure-38-locale.yaml @@ -7,6 +7,7 @@ dependencies: # tools - cython>=0.29.21 - pytest>=5.0.1 + - pytest-cov - pytest-xdist>=1.21 - pytest-asyncio>=0.12.0 - hypothesis>=3.58.0 diff --git a/ci/deps/azure-38-slow.yaml b/ci/deps/azure-38-slow.yaml index 0a4107917f01a..2106f48755560 100644 --- a/ci/deps/azure-38-slow.yaml +++ b/ci/deps/azure-38-slow.yaml @@ -7,6 +7,7 @@ dependencies: # tools - cython>=0.29.21 - pytest>=5.0.1 + - pytest-cov - pytest-xdist>=1.21 - hypothesis>=3.58.0 diff --git a/ci/deps/azure-38.yaml b/ci/deps/azure-38.yaml index 89e8d28a139b7..0eb599d4a3547 100644 --- a/ci/deps/azure-38.yaml +++ b/ci/deps/azure-38.yaml @@ -8,6 +8,7 @@ dependencies: # tools - cython>=0.29.21 - pytest>=5.0.1 + - pytest-cov - pytest-xdist>=1.21 - hypothesis>=3.58.0 - pytest-azurepipelines diff --git a/ci/deps/azure-39.yaml b/ci/deps/azure-39.yaml index c4c84e73fa684..fa49641914fdc 100644 --- a/ci/deps/azure-39.yaml +++ b/ci/deps/azure-39.yaml @@ -7,6 +7,7 @@ dependencies: # tools - cython>=0.29.21 - pytest>=5.0.1 + - pytest-cov - pytest-xdist>=1.21 - hypothesis>=3.58.0 - pytest-azurepipelines From c938acfec14edb2800b97d6e045d607bc5f620a4 Mon Sep 17 00:00:00 2001 From: Marco Gorelli Date: Sat, 13 Mar 2021 12:30:54 +0000 Subject: [PATCH 24/36] wip --- .github/workflows/posix.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/.github/workflows/posix.yml b/.github/workflows/posix.yml index fd318360d2626..d30fc892d4ecd 100644 --- a/.github/workflows/posix.yml +++ b/.github/workflows/posix.yml @@ -45,10 +45,6 @@ jobs: key: ${{ runner.os }}-conda-${{ env.CACHE_NUMBER }}-${{ hashFiles('${{ matrix.env-file }}') }} - - name: Install extra - run: - sudo apt-get update && sudo apt-get install -y libc6-dev-i386 $EXTRA_APT - - uses: conda-incubator/setup-miniconda@v2 with: activate-environment: pandas-dev From 0ba4e7674bd3c47ad90f73a82194172d71be0a5a Mon Sep 17 00:00:00 2001 From: Marco Gorelli Date: Sat, 13 Mar 2021 12:56:23 +0000 Subject: [PATCH 25/36] cov in numpydev --- ci/deps/azure-38-numpydev.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/ci/deps/azure-38-numpydev.yaml b/ci/deps/azure-38-numpydev.yaml index f11a3bcb28ab2..88ecd91eaf78c 100644 --- a/ci/deps/azure-38-numpydev.yaml +++ b/ci/deps/azure-38-numpydev.yaml @@ -6,6 +6,7 @@ dependencies: # tools - pytest>=5.0.1 + - pytest-cov - pytest-xdist>=1.21 - hypothesis>=3.58.0 - pytest-azurepipelines From ff4a09fa286a2fc95b93ff84c72e6eb67ac2d7dc Mon Sep 17 00:00:00 2001 From: Marco Gorelli Date: Sat, 13 Mar 2021 13:50:51 +0000 Subject: [PATCH 26/36] cov in numpydev --- .github/workflows/posix.yml | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/.github/workflows/posix.yml b/.github/workflows/posix.yml index d30fc892d4ecd..ca3ea3c8ba85f 100644 --- a/.github/workflows/posix.yml +++ b/.github/workflows/posix.yml @@ -17,20 +17,16 @@ jobs: strategy: matrix: env-file: [ - ci/deps/azure-37-minimum_versions.yaml, - ci/deps/azure-37.yaml, - ci/deps/azure-37-locale_slow.yaml, - ci/deps/azure-37-slow.yaml, - ci/deps/azure-38.yaml, - ci/deps/azure-38-slow.yaml, - ci/deps/azure-38-locale.yaml, - ci/deps/azure-38-numpydev.yaml, - ci/deps/azure-39.yaml + [ci/deps/azure-37-minimum_versions.yaml, "not slow and not network and not clipboard"], + [ci/deps/azure-37.yaml, "not slow and not network and not clipboard"], + [ci/deps/azure-37-locale_slow.yaml, "slow"] ] fail-fast: true env: COVERAGE: true PYTEST_WORKERS: "auto" + PATTERN: ${{ matrix.env-file[1] }} + steps: - name: Checkout @@ -43,13 +39,13 @@ jobs: with: path: ~/conda_pkgs_dir key: ${{ runner.os }}-conda-${{ env.CACHE_NUMBER }}-${{ - hashFiles('${{ matrix.env-file }}') }} + hashFiles('${{ matrix.env-file[0] }}') }} - uses: conda-incubator/setup-miniconda@v2 with: activate-environment: pandas-dev channel-priority: flexible - environment-file: ${{ matrix.env-file }} + environment-file: ${{ matrix.env-file[0] }} use-only-tar-bz2: true - name: Build Pandas From 9338780b10cb385986281f646792e9763bafdac2 Mon Sep 17 00:00:00 2001 From: Marco Gorelli Date: Sat, 13 Mar 2021 14:47:17 +0000 Subject: [PATCH 27/36] cov in numpydev --- .github/workflows/posix.yml | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/.github/workflows/posix.yml b/.github/workflows/posix.yml index ca3ea3c8ba85f..0f2b9ba8fead9 100644 --- a/.github/workflows/posix.yml +++ b/.github/workflows/posix.yml @@ -17,15 +17,17 @@ jobs: strategy: matrix: env-file: [ - [ci/deps/azure-37-minimum_versions.yaml, "not slow and not network and not clipboard"], - [ci/deps/azure-37.yaml, "not slow and not network and not clipboard"], - [ci/deps/azure-37-locale_slow.yaml, "slow"] + [ci/deps/azure-37-minimum_versions.yaml, "not slow and not network and not clipboard", ""], + [ci/deps/azure-37.yaml, "not slow and not network and not clipboard", ""], + [ci/deps/azure-37-locale_slow.yaml, "slow", "language-pack-it xsel"] ] fail-fast: true env: COVERAGE: true PYTEST_WORKERS: "auto" + ENV_FILE: ${{ matrix.env-file[0] }} PATTERN: ${{ matrix.env-file[1] }} + EXTRA_APT: ${{ matrix.env-file[2] }} steps: @@ -39,13 +41,16 @@ jobs: with: path: ~/conda_pkgs_dir key: ${{ runner.os }}-conda-${{ env.CACHE_NUMBER }}-${{ - hashFiles('${{ matrix.env-file[0] }}') }} + hashFiles('${{ env.ENV_FILE }}') }} + + - name: Extra installs + run: sudo apt-get update && sudo apt-get install -y libc6-dev-i386 ${{ env.EXTRA_APT }} - uses: conda-incubator/setup-miniconda@v2 with: activate-environment: pandas-dev channel-priority: flexible - environment-file: ${{ matrix.env-file[0] }} + environment-file: ${{ env.ENV_FILE }} use-only-tar-bz2: true - name: Build Pandas From 3e0321bee650caec362bba81e701a0fd20960396 Mon Sep 17 00:00:00 2001 From: Marco Gorelli Date: Sat, 13 Mar 2021 15:25:06 +0000 Subject: [PATCH 28/36] cov file --- .github/workflows/database.yml | 1 - .github/workflows/posix.yml | 6 ++++-- ci/run_tests.sh | 3 +-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/database.yml b/.github/workflows/database.yml index b34373b82af1a..a25b9c8eb1f88 100644 --- a/.github/workflows/database.yml +++ b/.github/workflows/database.yml @@ -174,7 +174,6 @@ jobs: - name: Upload coverage to Codecov uses: codecov/codecov-action@v1 with: - files: /tmp/test_coverage.xml flags: unittests name: codecov-pandas fail_ci_if_error: true diff --git a/.github/workflows/posix.yml b/.github/workflows/posix.yml index 0f2b9ba8fead9..1d7ac0c39b315 100644 --- a/.github/workflows/posix.yml +++ b/.github/workflows/posix.yml @@ -8,6 +8,10 @@ on: - master - 1.2.x +env: + PYTEST_WORKERS: "auto" + PANDAS_CI: 1 + jobs: pytest: runs-on: ubuntu-latest @@ -24,7 +28,6 @@ jobs: fail-fast: true env: COVERAGE: true - PYTEST_WORKERS: "auto" ENV_FILE: ${{ matrix.env-file[0] }} PATTERN: ${{ matrix.env-file[1] }} EXTRA_APT: ${{ matrix.env-file[2] }} @@ -76,7 +79,6 @@ jobs: - name: Upload coverage to Codecov uses: codecov/codecov-action@v1 with: - files: /tmp/test_coverage.xml flags: unittests name: codecov-pandas fail_ci_if_error: true diff --git a/ci/run_tests.sh b/ci/run_tests.sh index 593939431d5eb..01940b7b29593 100755 --- a/ci/run_tests.sh +++ b/ci/run_tests.sh @@ -10,8 +10,7 @@ if [[ "not network" == *"$PATTERN"* ]]; then fi if [ "$COVERAGE" ]; then - COVERAGE_FNAME="/tmp/test_coverage.xml" - COVERAGE="-s --cov=pandas --cov-report=xml:$COVERAGE_FNAME" + COVERAGE="-s --cov=pandas --cov-report=xml" fi # If no X server is found, we use xvfb to emulate it From 815fd04e8463c0276b174f096d915023b715c3ad Mon Sep 17 00:00:00 2001 From: Marco Gorelli Date: Sat, 13 Mar 2021 16:06:18 +0000 Subject: [PATCH 29/36] put the rest --- .github/workflows/posix.yml | 25 +++++++++++++------ ci/azure/posix.yml | 7 ------ ..._slow.yaml => actions-37-locale_slow.yaml} | 1 - ....yaml => actions-37-minimum_versions.yaml} | 1 - ...zure-37-slow.yaml => actions-37-slow.yaml} | 1 - ci/deps/{azure-37.yaml => actions-37.yaml} | 1 - ...-38-locale.yaml => actions-38-locale.yaml} | 1 - ...numpydev.yaml => actions-38-numpydev.yaml} | 1 - ...zure-38-slow.yaml => actions-38-slow.yaml} | 0 ci/deps/{azure-38.yaml => actions-38.yaml} | 1 - ci/deps/{azure-39.yaml => actions-39.yaml} | 1 - 11 files changed, 17 insertions(+), 23 deletions(-) rename ci/deps/{azure-37-locale_slow.yaml => actions-37-locale_slow.yaml} (94%) rename ci/deps/{azure-37-minimum_versions.yaml => actions-37-minimum_versions.yaml} (95%) rename ci/deps/{azure-37-slow.yaml => actions-37-slow.yaml} (95%) rename ci/deps/{azure-37.yaml => actions-37.yaml} (93%) rename ci/deps/{azure-38-locale.yaml => actions-38-locale.yaml} (95%) rename ci/deps/{azure-38-numpydev.yaml => actions-38-numpydev.yaml} (94%) rename ci/deps/{azure-38-slow.yaml => actions-38-slow.yaml} (100%) rename ci/deps/{azure-38.yaml => actions-38.yaml} (91%) rename ci/deps/{azure-39.yaml => actions-39.yaml} (92%) diff --git a/.github/workflows/posix.yml b/.github/workflows/posix.yml index 1d7ac0c39b315..3ed25a5a95c76 100644 --- a/.github/workflows/posix.yml +++ b/.github/workflows/posix.yml @@ -20,18 +20,27 @@ jobs: shell: bash -l {0} strategy: matrix: - env-file: [ - [ci/deps/azure-37-minimum_versions.yaml, "not slow and not network and not clipboard", ""], - [ci/deps/azure-37.yaml, "not slow and not network and not clipboard", ""], - [ci/deps/azure-37-locale_slow.yaml, "slow", "language-pack-it xsel"] + settings: [ + [ci/deps/actions-37-minimum_versions.yaml, "not slow and not network and not clipboard", "", "", "", "", ""], + [ci/deps/actions-37.yaml, "not slow and not network and not clipboard", "", "", "", "", ""], + [ci/deps/actions-37-locale_slow.yaml, "slow", "language-pack-it xsel", "it_IT.utf8", "it_IT.utf8", "", ""], + [ci/deps/actions-37-slow.yaml, "slow", "", "", "", "", ""], + [ci/deps/actions-38.yaml, "not slow and not network and not clipboard", "", "", "", "", ""], + [ci/deps/actions-38-slow.yaml, "slow", "", "", "", "", ""], + [ci/deps/actions-38-locale.yaml, "not slow and not network", "language-pack-zh-hans xsel", "zh_CN.utf8", "zh_CN.utf8", "", ""], + [ci/deps/actions-38-numpydev.yaml, "not slow and not network", "xsel", "", "", "deprecate", "-W error"], + [ci/deps/actions-39.yaml, "not slow and not network and not clipboard", "", "", "", "", ""] ] fail-fast: true env: COVERAGE: true - ENV_FILE: ${{ matrix.env-file[0] }} - PATTERN: ${{ matrix.env-file[1] }} - EXTRA_APT: ${{ matrix.env-file[2] }} - + ENV_FILE: ${{ matrix.settings[0] }} + PATTERN: ${{ matrix.settings[1] }} + EXTRA_APT: ${{ matrix.settings[2] }} + LANG: ${{ matrix.settings[3] }} + LC_ALL: ${{ matrix.settings[4] }} + PANDAS_TESTING_MODE: ${{ matrix.settings[5] }} + TEST_ARGS: ${{ matrix.settings[6] }} steps: - name: Checkout diff --git a/ci/azure/posix.yml b/ci/azure/posix.yml index 5c6504c34ca3c..2caacf3a07290 100644 --- a/ci/azure/posix.yml +++ b/ci/azure/posix.yml @@ -15,13 +15,6 @@ jobs: PATTERN: "not slow and not network" steps: - - script: | - if [ "$(uname)" == "Linux" ]; then - sudo apt-get update - sudo apt-get install -y libc6-dev-i386 $EXTRA_APT - fi - displayName: 'Install extra packages' - - script: echo '##vso[task.prependpath]$(HOME)/miniconda3/bin' displayName: 'Set conda path' diff --git a/ci/deps/azure-37-locale_slow.yaml b/ci/deps/actions-37-locale_slow.yaml similarity index 94% rename from ci/deps/azure-37-locale_slow.yaml rename to ci/deps/actions-37-locale_slow.yaml index 82a8a9f0ae492..d9ad1f538908e 100644 --- a/ci/deps/azure-37-locale_slow.yaml +++ b/ci/deps/actions-37-locale_slow.yaml @@ -11,7 +11,6 @@ dependencies: - pytest-cov - pytest-xdist>=1.21 - hypothesis>=3.58.0 - - pytest-azurepipelines # pandas dependencies - beautifulsoup4=4.6.0 diff --git a/ci/deps/azure-37-minimum_versions.yaml b/ci/deps/actions-37-minimum_versions.yaml similarity index 95% rename from ci/deps/azure-37-minimum_versions.yaml rename to ci/deps/actions-37-minimum_versions.yaml index 16e34f2812f42..e14e51a36be31 100644 --- a/ci/deps/azure-37-minimum_versions.yaml +++ b/ci/deps/actions-37-minimum_versions.yaml @@ -10,7 +10,6 @@ dependencies: - pytest-cov - pytest-xdist>=1.21 - hypothesis>=3.58.0 - - pytest-azurepipelines - psutil # pandas dependencies diff --git a/ci/deps/azure-37-slow.yaml b/ci/deps/actions-37-slow.yaml similarity index 95% rename from ci/deps/azure-37-slow.yaml rename to ci/deps/actions-37-slow.yaml index fcacdaf632766..573ff7f02c162 100644 --- a/ci/deps/azure-37-slow.yaml +++ b/ci/deps/actions-37-slow.yaml @@ -11,7 +11,6 @@ dependencies: - pytest-cov - pytest-xdist>=1.21 - hypothesis>=3.58.0 - - pytest-azurepipelines # pandas dependencies - beautifulsoup4 diff --git a/ci/deps/azure-37.yaml b/ci/deps/actions-37.yaml similarity index 93% rename from ci/deps/azure-37.yaml rename to ci/deps/actions-37.yaml index 58239bb83b984..61f431256dd4a 100644 --- a/ci/deps/azure-37.yaml +++ b/ci/deps/actions-37.yaml @@ -11,7 +11,6 @@ dependencies: - pytest-cov - pytest-xdist>=1.21 - hypothesis>=3.58.0 - - pytest-azurepipelines # pandas dependencies - botocore>=1.11 diff --git a/ci/deps/azure-38-locale.yaml b/ci/deps/actions-38-locale.yaml similarity index 95% rename from ci/deps/azure-38-locale.yaml rename to ci/deps/actions-38-locale.yaml index f39197ad256d6..629804c71e726 100644 --- a/ci/deps/azure-38-locale.yaml +++ b/ci/deps/actions-38-locale.yaml @@ -11,7 +11,6 @@ dependencies: - pytest-xdist>=1.21 - pytest-asyncio>=0.12.0 - hypothesis>=3.58.0 - - pytest-azurepipelines # pandas dependencies - beautifulsoup4 diff --git a/ci/deps/azure-38-numpydev.yaml b/ci/deps/actions-38-numpydev.yaml similarity index 94% rename from ci/deps/azure-38-numpydev.yaml rename to ci/deps/actions-38-numpydev.yaml index 88ecd91eaf78c..e7ee6ccfd7bac 100644 --- a/ci/deps/azure-38-numpydev.yaml +++ b/ci/deps/actions-38-numpydev.yaml @@ -9,7 +9,6 @@ dependencies: - pytest-cov - pytest-xdist>=1.21 - hypothesis>=3.58.0 - - pytest-azurepipelines # pandas dependencies - pytz diff --git a/ci/deps/azure-38-slow.yaml b/ci/deps/actions-38-slow.yaml similarity index 100% rename from ci/deps/azure-38-slow.yaml rename to ci/deps/actions-38-slow.yaml diff --git a/ci/deps/azure-38.yaml b/ci/deps/actions-38.yaml similarity index 91% rename from ci/deps/azure-38.yaml rename to ci/deps/actions-38.yaml index 0eb599d4a3547..e2660d07c3558 100644 --- a/ci/deps/azure-38.yaml +++ b/ci/deps/actions-38.yaml @@ -11,7 +11,6 @@ dependencies: - pytest-cov - pytest-xdist>=1.21 - hypothesis>=3.58.0 - - pytest-azurepipelines # pandas dependencies - numpy diff --git a/ci/deps/azure-39.yaml b/ci/deps/actions-39.yaml similarity index 92% rename from ci/deps/azure-39.yaml rename to ci/deps/actions-39.yaml index fa49641914fdc..36e8bf528fc3e 100644 --- a/ci/deps/azure-39.yaml +++ b/ci/deps/actions-39.yaml @@ -10,7 +10,6 @@ dependencies: - pytest-cov - pytest-xdist>=1.21 - hypothesis>=3.58.0 - - pytest-azurepipelines # pandas dependencies - numpy From 97d0dc0768b412d7d1671b04b84f9d3fda49cc53 Mon Sep 17 00:00:00 2001 From: Marco Gorelli Date: Sat, 13 Mar 2021 16:13:21 +0000 Subject: [PATCH 30/36] remove linux job from azure-pipelines.yml --- azure-pipelines.yml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 464bad7884362..56da4e87f2709 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -17,11 +17,6 @@ jobs: name: macOS vmImage: macOS-10.14 -- template: ci/azure/posix.yml - parameters: - name: Linux - vmImage: ubuntu-16.04 - - template: ci/azure/windows.yml parameters: name: Windows From ba9f12d5618f2c305a0af2365e7c861c980fffaa Mon Sep 17 00:00:00 2001 From: Marco Gorelli Date: Sat, 13 Mar 2021 16:38:29 +0000 Subject: [PATCH 31/36] remove linux job from azure-pipelines.yml --- codecov.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/codecov.yml b/codecov.yml index 6dd1e33a7a671..893e40db004a6 100644 --- a/codecov.yml +++ b/codecov.yml @@ -1,6 +1,7 @@ codecov: branch: master - + notify: + after_n_builds: 10 comment: false coverage: From 7f5052e0aeb6008ec3d288ff321997f66d7df677 Mon Sep 17 00:00:00 2001 From: Marco Gorelli Date: Sat, 13 Mar 2021 16:43:41 +0000 Subject: [PATCH 32/36] remove linux job from azure-pipelines.yml --- pandas/core/internals/blocks.py | 2 +- pandas/io/pytables.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pandas/core/internals/blocks.py b/pandas/core/internals/blocks.py index 3d6d92579538e..b1a552cff2274 100644 --- a/pandas/core/internals/blocks.py +++ b/pandas/core/internals/blocks.py @@ -833,7 +833,7 @@ def _replace_list( rb = [self if inplace else self.copy()] for i, (src, dest) in enumerate(pairs): - new_rb: List[Block] = [] + new_rb: List["Block"] = [] for blk in rb: m = masks[i] convert = i == src_len # only convert once at the end diff --git a/pandas/io/pytables.py b/pandas/io/pytables.py index 99931123b0c81..02a723902271e 100644 --- a/pandas/io/pytables.py +++ b/pandas/io/pytables.py @@ -4058,7 +4058,7 @@ def get_blk_items(mgr): tuple(b_items.tolist()): (b, b_items) for b, b_items in zip(blocks, blk_items) } - new_blocks: List[Block] = [] + new_blocks: List["Block"] = [] new_blk_items = [] for ea in values_axes: items = tuple(ea.values) From d804bcd98d56f2fc5f3663b150526fe3496afbaf Mon Sep 17 00:00:00 2001 From: Marco Gorelli Date: Sat, 13 Mar 2021 17:28:51 +0000 Subject: [PATCH 33/36] dont fail fast --- .github/workflows/posix.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/posix.yml b/.github/workflows/posix.yml index 3ed25a5a95c76..f2acbecb9f574 100644 --- a/.github/workflows/posix.yml +++ b/.github/workflows/posix.yml @@ -31,7 +31,7 @@ jobs: [ci/deps/actions-38-numpydev.yaml, "not slow and not network", "xsel", "", "", "deprecate", "-W error"], [ci/deps/actions-39.yaml, "not slow and not network and not clipboard", "", "", "", "", ""] ] - fail-fast: true + fail-fast: false env: COVERAGE: true ENV_FILE: ${{ matrix.settings[0] }} From dbfb5b562373ca2f4f3cc4f4486405a3b0fbef7e Mon Sep 17 00:00:00 2001 From: Marco Gorelli Date: Sat, 13 Mar 2021 17:31:28 +0000 Subject: [PATCH 34/36] dont fail fast --- .github/workflows/posix.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/posix.yml b/.github/workflows/posix.yml index f2acbecb9f574..cdafeaeff7f08 100644 --- a/.github/workflows/posix.yml +++ b/.github/workflows/posix.yml @@ -90,4 +90,4 @@ jobs: with: flags: unittests name: codecov-pandas - fail_ci_if_error: true + fail_ci_if_error: false From 66f46df80bca52874c79aa3aa6cc1762b014cc70 Mon Sep 17 00:00:00 2001 From: Marco Gorelli Date: Sat, 13 Mar 2021 19:32:29 +0000 Subject: [PATCH 35/36] resize differently --- pandas/plotting/_matplotlib/misc.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pandas/plotting/_matplotlib/misc.py b/pandas/plotting/_matplotlib/misc.py index 3d5f4af72db6c..eab5474fce541 100644 --- a/pandas/plotting/_matplotlib/misc.py +++ b/pandas/plotting/_matplotlib/misc.py @@ -246,7 +246,7 @@ def f(t): # appropriately. Take a copy of amplitudes as otherwise numpy # deletes the element from amplitudes itself. coeffs = np.delete(np.copy(amplitudes), 0) - coeffs.resize(int((coeffs.size + 1) / 2), 2) + coeffs = np.resize(coeffs, (int((coeffs.size + 1) / 2), 2)) # Generate the harmonics and arguments for the sin and cos # functions. From a56b0a853e1b8d49ffa7975aa0a21383666dbc05 Mon Sep 17 00:00:00 2001 From: Marco Gorelli Date: Mon, 15 Mar 2021 18:49:24 +0000 Subject: [PATCH 36/36] share ci/deps/ --- .github/workflows/database.yml | 7 +++++++ .github/workflows/posix.yml | 20 ++++++++++---------- ci/run_tests.sh | 6 ------ 3 files changed, 17 insertions(+), 16 deletions(-) diff --git a/.github/workflows/database.yml b/.github/workflows/database.yml index a25b9c8eb1f88..a30dbc048c03d 100644 --- a/.github/workflows/database.yml +++ b/.github/workflows/database.yml @@ -92,6 +92,13 @@ jobs: - name: Print skipped tests run: python ci/print_skipped.py + - name: Upload coverage to Codecov + uses: codecov/codecov-action@v1 + with: + flags: unittests + name: codecov-pandas + fail_ci_if_error: false + Linux_py37_cov: runs-on: ubuntu-latest defaults: diff --git a/.github/workflows/posix.yml b/.github/workflows/posix.yml index cdafeaeff7f08..34e6c2c9d94ce 100644 --- a/.github/workflows/posix.yml +++ b/.github/workflows/posix.yml @@ -21,20 +21,20 @@ jobs: strategy: matrix: settings: [ - [ci/deps/actions-37-minimum_versions.yaml, "not slow and not network and not clipboard", "", "", "", "", ""], - [ci/deps/actions-37.yaml, "not slow and not network and not clipboard", "", "", "", "", ""], - [ci/deps/actions-37-locale_slow.yaml, "slow", "language-pack-it xsel", "it_IT.utf8", "it_IT.utf8", "", ""], - [ci/deps/actions-37-slow.yaml, "slow", "", "", "", "", ""], - [ci/deps/actions-38.yaml, "not slow and not network and not clipboard", "", "", "", "", ""], - [ci/deps/actions-38-slow.yaml, "slow", "", "", "", "", ""], - [ci/deps/actions-38-locale.yaml, "not slow and not network", "language-pack-zh-hans xsel", "zh_CN.utf8", "zh_CN.utf8", "", ""], - [ci/deps/actions-38-numpydev.yaml, "not slow and not network", "xsel", "", "", "deprecate", "-W error"], - [ci/deps/actions-39.yaml, "not slow and not network and not clipboard", "", "", "", "", ""] + [actions-37-minimum_versions.yaml, "not slow and not network and not clipboard", "", "", "", "", ""], + [actions-37.yaml, "not slow and not network and not clipboard", "", "", "", "", ""], + [actions-37-locale_slow.yaml, "slow", "language-pack-it xsel", "it_IT.utf8", "it_IT.utf8", "", ""], + [actions-37-slow.yaml, "slow", "", "", "", "", ""], + [actions-38.yaml, "not slow and not network and not clipboard", "", "", "", "", ""], + [actions-38-slow.yaml, "slow", "", "", "", "", ""], + [actions-38-locale.yaml, "not slow and not network", "language-pack-zh-hans xsel", "zh_CN.utf8", "zh_CN.utf8", "", ""], + [actions-38-numpydev.yaml, "not slow and not network", "xsel", "", "", "deprecate", "-W error"], + [actions-39.yaml, "not slow and not network and not clipboard", "", "", "", "", ""] ] fail-fast: false env: COVERAGE: true - ENV_FILE: ${{ matrix.settings[0] }} + ENV_FILE: ci/deps/${{ matrix.settings[0] }} PATTERN: ${{ matrix.settings[1] }} EXTRA_APT: ${{ matrix.settings[2] }} LANG: ${{ matrix.settings[3] }} diff --git a/ci/run_tests.sh b/ci/run_tests.sh index 01940b7b29593..ec4c87e8c91b0 100755 --- a/ci/run_tests.sh +++ b/ci/run_tests.sh @@ -29,9 +29,3 @@ fi echo $PYTEST_CMD sh -c "$PYTEST_CMD" - -if [[ "$COVERAGE" && $? == 0 && "$TRAVIS_BRANCH" == "master" ]]; then - echo "uploading coverage" - echo "bash <(curl -s https://codecov.io/bash) -Z -c -f $COVERAGE_FNAME" - bash <(curl -s https://codecov.io/bash) -Z -c -f $COVERAGE_FNAME -fi