From ff865b464d6d0edf3dad6fc8a01c0e8f0a6528ca Mon Sep 17 00:00:00 2001 From: Jeff Reback Date: Thu, 21 Dec 2017 08:43:31 -0500 Subject: [PATCH] BLD: fix conda to 4.3.30 (#18893) CI: move 3.5 conda build to allowed_failures closes #18870 for abspath --- .travis.yml | 5 +++++ ci/install_travis.sh | 5 +++++ pandas/tests/io/test_common.py | 8 +++----- 3 files changed, 13 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index 9eccf87960dd0..ea9d4307d6bf1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -49,6 +49,7 @@ matrix: apt: packages: - python-gtk2 + # In allow_failures - dist: trusty env: - JOB="3.5_CONDA_BUILD_TEST" TEST_ARGS="--skip-slow --skip-network" CONDA_BUILD_TEST=true COVERAGE=true @@ -76,6 +77,10 @@ matrix: env: - JOB="3.6_DOC" DOC=true allow_failures: + # TODO(jreback) + - dist: trusty + env: + - JOB="3.5_CONDA_BUILD_TEST" TEST_ARGS="--skip-slow --skip-network" CONDA_BUILD_TEST=true COVERAGE=true - dist: trusty env: - JOB="2.7_SLOW" SLOW=true diff --git a/ci/install_travis.sh b/ci/install_travis.sh index 475fc6a46955d..800a20aa94b8f 100755 --- a/ci/install_travis.sh +++ b/ci/install_travis.sh @@ -56,6 +56,11 @@ if [ "$CONDA_BUILD_TEST" ]; then conda install conda-build fi +# TODO(jreback) +echo +echo "[fix conda version]" +conda install conda=4.3.30 + echo echo "[add channels]" conda config --remove channels defaults || exit 1 diff --git a/pandas/tests/io/test_common.py b/pandas/tests/io/test_common.py index 2d56e12533cd0..a0070dce6a7f1 100644 --- a/pandas/tests/io/test_common.py +++ b/pandas/tests/io/test_common.py @@ -40,7 +40,7 @@ def __fspath__(self): except ImportError: pass -HERE = os.path.dirname(__file__) +HERE = os.path.abspath(os.path.dirname(__file__)) class TestCommonIOCapabilities(object): @@ -150,10 +150,8 @@ def test_read_non_existant(self, reader, module, error_class, fn_ext): (pd.read_fwf, 'os', os.path.join(HERE, 'data', 'fixed_width_format.txt')), (pd.read_excel, 'xlrd', os.path.join(HERE, 'data', 'test1.xlsx')), - - # TODO(jreback) gh-18873 - # (pd.read_feather, 'feather', os.path.join(HERE, 'data', - # 'feather-0_3_1.feather')), + (pd.read_feather, 'feather', os.path.join(HERE, 'data', + 'feather-0_3_1.feather')), (pd.read_hdf, 'tables', os.path.join(HERE, 'data', 'legacy_hdf', 'datetimetz_object.h5')), (pd.read_stata, 'os', os.path.join(HERE, 'data', 'stata10_115.dta')),