From adbf26772ac6cb077d55d555fd158e7d54b341e4 Mon Sep 17 00:00:00 2001 From: Jeff Reback Date: Fri, 29 Dec 2017 13:01:07 -0500 Subject: [PATCH 1/2] CI: remove fixed conda version --- ci/install_travis.sh | 5 ----- 1 file changed, 5 deletions(-) diff --git a/ci/install_travis.sh b/ci/install_travis.sh index ab45b5113802c..272e7f2e05d14 100755 --- a/ci/install_travis.sh +++ b/ci/install_travis.sh @@ -56,11 +56,6 @@ 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 From 6ed8a176860374ac909f6ae0c2b053a819523f29 Mon Sep 17 00:00:00 2001 From: Jeff Reback Date: Fri, 29 Dec 2017 14:12:46 -0500 Subject: [PATCH 2/2] TST: skip some numpy < 1.11 tests closes #18992 --- pandas/tests/test_expressions.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pandas/tests/test_expressions.py b/pandas/tests/test_expressions.py index 6d2607962dfb0..da9ae03d05d88 100644 --- a/pandas/tests/test_expressions.py +++ b/pandas/tests/test_expressions.py @@ -17,6 +17,7 @@ from pandas.util.testing import (assert_almost_equal, assert_series_equal, assert_frame_equal, assert_panel_equal, assert_panel4d_equal) +from pandas.util._test_decorators import skip_if_no from pandas.io.formats.printing import pprint_thing import pandas.util.testing as tm @@ -107,6 +108,7 @@ def run_arithmetic(self, df, other, assert_func, check_dtype=False, pprint_thing("Failed test with operator %r" % op.__name__) raise + @skip_if_no("numpy", "1.11") def test_integer_arithmetic(self): self.run_arithmetic(self.integer, self.integer, assert_frame_equal) @@ -191,6 +193,7 @@ def run_panel(self, panel, other, binary_comp=None, run_binary=True, self.run_binary(panel, binary_comp, assert_func, test_flex=True, **kwargs) + @skip_if_no("numpy", "1.11") def test_integer_arithmetic_frame(self): self.run_frame(self.integer, self.integer) @@ -243,6 +246,7 @@ def test_mixed_arithmetic(self): self.run_arithmetic(self.mixed[col], self.mixed[col], assert_series_equal) + @skip_if_no("numpy", "1.11") def test_integer_with_zeros(self): self.integer *= np.random.randint(0, 2, size=np.shape(self.integer)) self.run_arithmetic(self.integer, self.integer,