Skip to content

CI: remove fixed conda version #18994

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 2 commits into from
Closed

CI: remove fixed conda version #18994

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
adbf267
CI: remove fixed conda version
jreback Dec 29, 2017
6ed8a17
TST: skip some numpy < 1.11 tests
jreback Dec 29, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 0 additions & 5 deletions ci/install_travis.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 4 additions & 0 deletions pandas/tests/test_expressions.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -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)

Expand Down Expand Up @@ -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,
Expand Down