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