Skip to content

Commit ff865b4

Browse files
authored
BLD: fix conda to 4.3.30 (#18893)
CI: move 3.5 conda build to allowed_failures closes #18870 for abspath
1 parent f833103 commit ff865b4

File tree

3 files changed

+13
-5
lines changed

3 files changed

+13
-5
lines changed

.travis.yml

+5
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@ matrix:
4949
apt:
5050
packages:
5151
- python-gtk2
52+
# In allow_failures
5253
- dist: trusty
5354
env:
5455
- JOB="3.5_CONDA_BUILD_TEST" TEST_ARGS="--skip-slow --skip-network" CONDA_BUILD_TEST=true COVERAGE=true
@@ -76,6 +77,10 @@ matrix:
7677
env:
7778
- JOB="3.6_DOC" DOC=true
7879
allow_failures:
80+
# TODO(jreback)
81+
- dist: trusty
82+
env:
83+
- JOB="3.5_CONDA_BUILD_TEST" TEST_ARGS="--skip-slow --skip-network" CONDA_BUILD_TEST=true COVERAGE=true
7984
- dist: trusty
8085
env:
8186
- JOB="2.7_SLOW" SLOW=true

ci/install_travis.sh

+5
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,11 @@ if [ "$CONDA_BUILD_TEST" ]; then
5656
conda install conda-build
5757
fi
5858

59+
# TODO(jreback)
60+
echo
61+
echo "[fix conda version]"
62+
conda install conda=4.3.30
63+
5964
echo
6065
echo "[add channels]"
6166
conda config --remove channels defaults || exit 1

pandas/tests/io/test_common.py

+3-5
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ def __fspath__(self):
4040
except ImportError:
4141
pass
4242

43-
HERE = os.path.dirname(__file__)
43+
HERE = os.path.abspath(os.path.dirname(__file__))
4444

4545

4646
class TestCommonIOCapabilities(object):
@@ -150,10 +150,8 @@ def test_read_non_existant(self, reader, module, error_class, fn_ext):
150150
(pd.read_fwf, 'os', os.path.join(HERE, 'data',
151151
'fixed_width_format.txt')),
152152
(pd.read_excel, 'xlrd', os.path.join(HERE, 'data', 'test1.xlsx')),
153-
154-
# TODO(jreback) gh-18873
155-
# (pd.read_feather, 'feather', os.path.join(HERE, 'data',
156-
# 'feather-0_3_1.feather')),
153+
(pd.read_feather, 'feather', os.path.join(HERE, 'data',
154+
'feather-0_3_1.feather')),
157155
(pd.read_hdf, 'tables', os.path.join(HERE, 'data', 'legacy_hdf',
158156
'datetimetz_object.h5')),
159157
(pd.read_stata, 'os', os.path.join(HERE, 'data', 'stata10_115.dta')),

0 commit comments

Comments
 (0)