Skip to content

Commit e60f125

Browse files
committed
TST: Remove dtype fixture where not needed
1 parent adf8f99 commit e60f125

File tree

1 file changed

+25
-33
lines changed

1 file changed

+25
-33
lines changed

pandas/tests/reshape/test_reshape.py

+25-33
Original file line numberDiff line numberDiff line change
@@ -500,7 +500,7 @@ def test_dataframe_dummies_with_categorical(self, df, sparse, dtype):
500500
expected.sort_index(axis=1)
501501
assert_frame_equal(result, expected)
502502

503-
def test_basic_drop_first(self, sparse, dtype):
503+
def test_basic_drop_first(self, sparse):
504504
# GH12402 Add a new parameter `drop_first` to avoid collinearity
505505
# Basic case
506506
s_list = list('abc')
@@ -509,101 +509,93 @@ def test_basic_drop_first(self, sparse, dtype):
509509

510510
expected = DataFrame({'b': [0, 1, 0],
511511
'c': [0, 0, 1]},
512-
dtype=self.effective_dtype(dtype))
512+
dtype=np.uint8)
513513

514-
result = get_dummies(s_list, drop_first=True,
515-
sparse=sparse, dtype=dtype)
514+
result = get_dummies(s_list, drop_first=True, sparse=sparse)
516515
assert_frame_equal(result, expected)
517516

518-
result = get_dummies(s_series, drop_first=True,
519-
sparse=sparse, dtype=dtype)
517+
result = get_dummies(s_series, drop_first=True, sparse=sparse)
520518
assert_frame_equal(result, expected)
521519

522520
expected.index = list('ABC')
523-
result = get_dummies(s_series_index, drop_first=True,
524-
sparse=sparse, dtype=dtype)
521+
result = get_dummies(s_series_index, drop_first=True, sparse=sparse)
525522
assert_frame_equal(result, expected)
526523

527-
def test_basic_drop_first_one_level(self, sparse, dtype):
524+
def test_basic_drop_first_one_level(self, sparse):
528525
# Test the case that categorical variable only has one level.
529526
s_list = list('aaa')
530527
s_series = Series(s_list)
531528
s_series_index = Series(s_list, list('ABC'))
532529

533530
expected = DataFrame(index=np.arange(3))
534531

535-
result = get_dummies(s_list, drop_first=True,
536-
sparse=sparse, dtype=dtype)
532+
result = get_dummies(s_list, drop_first=True, sparse=sparse)
537533
assert_frame_equal(result, expected)
538534

539-
result = get_dummies(s_series, drop_first=True,
540-
sparse=sparse, dtype=dtype)
535+
result = get_dummies(s_series, drop_first=True, sparse=sparse)
541536
assert_frame_equal(result, expected)
542537

543538
expected = DataFrame(index=list('ABC'))
544-
result = get_dummies(s_series_index, drop_first=True,
545-
sparse=sparse, dtype=dtype)
539+
result = get_dummies(s_series_index, drop_first=True, sparse=sparse)
546540
assert_frame_equal(result, expected)
547541

548-
def test_basic_drop_first_NA(self, sparse, dtype):
542+
def test_basic_drop_first_NA(self, sparse):
549543
# Test NA hadling together with drop_first
550544
s_NA = ['a', 'b', np.nan]
551-
res = get_dummies(s_NA, drop_first=True, sparse=sparse, dtype=dtype)
552-
exp = DataFrame({'b': [0, 1, 0]}, dtype=self.effective_dtype(dtype))
545+
res = get_dummies(s_NA, drop_first=True, sparse=sparse)
546+
exp = DataFrame({'b': [0, 1, 0]}, dtype=np.uint8)
553547
assert_frame_equal(res, exp)
554548

555549
res_na = get_dummies(s_NA, dummy_na=True, drop_first=True,
556-
sparse=sparse, dtype=dtype)
550+
sparse=sparse)
557551
exp_na = DataFrame(
558552
{'b': [0, 1, 0],
559553
nan: [0, 0, 1]},
560-
dtype=self.effective_dtype(dtype)).reindex(['b', nan], axis=1)
554+
dtype=np.uint8).reindex(['b', nan], axis=1)
561555
assert_frame_equal(res_na, exp_na)
562556

563-
res_just_na = get_dummies([nan],
564-
dummy_na=True,
565-
drop_first=True,
566-
sparse=sparse, dtype=dtype)
557+
res_just_na = get_dummies([nan], dummy_na=True, drop_first=True,
558+
sparse=sparse)
567559
exp_just_na = DataFrame(index=np.arange(1))
568560
assert_frame_equal(res_just_na, exp_just_na)
569561

570-
def test_dataframe_dummies_drop_first(self, df, sparse, dtype):
562+
def test_dataframe_dummies_drop_first(self, df, sparse):
571563
df = df[['A', 'B']]
572-
result = get_dummies(df, drop_first=True, sparse=sparse, dtype=dtype)
564+
result = get_dummies(df, drop_first=True, sparse=sparse)
573565
expected = DataFrame({'A_b': [0, 1, 0],
574566
'B_c': [0, 0, 1]},
575-
dtype=self.effective_dtype(dtype))
567+
dtype=np.uint8)
576568
assert_frame_equal(result, expected)
577569

578570
def test_dataframe_dummies_drop_first_with_categorical(
579571
self, df, sparse, dtype):
580572
df['cat'] = pd.Categorical(['x', 'y', 'y'])
581-
result = get_dummies(df, drop_first=True, sparse=sparse, dtype=dtype)
573+
result = get_dummies(df, drop_first=True, sparse=sparse)
582574
expected = DataFrame({'C': [1, 2, 3],
583575
'A_b': [0, 1, 0],
584576
'B_c': [0, 0, 1],
585577
'cat_y': [0, 1, 1]})
586578
cols = ['A_b', 'B_c', 'cat_y']
587-
expected[cols] = expected[cols].astype(self.effective_dtype(dtype))
579+
expected[cols] = expected[cols].astype(np.uint8)
588580
expected = expected[['C', 'A_b', 'B_c', 'cat_y']]
589581
assert_frame_equal(result, expected)
590582

591-
def test_dataframe_dummies_drop_first_with_na(self, df, sparse, dtype):
583+
def test_dataframe_dummies_drop_first_with_na(self, df, sparse):
592584
df.loc[3, :] = [np.nan, np.nan, np.nan]
593585
result = get_dummies(df, dummy_na=True, drop_first=True,
594-
sparse=sparse, dtype=dtype).sort_index(axis=1)
586+
sparse=sparse).sort_index(axis=1)
595587
expected = DataFrame({'C': [1, 2, 3, np.nan],
596588
'A_b': [0, 1, 0, 0],
597589
'A_nan': [0, 0, 0, 1],
598590
'B_c': [0, 0, 1, 0],
599591
'B_nan': [0, 0, 0, 1]})
600592
cols = ['A_b', 'A_nan', 'B_c', 'B_nan']
601-
expected[cols] = expected[cols].astype(self.effective_dtype(dtype))
593+
expected[cols] = expected[cols].astype(np.uint8)
602594
expected = expected.sort_index(axis=1)
603595
assert_frame_equal(result, expected)
604596

605597
result = get_dummies(df, dummy_na=False, drop_first=True,
606-
sparse=sparse, dtype=dtype)
598+
sparse=sparse)
607599
expected = expected[['C', 'A_b', 'B_c']]
608600
assert_frame_equal(result, expected)
609601

0 commit comments

Comments
 (0)