Skip to content

Commit 74be055

Browse files
committed
1 parent a774050 commit 74be055

File tree

1 file changed

+9
-1
lines changed

1 file changed

+9
-1
lines changed

pandas/tests/frame/test_constructors.py

+9-1
Original file line numberDiff line numberDiff line change
@@ -682,7 +682,7 @@ def test_constructor_ndarray(self):
682682
frame = DataFrame(['foo', 'bar'], index=[0, 1], columns=['A'])
683683
assert len(frame) == 2
684684

685-
@pytest.mark.skipif(PY2 & _np_version_under1p13,
685+
@pytest.mark.skipif(PY2 and _np_version_under1p13,
686686
reason="old numpy & py2")
687687
def test_constructor_maskedarray(self):
688688
self._check_basic_constructor(ma.masked_all)
@@ -700,6 +700,8 @@ def test_constructor_maskedarray(self):
700700
frame = DataFrame(mat, columns=['A', 'B', 'C'], index=[1, 2])
701701
assert np.all(~np.asarray(frame == frame))
702702

703+
@pytest.mark.skipif(PY2 and _np_version_under1p13,
704+
reason="old numpy & py2")
703705
def test_constructor_maskedarray_nonfloat(self):
704706
# masked int promoted to float
705707
mat = ma.masked_all((2, 3), dtype=int)
@@ -767,6 +769,8 @@ def test_constructor_maskedarray_nonfloat(self):
767769
assert frame['A'][1] is True
768770
assert frame['C'][2] is False
769771

772+
@pytest.mark.skipif(PY2 and _np_version_under1p13,
773+
reason="old numpy & py2")
770774
def test_constructor_maskedarray_hardened(self):
771775
# Check numpy masked arrays with hard masks -- from GH24574
772776
mat_hard = ma.masked_all((2, 2), dtype=float).harden_mask()
@@ -789,6 +793,8 @@ def test_constructor_maskedarray_hardened(self):
789793
dtype=float)
790794
tm.assert_frame_equal(result, expected)
791795

796+
@pytest.mark.skipif(PY2 and _np_version_under1p13,
797+
reason="old numpy & py2")
792798
def test_constructor_maskedrecarray_dtype(self):
793799
# Ensure constructor honors dtype
794800
data = np.ma.array(
@@ -800,6 +806,8 @@ def test_constructor_maskedrecarray_dtype(self):
800806
columns=['date', 'price'])
801807
tm.assert_frame_equal(result, expected)
802808

809+
@pytest.mark.skipif(PY2 and _np_version_under1p13,
810+
reason="old numpy & py2")
803811
def test_constructor_mrecarray(self):
804812
# Ensure mrecarray produces frame identical to dict of masked arrays
805813
# from GH3479

0 commit comments

Comments
 (0)