Skip to content

CI: Py3.5 / numpy 1.10 testing #11439

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.

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

Merged
merged 2 commits into from
Oct 27, 2015
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion ci/requirements-3.5.build
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
python-dateutil
pytz
numpy=1.9.3
numpy
cython
2 changes: 1 addition & 1 deletion ci/requirements-3.5.run
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
python-dateutil
pytz
numpy=1.9.3
numpy
openpyxl
xlsxwriter
xlrd
Expand Down
6 changes: 1 addition & 5 deletions pandas/tests/test_categorical.py
Original file line number Diff line number Diff line change
Expand Up @@ -87,11 +87,7 @@ def test_constructor_unsortable(self):
self.assertFalse(factor.ordered)

# this however will raise as cannot be sorted
# but fixed in newer versions of numpy
if LooseVersion(np.__version__) < "1.10":
self.assertRaises(TypeError, lambda : Categorical.from_array(arr, ordered=True))
else:
Categorical.from_array(arr, ordered=True)
self.assertRaises(TypeError, lambda : Categorical.from_array(arr, ordered=True))

def test_is_equal_dtype(self):

Expand Down