@@ -684,7 +684,7 @@ def test_constructor_ndarray(self):
684
684
frame = DataFrame (['foo' , 'bar' ], index = [0 , 1 ], columns = ['A' ])
685
685
assert len (frame ) == 2
686
686
687
- @pytest .mark .skipif (PY2 & _np_version_under1p13 ,
687
+ @pytest .mark .skipif (PY2 and _np_version_under1p13 ,
688
688
reason = "old numpy & py2" )
689
689
def test_constructor_maskedarray (self ):
690
690
self ._check_basic_constructor (ma .masked_all )
@@ -702,6 +702,8 @@ def test_constructor_maskedarray(self):
702
702
frame = DataFrame (mat , columns = ['A' , 'B' , 'C' ], index = [1 , 2 ])
703
703
assert np .all (~ np .asarray (frame == frame ))
704
704
705
+ @pytest .mark .skipif (PY2 and _np_version_under1p13 ,
706
+ reason = "old numpy & py2" )
705
707
def test_constructor_maskedarray_nonfloat (self ):
706
708
# masked int promoted to float
707
709
mat = ma .masked_all ((2 , 3 ), dtype = int )
@@ -769,6 +771,8 @@ def test_constructor_maskedarray_nonfloat(self):
769
771
assert frame ['A' ][1 ] is True
770
772
assert frame ['C' ][2 ] is False
771
773
774
+ @pytest .mark .skipif (PY2 and _np_version_under1p13 ,
775
+ reason = "old numpy & py2" )
772
776
def test_constructor_maskedarray_hardened (self ):
773
777
# Check numpy masked arrays with hard masks -- from GH24574
774
778
mat_hard = ma .masked_all ((2 , 2 ), dtype = float ).harden_mask ()
@@ -791,6 +795,8 @@ def test_constructor_maskedarray_hardened(self):
791
795
dtype = float )
792
796
tm .assert_frame_equal (result , expected )
793
797
798
+ @pytest .mark .skipif (PY2 and _np_version_under1p13 ,
799
+ reason = "old numpy & py2" )
794
800
def test_constructor_maskedrecarray_dtype (self ):
795
801
# Ensure constructor honors dtype
796
802
data = np .ma .array (
@@ -802,6 +808,8 @@ def test_constructor_maskedrecarray_dtype(self):
802
808
columns = ['date' , 'price' ])
803
809
tm .assert_frame_equal (result , expected )
804
810
811
+ @pytest .mark .skipif (PY2 and _np_version_under1p13 ,
812
+ reason = "old numpy & py2" )
805
813
def test_constructor_mrecarray (self ):
806
814
# Ensure mrecarray produces frame identical to dict of masked arrays
807
815
# from GH3479
0 commit comments