@@ -855,42 +855,30 @@ def test_modulo_zero_int(self):
855
855
result = 0 % s
856
856
expected = Series ([np .nan , 0.0 ])
857
857
tm .assert_series_equal (result , expected )
858
-
859
- def test_np_array_mul_ea_array_returns_extensionarray ():
858
+
859
+ def test_np_array_mul_ea_array_returns_extensionarray (self ):
860
860
np_array = np .array ([1 , 2 , 3 , 4 , 5 ], dtype = tm .SIGNED_INT_NUMPY_DTYPES [0 ])
861
861
ea_array = pd .array ([1 , 2 , 3 , 4 , 5 ], dtype = tm .SIGNED_INT_EA_DTYPES [0 ])
862
862
result = np_array * ea_array
863
863
tm .assert_isinstance (result , type (ea_array ))
864
864
tm .assert_equal (
865
865
result , pd .array ([1 , 4 , 9 , 16 , 25 ], dtype = tm .SIGNED_INT_EA_DTYPES [0 ])
866
866
)
867
- tm .assert_equal (
868
- result , pd .array ([1 , 4 , 9 , 16 , 25 ], dtype = tm .SIGNED_INT_EA_DTYPES [0 ])
869
- )
870
867
871
- def test_df_mul_np_and_ea_array_shape_and_errors ():
868
+ def test_df_mul_np_and_ea_array_shape_and_errors (self ):
872
869
df = pd .DataFrame (np .arange (50 ).reshape (10 , 5 )).notna ().values
873
- NP_array = pd .array (
874
- [i for i in range (10 )], dtype = tm .SIGNED_INT_NUMPY_DTYPES [0 ]
875
- ).reshape (10 , 1 )
876
- EA_array = pd .array (
877
- [i for i in range (10 )], dtype = tm .SIGNED_INT_EA_DTYPES [0 ]
878
- ).reshape (10 , 1 )
879
-
870
+ NP_array = pd .array (list (range (10 )), dtype = tm .SIGNED_INT_NUMPY_DTYPES [0 ]).reshape (10 , 1 )
871
+ EA_array = pd .array (list (range (10 )), dtype = tm .SIGNED_INT_EA_DTYPES [0 ]).reshape (10 , 1 )
880
872
result_np = df * NP_array
881
873
tm .assert_isinstance (result_np , np .ndarray )
882
874
tm .assert_equal (result_np .shape , (10 , 5 ))
883
875
884
876
with tm .assert_raises (TypeError ):
885
877
_ = df * EA_array
886
878
887
- def test_non_1d_ea_raises_typeerror ():
888
- ea_array = pd .array ([1 , 2 , 3 , 4 , 5 ], dtype = tm .SIGNED_INT_EA_DTYPES [0 ]).reshape (
889
- 5 , 1
890
- )
891
- np_array = np .array (
892
- [1 , 2 , 3 , 4 , 5 ], dtype = tm .SIGNED_INT_NUMPY_DTYPES [0 ]
893
- ).reshape (5 , 1 )
879
+ def test_non_1d_ea_raises_typeerror (self ):
880
+ ea_array = pd .array ([1 , 2 , 3 , 4 , 5 ], dtype = tm .SIGNED_INT_EA_DTYPES [0 ]).reshape (5 , 1 )
881
+ np_array = np .array ([1 , 2 , 3 , 4 , 5 ], dtype = tm .SIGNED_INT_NUMPY_DTYPES [0 ]).reshape (5 , 1 )
894
882
895
883
with tm .assert_raises (TypeError ):
896
884
_ = ea_array * np_array
0 commit comments