Skip to content

ENH Assert_frame_equal check_names to True #2964

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

Merged
merged 2 commits into from
Mar 7, 2013
Merged

ENH Assert_frame_equal check_names to True #2964

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
153077f
keep name after DataFrame drop, add check_name to assert_dataframe_equal
hayd Mar 2, 2013
be3d55d
default check_names to True, and fix calls where this is problematic
hayd Mar 4, 2013
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 pandas/core/frame.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2241,7 +2241,7 @@ def pop(self, item):
column : Series
"""
return NDFrame.pop(self, item)

# to support old APIs
@property
def _series(self):
Expand Down
9 changes: 7 additions & 2 deletions pandas/core/generic.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -340,7 +340,7 @@ def drop(self, labels, axis=0, level=None):
dropped : type of caller
"""
axis_name = self._get_axis_name(axis)
axis = self._get_axis(axis)
axis, axis_ = self._get_axis(axis), axis

if axis.is_unique:
if level is not None:
Expand All @@ -349,8 +349,13 @@ def drop(self, labels, axis=0, level=None):
new_axis = axis.drop(labels, level=level)
else:
new_axis = axis.drop(labels)
dropped = self.reindex(**{axis_name: new_axis})
try:
dropped.axes[axis_].names = axis.names
except AttributeError:
pass
return dropped

return self.reindex(**{axis_name: new_axis})
else:
if level is not None:
if not isinstance(axis, MultiIndex):
Expand Down
33 changes: 18 additions & 15 deletions pandas/io/tests/test_excel.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,8 +103,8 @@ def test_parse_cols_int(self):
df2 = df2.reindex(columns=['A', 'B', 'C'])
df3 = xls.parse('Sheet2', skiprows=[1], index_col=0,
parse_dates=True, parse_cols=3)
tm.assert_frame_equal(df, df2)
tm.assert_frame_equal(df3, df2)
tm.assert_frame_equal(df, df2, check_names=False) # TODO add index to xls file)
tm.assert_frame_equal(df3, df2, check_names=False)

def test_parse_cols_list(self):
_skip_if_no_openpyxl()
Expand All @@ -122,8 +122,8 @@ def test_parse_cols_list(self):
df3 = xls.parse('Sheet2', skiprows=[1], index_col=0,
parse_dates=True,
parse_cols=[0, 2, 3])
tm.assert_frame_equal(df, df2)
tm.assert_frame_equal(df3, df2)
tm.assert_frame_equal(df, df2, check_names=False) # TODO add index to xls file
tm.assert_frame_equal(df3, df2, check_names=False)

def test_parse_cols_str(self):
_skip_if_no_openpyxl()
Expand All @@ -142,8 +142,8 @@ def test_parse_cols_str(self):
df2 = df2.reindex(columns=['A', 'B', 'C'])
df3 = xls.parse('Sheet2', skiprows=[1], index_col=0,
parse_dates=True, parse_cols='A:D')
tm.assert_frame_equal(df, df2)
tm.assert_frame_equal(df3, df2)
tm.assert_frame_equal(df, df2, check_names=False) # TODO add index to xls, read xls ignores index name ?
tm.assert_frame_equal(df3, df2, check_names=False)
del df, df2, df3

df = xls.parse('Sheet1', index_col=0, parse_dates=True,
Expand All @@ -153,8 +153,8 @@ def test_parse_cols_str(self):
df3 = xls.parse('Sheet2', skiprows=[1], index_col=0,
parse_dates=True,
parse_cols='A,C,D')
tm.assert_frame_equal(df, df2)
tm.assert_frame_equal(df3, df2)
tm.assert_frame_equal(df, df2, check_names=False) # TODO add index to xls file
tm.assert_frame_equal(df3, df2, check_names=False)
del df, df2, df3

df = xls.parse('Sheet1', index_col=0, parse_dates=True,
Expand All @@ -164,8 +164,8 @@ def test_parse_cols_str(self):
df3 = xls.parse('Sheet2', skiprows=[1], index_col=0,
parse_dates=True,
parse_cols='A,C:D')
tm.assert_frame_equal(df, df2)
tm.assert_frame_equal(df3, df2)
tm.assert_frame_equal(df, df2, check_names=False)
tm.assert_frame_equal(df3, df2, check_names=False)

def test_excel_stop_iterator(self):
_skip_if_no_xlrd()
Expand All @@ -191,8 +191,8 @@ def test_excel_table(self):
df = xls.parse('Sheet1', index_col=0, parse_dates=True)
df2 = self.read_csv(self.csv1, index_col=0, parse_dates=True)
df3 = xls.parse('Sheet2', skiprows=[1], index_col=0, parse_dates=True)
tm.assert_frame_equal(df, df2)
tm.assert_frame_equal(df3, df2)
tm.assert_frame_equal(df, df2, check_names=False)
tm.assert_frame_equal(df3, df2, check_names=False)

df4 = xls.parse('Sheet1', index_col=0, parse_dates=True,
skipfooter=1)
Expand Down Expand Up @@ -224,8 +224,9 @@ def test_xlsx_table(self):
df = xlsx.parse('Sheet1', index_col=0, parse_dates=True)
df2 = self.read_csv(self.csv1, index_col=0, parse_dates=True)
df3 = xlsx.parse('Sheet2', skiprows=[1], index_col=0, parse_dates=True)
tm.assert_frame_equal(df, df2)
tm.assert_frame_equal(df3, df2)

tm.assert_frame_equal(df, df2, check_names=False) # TODO add index to xlsx file
tm.assert_frame_equal(df3, df2, check_names=False)

df4 = xlsx.parse('Sheet1', index_col=0, parse_dates=True,
skipfooter=1)
Expand Down Expand Up @@ -632,7 +633,9 @@ def _check_excel_multiindex_dates(self, ext):
tsframe.to_excel(path, 'test1', index_label=['time', 'foo'])
reader = ExcelFile(path)
recons = reader.parse('test1', index_col=[0, 1])
tm.assert_frame_equal(tsframe, recons)

tm.assert_frame_equal(tsframe, recons, check_names=False)
self.assertEquals(recons.index.names, ['time', 'foo'])

# infer index
tsframe.to_excel(path, 'test1')
Expand Down
13 changes: 8 additions & 5 deletions pandas/io/tests/test_parsers.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -514,6 +514,7 @@ def test_skiprows_bug(self):
columns=[1, 2, 3],
index=[datetime(2000, 1, 1), datetime(2000, 1, 2),
datetime(2000, 1, 3)])
expected.index.name = 0
tm.assert_frame_equal(data, expected)
tm.assert_frame_equal(data, data2)

Expand Down Expand Up @@ -627,7 +628,7 @@ def test_yy_format(self):
idx = DatetimeIndex([datetime(2009, 1, 31, 0, 10, 0),
datetime(2009, 2, 28, 10, 20, 0),
datetime(2009, 3, 31, 8, 30, 0)]).asobject
idx.name = 'date'
idx.name = 'date_time'
xp = DataFrame({'B': [1, 3, 5], 'C': [2, 4, 6]}, idx)
tm.assert_frame_equal(rs, xp)

Expand All @@ -636,7 +637,7 @@ def test_yy_format(self):
idx = DatetimeIndex([datetime(2009, 1, 31, 0, 10, 0),
datetime(2009, 2, 28, 10, 20, 0),
datetime(2009, 3, 31, 8, 30, 0)]).asobject
idx.name = 'date'
idx.name = 'date_time'
xp = DataFrame({'B': [1, 3, 5], 'C': [2, 4, 6]}, idx)
tm.assert_frame_equal(rs, xp)

Expand Down Expand Up @@ -967,7 +968,7 @@ def test_multi_index_no_level_names(self):
df = self.read_csv(StringIO(no_header), index_col=[0, 1],
header=None, names=names)
expected = self.read_csv(StringIO(data), index_col=[0, 1])
tm.assert_frame_equal(df, expected)
tm.assert_frame_equal(df, expected, check_names=False)

# 2 implicit first cols
df2 = self.read_csv(StringIO(data2))
Expand All @@ -977,7 +978,7 @@ def test_multi_index_no_level_names(self):
df = self.read_csv(StringIO(no_header), index_col=[1, 0], names=names,
header=None)
expected = self.read_csv(StringIO(data), index_col=[1, 0])
tm.assert_frame_equal(df, expected)
tm.assert_frame_equal(df, expected, check_names=False)

def test_multi_index_parse_dates(self):
data = """index1,index2,A,B,C
Expand Down Expand Up @@ -1162,11 +1163,13 @@ def test_na_value_dict(self):

xp = DataFrame({'b': [np.nan], 'd': [5]},
MultiIndex.from_tuples([(0, 1)]))
xp.index.names = ['a', 'c']
df = self.read_csv(StringIO(data), na_values={}, index_col=[0, 2])
tm.assert_frame_equal(df, xp)

xp = DataFrame({'b': [np.nan], 'd': [5]},
MultiIndex.from_tuples([(0, 1)]))
xp.index.names = ['a', 'c']
df = self.read_csv(StringIO(data), na_values={}, index_col=['a', 'c'])
tm.assert_frame_equal(df, xp)

Expand Down Expand Up @@ -1249,7 +1252,7 @@ def test_multiple_date_cols_index(self):
tm.assert_frame_equal(df2, df)

df3 = self.read_csv(StringIO(data), parse_dates=[[1, 2]], index_col=0)
tm.assert_frame_equal(df3, df)
tm.assert_frame_equal(df3, df, check_names=False)

def test_multiple_date_cols_chunked(self):
df = self.read_csv(StringIO(self.ts_data), parse_dates={
Expand Down
1 change: 1 addition & 0 deletions pandas/io/tests/test_sql.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,6 +174,7 @@ def _check_roundtrip(self, frame):
index_col='Idx')
expected = frame.copy()
expected.index = Index(range(len(frame2))) + 10
expected.index.name = 'Idx'
tm.assert_frame_equal(expected, result)

def test_tquery(self):
Expand Down
Loading