Skip to content

CI: fix coverage file location #15792

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 7 additions & 26 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,17 +39,14 @@ matrix:
- TEST_ARGS="--skip-slow --skip-network"
- JOB_TAG=_OSX
- TRAVIS_PYTHON_VERSION=3.5
- CACHE_NAME="35_osx"
- USE_CACHE=true
- python: 2.7
env:
- PYTHON_VERSION=2.7
- JOB_NAME: "27_slow_nnet_LOCALE"
- TEST_ARGS="--only-slow --skip-network"
- LOCALE_OVERRIDE="zh_CN.UTF-8"
- FULL_DEPS=true
- JOB_TAG=_LOCALE
- CACHE_NAME="27_slow_nnet_LOCALE"
- USE_CACHE=true
addons:
apt:
Expand All @@ -60,10 +57,8 @@ matrix:
- PYTHON_VERSION=2.7
- JOB_NAME: "27_nslow"
- TEST_ARGS="--skip-slow"
- FULL_DEPS=true
- CLIPBOARD_GUI=gtk2
- LINT=true
- CACHE_NAME="27_nslow"
- USE_CACHE=true
addons:
apt:
Expand All @@ -74,10 +69,8 @@ matrix:
- PYTHON_VERSION=3.5
- JOB_NAME: "35_nslow"
- TEST_ARGS="--skip-slow --skip-network"
- FULL_DEPS=true
- CLIPBOARD=xsel
- COVERAGE=true
- CACHE_NAME="35_nslow"
- USE_CACHE=true
addons:
apt:
Expand All @@ -96,46 +89,39 @@ matrix:
packages:
- libatlas-base-dev
- gfortran
# In allow_failures
# In allow_failures
- python: 2.7
env:
- PYTHON_VERSION=2.7
- JOB_NAME: "27_slow"
- JOB_TAG=_SLOW
- TEST_ARGS="--only-slow --skip-network"
- FULL_DEPS=true
- CACHE_NAME="27_slow"
- USE_CACHE=true
# In allow_failures
# In allow_failures
- python: 2.7
env:
- PYTHON_VERSION=2.7
- JOB_NAME: "27_build_test"
- JOB_TAG=_BUILD_TEST
- TEST_ARGS="--skip-slow"
- FULL_DEPS=true
- BUILD_TEST=true
- CACHE_NAME="27_build_test"
- USE_CACHE=true
# In allow_failures
# In allow_failures
- python: 3.5
env:
- PYTHON_VERSION=3.5
- JOB_NAME: "35_numpy_dev"
- JOB_TAG=_NUMPY_DEV
- TEST_ARGS="--skip-slow --skip-network"
- PANDAS_TESTING_MODE="deprecate"
- CACHE_NAME="35_numpy_dev"
- USE_CACHE=true
# In allow_failures
# In allow_failures
- python: 3.5
env:
- PYTHON_VERSION=3.5
- JOB_NAME: "doc_build"
- FULL_DEPS=true
- DOC_BUILD=true
- JOB_TAG=_DOC_BUILD
- CACHE_NAME="doc_build"
- USE_CACHE=true
allow_failures:
- python: 2.7
Expand All @@ -144,18 +130,14 @@ matrix:
- JOB_NAME: "27_slow"
- JOB_TAG=_SLOW
- TEST_ARGS="--only-slow --skip-network"
- FULL_DEPS=true
- CACHE_NAME="27_slow"
- USE_CACHE=true
- python: 2.7
env:
- PYTHON_VERSION=2.7
- JOB_NAME: "27_build_test"
- JOB_TAG=_BUILD_TEST
- TEST_ARGS="--skip-slow"
- FULL_DEPS=true
- BUILD_TEST=true
- CACHE_NAME="27_build_test"
- USE_CACHE=true
- python: 3.5
env:
Expand All @@ -164,16 +146,13 @@ matrix:
- JOB_TAG=_NUMPY_DEV
- TEST_ARGS="--skip-slow --skip-network"
- PANDAS_TESTING_MODE="deprecate"
- CACHE_NAME="35_numpy_dev"
- USE_CACHE=true
- python: 3.5
env:
- PYTHON_VERSION=3.5
- JOB_NAME: "doc_build"
- FULL_DEPS=true
- DOC_BUILD=true
- JOB_TAG=_DOC_BUILD
- CACHE_NAME="doc_build"
- USE_CACHE=true

before_install:
Expand Down Expand Up @@ -209,7 +188,9 @@ script:
- echo "script done"

after_success:
- source activate pandas && codecov
- if [ "$COVERAGE" ]; then
source activate pandas && codecov --file /tmp/cov-single.xml /tmp/cov-multiple.xml;
fi

after_script:
- echo "after_script start"
Expand Down
4 changes: 2 additions & 2 deletions ci/script_multi.sh
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@ if [ "$BUILD_TEST" ]; then
cd /tmp
python -c "import pandas; pandas.test(['-n 2'])"
elif [ "$COVERAGE" ]; then
echo pytest -s -n 2 -m "not single" --cov=pandas --cov-append --cov-report xml:/tmp/cov.xml --junitxml=/tmp/multiple.xml $TEST_ARGS pandas
pytest -s -n 2 -m "not single" --cov=pandas --cov-append --cov-report xml:/tmp/cov.xml --junitxml=/tmp/multiple.xml $TEST_ARGS pandas
echo pytest -s -n 2 -m "not single" --cov=pandas --cov-report xml:/tmp/cov-multiple.xml --junitxml=/tmp/multiple.xml $TEST_ARGS pandas
pytest -s -n 2 -m "not single" --cov=pandas --cov-report xml:/tmp/cov-multiple.xml --junitxml=/tmp/multiple.xml $TEST_ARGS pandas
else
echo pytest -n 2 -m "not single" --junitxml=/tmp/multiple.xml $TEST_ARGS pandas
pytest -n 2 -m "not single" --junitxml=/tmp/multiple.xml $TEST_ARGS pandas # TODO: doctest
Expand Down
4 changes: 2 additions & 2 deletions ci/script_single.sh
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ fi
if [ "$BUILD_TEST" ]; then
echo "We are not running pytest as this is simply a build test."
elif [ "$COVERAGE" ]; then
echo pytest -s -m "single" --cov=pandas --cov-report xml:/tmp/cov.xml --junitxml=/tmp/single.xml $TEST_ARGS pandas
pytest -s -m "single" --cov=pandas --cov-report xml:/tmp/cov.xml --junitxml=/tmp/single.xml $TEST_ARGS pandas
echo pytest -s -m "single" --cov=pandas --cov-report xml:/tmp/cov-single.xml --junitxml=/tmp/single.xml $TEST_ARGS pandas
pytest -s -m "single" --cov=pandas --cov-report xml:/tmp/cov-single.xml --junitxml=/tmp/single.xml $TEST_ARGS pandas
else
echo pytest -m "single" --junitxml=/tmp/single.xml $TEST_ARGS pandas
pytest -m "single" --junitxml=/tmp/single.xml $TEST_ARGS pandas # TODO: doctest
Expand Down