Skip to content

Commit

Permalink
BLD: fix conda to 4.3.30 (pandas-dev#18893)
Browse files Browse the repository at this point in the history
CI: move 3.5 conda build to allowed_failures

closes pandas-dev#18870 for abspath
  • Loading branch information
jreback authored Dec 21, 2017
1 parent f833103 commit ff865b4
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 5 deletions.
5 changes: 5 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
5 changes: 5 additions & 0 deletions ci/install_travis.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
8 changes: 3 additions & 5 deletions pandas/tests/io/test_common.py
Original file line number Diff line number Diff line change
Expand Up @@ -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):
Expand Down Expand Up @@ -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')),
Expand Down

0 comments on commit ff865b4

Please sign in to comment.