Skip to content

Commit 5a6ddd8

Browse files
committed
fixup! ENH: Fix Pandas 0.19.2 compatibility issues
1 parent cbe5ff4 commit 5a6ddd8

File tree

3 files changed

+5
-7
lines changed

3 files changed

+5
-7
lines changed

tests/pipeline/test_blaze.py

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
from numpy.testing.utils import assert_array_almost_equal
1616
from odo import odo
1717
import pandas as pd
18-
from pandas.util.testing import assert_frame_equal
1918
from toolz import keymap, valmap, concatv
2019
from toolz.curried import operator as op
2120

@@ -39,7 +38,11 @@
3938
tmp_asset_finder,
4039
)
4140
from zipline.testing.fixtures import WithAssetFinder
42-
from zipline.testing.predicates import assert_equal, assert_isidentical
41+
from zipline.testing.predicates import (
42+
assert_equal,
43+
assert_frame_equal,
44+
assert_isidentical,
45+
)
4346
from zipline.utils.numpy_utils import float64_dtype, int64_dtype
4447
from zipline.utils.pandas_utils import empty_dataframe
4548

tests/test_examples.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,6 @@ def init_class_fixtures(cls):
4747
tar.extractall(cls.tmpdir.path)
4848

4949
cls.expected_perf = dataframe_cache(
50-
# Use a fixed pandas version until we are able to rebuild market
51-
# data with `rebuild_example_data`.
5250
cls.tmpdir.getpath('example_data/expected_perf/0-18-1'),
5351
serialization='pickle',
5452
)

zipline/testing/predicates.py

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -461,9 +461,6 @@ def _register_assert_equal_wrapper(type_, assert_eq):
461461
"""
462462
@assert_equal.register(type_, type_)
463463
def assert_ndframe_equal(result, expected, path=(), msg='', **kwargs):
464-
# By default, do not compare internal Categorical exactly
465-
if not 'check_categorical' in kwargs:
466-
kwargs['check_categorical'] = False
467464
try:
468465
assert_eq(
469466
result,

0 commit comments

Comments
 (0)