From d1012f64360b5f0c0ec8a32a1d28e9d8d96a5857 Mon Sep 17 00:00:00 2001 From: Tom Augspurger Date: Fri, 29 Dec 2017 13:13:54 -0600 Subject: [PATCH 1/2] TST: Remove pow test in expressions These are already skipped for NumPy>=1.12, and buggy for NumPy 1.10.4 --- pandas/tests/test_expressions.py | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/pandas/tests/test_expressions.py b/pandas/tests/test_expressions.py index 6d2607962dfb0..aebc9cd3deaac 100644 --- a/pandas/tests/test_expressions.py +++ b/pandas/tests/test_expressions.py @@ -73,17 +73,11 @@ def teardown_method(self, method): def run_arithmetic(self, df, other, assert_func, check_dtype=False, test_flex=True): expr._MIN_ELEMENTS = 0 - operations = ['add', 'sub', 'mul', 'mod', 'truediv', 'floordiv', 'pow'] + operations = ['add', 'sub', 'mul', 'mod', 'truediv', 'floordiv'] if not compat.PY3: operations.append('div') for arith in operations: - # numpy >= 1.11 doesn't handle integers - # raised to integer powers - # https://github.com/pandas-dev/pandas/issues/15363 - if arith == 'pow' and not _np_version_under1p11: - continue - operator_name = arith if arith == 'div': operator_name = 'truediv' From e35a0cad6bf85bf2929801de6cb2fca5226722a5 Mon Sep 17 00:00:00 2001 From: Jeff Reback Date: Fri, 29 Dec 2017 13:01:07 -0500 Subject: [PATCH 2/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