From 35cafbdd68f9455fab039ca550fda878e160ccfe Mon Sep 17 00:00:00 2001 From: Jeff Reback Date: Sun, 12 Nov 2017 17:57:50 -0500 Subject: [PATCH] CI: move clipboard tests to an allowed-failure test CI: change 2.7-build_test -> 3.6-build_test --- .travis.yml | 20 +++++++++---------- ci/requirements-2.7_BUILD_TEST.build | 6 ------ ci/requirements-3.6_BUILD_TEST.build | 6 ++++++ ...ST.pip => requirements-3.6_BUILD_TEST.pip} | 0 ...TEST.sh => requirements-3.6_BUILD_TEST.sh} | 2 +- ci/script_multi.sh | 5 +++++ 6 files changed, 22 insertions(+), 17 deletions(-) delete mode 100644 ci/requirements-2.7_BUILD_TEST.build create mode 100644 ci/requirements-3.6_BUILD_TEST.build rename ci/{requirements-2.7_BUILD_TEST.pip => requirements-3.6_BUILD_TEST.pip} (100%) rename ci/{requirements-2.7_BUILD_TEST.sh => requirements-3.6_BUILD_TEST.sh} (75%) mode change 100755 => 100644 diff --git a/.travis.yml b/.travis.yml index 42b4ef0396fc8..0f43e4cf54faa 100644 --- a/.travis.yml +++ b/.travis.yml @@ -52,10 +52,6 @@ matrix: - dist: trusty env: - JOB="3.5" TEST_ARGS="--skip-slow --skip-network" COVERAGE=true - addons: - apt: - packages: - - xsel - dist: trusty env: - JOB="3.6" TEST_ARGS="--skip-slow --skip-network" PANDAS_TESTING_MODE="deprecate" CONDA_FORGE=true @@ -66,7 +62,11 @@ matrix: # In allow_failures - dist: trusty env: - - JOB="2.7_BUILD_TEST" TEST_ARGS="--skip-slow" BUILD_TEST=true + - JOB="3.6_BUILD_TEST" TEST_ARGS="--skip-slow" BUILD_TEST=true + addons: + apt: + packages: + - xsel # In allow_failures - dist: trusty env: @@ -75,17 +75,17 @@ matrix: - dist: trusty env: - JOB="3.6_DOC" DOC=true - addons: - apt: - packages: - - xsel allow_failures: - dist: trusty env: - JOB="2.7_SLOW" SLOW=true - dist: trusty env: - - JOB="2.7_BUILD_TEST" TEST_ARGS="--skip-slow" BUILD_TEST=true + - JOB="3.6_BUILD_TEST" TEST_ARGS="--skip-slow" BUILD_TEST=true + addons: + apt: + packages: + - xsel - dist: trusty env: - JOB="3.6_NUMPY_DEV" TEST_ARGS="--skip-slow --skip-network" PANDAS_TESTING_MODE="deprecate" diff --git a/ci/requirements-2.7_BUILD_TEST.build b/ci/requirements-2.7_BUILD_TEST.build deleted file mode 100644 index aadec00cb7ebf..0000000000000 --- a/ci/requirements-2.7_BUILD_TEST.build +++ /dev/null @@ -1,6 +0,0 @@ -python=2.7* -dateutil -pytz -nomkl -numpy -cython diff --git a/ci/requirements-3.6_BUILD_TEST.build b/ci/requirements-3.6_BUILD_TEST.build new file mode 100644 index 0000000000000..1c4b46aea3865 --- /dev/null +++ b/ci/requirements-3.6_BUILD_TEST.build @@ -0,0 +1,6 @@ +python=3.6* +python-dateutil +pytz +nomkl +numpy +cython diff --git a/ci/requirements-2.7_BUILD_TEST.pip b/ci/requirements-3.6_BUILD_TEST.pip similarity index 100% rename from ci/requirements-2.7_BUILD_TEST.pip rename to ci/requirements-3.6_BUILD_TEST.pip diff --git a/ci/requirements-2.7_BUILD_TEST.sh b/ci/requirements-3.6_BUILD_TEST.sh old mode 100755 new mode 100644 similarity index 75% rename from ci/requirements-2.7_BUILD_TEST.sh rename to ci/requirements-3.6_BUILD_TEST.sh index 78941fd0944e5..84dd27c50d587 --- a/ci/requirements-2.7_BUILD_TEST.sh +++ b/ci/requirements-3.6_BUILD_TEST.sh @@ -2,6 +2,6 @@ source activate pandas -echo "install 27 BUILD_TEST" +echo "install 36 BUILD_TEST" conda install -n pandas -c conda-forge pyarrow dask diff --git a/ci/script_multi.sh b/ci/script_multi.sh index ee9fbcaad5ef5..863613e14af98 100755 --- a/ci/script_multi.sh +++ b/ci/script_multi.sh @@ -27,6 +27,11 @@ if [ "$BUILD_TEST" ]; then echo "[running]" cd /tmp unset PYTHONPATH + + echo "[build-test: single]" + python -c 'import pandas; pandas.test(["--skip-slow", "--skip-network", "-r xX", "-m single"])' + + echo "[build-test: not single]" python -c 'import pandas; pandas.test(["-n 2", "--skip-slow", "--skip-network", "-r xX", "-m not single"])' elif [ "$DOC" ]; then