Skip to content

Commit 218a0ea

Browse files
committed
Undo some strictness checking
1 parent 2f4998f commit 218a0ea

File tree

5 files changed

+21
-29
lines changed

5 files changed

+21
-29
lines changed

pandas/tests/extension/base/dim2.py

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,9 +43,7 @@ def test_frame_from_2d_array(self, data):
4343
arr2d = data.repeat(2).reshape(-1, 2)
4444

4545
df = pd.DataFrame(arr2d)
46-
expected = pd.DataFrame(
47-
{0: arr2d[:, 0], 1: arr2d[:, 1]}, columns=pd.RangeIndex(2)
48-
)
46+
expected = pd.DataFrame({0: arr2d[:, 0], 1: arr2d[:, 1]})
4947
tm.assert_frame_equal(df, expected)
5048

5149
def test_swapaxes(self, data):

pandas/tests/extension/base/reshaping.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,18 +33,18 @@ def test_concat(self, data, in_frame):
3333

3434
@pytest.mark.parametrize("in_frame", [True, False])
3535
def test_concat_all_na_block(self, data_missing, in_frame):
36-
valid_block = pd.Series(data_missing.take([1, 1]), index=[0, 1])
37-
na_block = pd.Series(data_missing.take([0, 0]), index=[2, 3])
36+
valid_block = pd.Series(data_missing.take([1, 1]), index=range(2))
37+
na_block = pd.Series(data_missing.take([0, 0]), index=range(2, 4))
3838
if in_frame:
3939
valid_block = pd.DataFrame({"a": valid_block})
4040
na_block = pd.DataFrame({"a": na_block})
4141
result = pd.concat([valid_block, na_block])
4242
if in_frame:
4343
expected = pd.DataFrame({"a": data_missing.take([1, 1, 0, 0])})
44-
tm.assert_frame_equal(result, expected, check_index_type=False)
44+
tm.assert_frame_equal(result, expected)
4545
else:
4646
expected = pd.Series(data_missing.take([1, 1, 0, 0]))
47-
tm.assert_series_equal(result, expected, check_index_type=False)
47+
tm.assert_series_equal(result, expected)
4848

4949
def test_concat_mixed_dtypes(self, data):
5050
# https://github.com/pandas-dev/pandas/issues/20762

pandas/tests/extension/test_arrow.py

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2322,8 +2322,7 @@ def test_str_split():
23222322
{
23232323
0: ArrowExtensionArray(pa.array(["a", "a", None])),
23242324
1: ArrowExtensionArray(pa.array(["cbcb", "cbcb", None])),
2325-
},
2326-
columns=range(2),
2325+
}
23272326
)
23282327
tm.assert_frame_equal(result, expected)
23292328

@@ -2332,8 +2331,7 @@ def test_str_split():
23322331
{
23332332
0: ArrowExtensionArray(pa.array(["a", "a2cbcb", None])),
23342333
1: ArrowExtensionArray(pa.array(["cbcb", None, None])),
2335-
},
2336-
columns=range(2),
2334+
}
23372335
)
23382336
tm.assert_frame_equal(result, expected)
23392337

@@ -2358,8 +2356,7 @@ def test_str_rsplit():
23582356
{
23592357
0: ArrowExtensionArray(pa.array(["a1cb", "a2cb", None])),
23602358
1: ArrowExtensionArray(pa.array(["b", "b", None])),
2361-
},
2362-
columns=range(2),
2359+
}
23632360
)
23642361
tm.assert_frame_equal(result, expected)
23652362

@@ -2368,8 +2365,7 @@ def test_str_rsplit():
23682365
{
23692366
0: ArrowExtensionArray(pa.array(["a", "a2cbcb", None])),
23702367
1: ArrowExtensionArray(pa.array(["cbcb", None, None])),
2371-
},
2372-
columns=range(2),
2368+
}
23732369
)
23742370
tm.assert_frame_equal(result, expected)
23752371

pandas/tests/frame/test_constructors.py

Lines changed: 11 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ def test_constructor_from_2d_datetimearray(self):
8989

9090
df = DataFrame(dta)
9191
expected = DataFrame({0: dta[:, 0], 1: dta[:, 1]})
92-
tm.assert_frame_equal(df, expected, check_column_type=False)
92+
tm.assert_frame_equal(df, expected)
9393
# GH#44724 big performance hit if we de-consolidate
9494
assert len(df._mgr.blocks) == 1
9595

@@ -950,15 +950,15 @@ def test_nested_dict_frame_constructor(self):
950950
data.setdefault(col, {})[row] = df._get_value(row, col)
951951

952952
result = DataFrame(data, columns=rng)
953-
tm.assert_frame_equal(result, df, check_index_type=False)
953+
tm.assert_frame_equal(result, df)
954954

955955
data = {}
956956
for col in df.columns:
957957
for row in df.index:
958958
data.setdefault(row, {})[col] = df._get_value(row, col)
959959

960960
result = DataFrame(data, index=rng).T
961-
tm.assert_frame_equal(result, df, check_index_type=False)
961+
tm.assert_frame_equal(result, df)
962962

963963
def _check_basic_constructor(self, empty):
964964
# mat: 2d matrix with shape (3, 2) to input. empty - makes sized
@@ -1266,10 +1266,10 @@ def test_constructor_list_of_lists(self, using_infer_string):
12661266

12671267
# GH 4851
12681268
# list of 0-dim ndarrays
1269-
expected = DataFrame({0: np.arange(10)})
1269+
expected = DataFrame(np.arange(10))
12701270
data = [np.array(x) for x in range(10)]
12711271
result = DataFrame(data)
1272-
tm.assert_frame_equal(result, expected, check_column_type=False)
1272+
tm.assert_frame_equal(result, expected)
12731273

12741274
def test_nested_pandasarray_matches_nested_ndarray(self):
12751275
# GH#43986
@@ -1403,9 +1403,7 @@ def test_constructor_generator(self):
14031403
gen = ([i, "a"] for i in range(10))
14041404
result = DataFrame(gen)
14051405
expected = DataFrame({0: range(10), 1: "a"})
1406-
tm.assert_frame_equal(
1407-
result, expected, check_dtype=False, check_column_type=False
1408-
)
1406+
tm.assert_frame_equal(result, expected, check_dtype=False)
14091407

14101408
def test_constructor_list_of_dicts(self):
14111409
result = DataFrame([{}])
@@ -1651,8 +1649,8 @@ def test_constructor_Series_named(self):
16511649

16521650
# this is a bit non-intuitive here; the series collapse down to arrays
16531651
df = DataFrame([arr, s1]).T
1654-
expected = DataFrame({1: s1, 0: arr}, columns=[0, 1])
1655-
tm.assert_frame_equal(df, expected, check_column_type=False)
1652+
expected = DataFrame({1: s1, 0: arr}, columns=range(2))
1653+
tm.assert_frame_equal(df, expected)
16561654

16571655
def test_constructor_Series_named_and_columns(self):
16581656
# GH 9232 validation
@@ -2187,7 +2185,7 @@ def test_constructor_ndarray_categorical_dtype(self):
21872185
result = DataFrame(arr, dtype=cat.dtype)
21882186

21892187
expected = DataFrame({0: cat, 1: cat, 2: cat, 3: cat})
2190-
tm.assert_frame_equal(result, expected, check_column_type=False)
2188+
tm.assert_frame_equal(result, expected)
21912189

21922190
def test_constructor_categorical(self):
21932191
# GH8626
@@ -2583,7 +2581,7 @@ def test_from_2d_object_array_of_periods_or_intervals(self):
25832581
data3 = np.r_[data, data2, data, data2].T
25842582
df3 = DataFrame(data3)
25852583
expected = DataFrame({0: pi, 1: ii, 2: pi, 3: ii})
2586-
tm.assert_frame_equal(df3, expected, check_column_type=False)
2584+
tm.assert_frame_equal(df3, expected)
25872585

25882586
@pytest.mark.parametrize(
25892587
"col_a, col_b",
@@ -2676,7 +2674,7 @@ def test_frame_string_inference_array_string_dtype(self):
26762674
expected = DataFrame({0: ["a", "b"], 1: ["c", "d"]}, dtype=dtype)
26772675
with pd.option_context("future.infer_string", True):
26782676
df = DataFrame(np.array([["a", "c"], ["b", "d"]]))
2679-
tm.assert_frame_equal(df, expected, check_column_type=False)
2677+
tm.assert_frame_equal(df, expected)
26802678

26812679
expected = DataFrame(
26822680
{"a": ["a", "b"], "b": ["c", "d"]},

pandas/tests/window/test_dtypes.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -170,4 +170,4 @@ def test_dataframe_dtypes(method, expected_data, dtypes, min_periods, step):
170170
else:
171171
result = getattr(rolled, method)()
172172
expected = DataFrame(expected_data, dtype="float64")[::step]
173-
tm.assert_frame_equal(result, expected, check_column_type=False)
173+
tm.assert_frame_equal(result, expected)

0 commit comments

Comments
 (0)