Skip to content

Commit 83dee23

Browse files
committed
TST: raise nose.SkipTest -> pytest.skip
TST: remove KnownFailure (unused), should be replaced by pytest.xfail anyhow xref #15341
1 parent 61deba5 commit 83dee23

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

62 files changed

+358
-451
lines changed

pandas/computation/tests/test_compat.py

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

22
# flake8: noqa
33

4-
import nose
4+
import pytest
55
from itertools import product
66
from distutils.version import LooseVersion
77

@@ -31,7 +31,7 @@ def test_compat():
3131
assert _NUMEXPR_INSTALLED
3232

3333
except ImportError:
34-
raise nose.SkipTest("not testing numexpr version compat")
34+
pytest.skip("not testing numexpr version compat")
3535

3636

3737
def test_invalid_numexpr_version():
@@ -49,14 +49,14 @@ def testit():
4949
try:
5050
import numexpr as ne
5151
except ImportError:
52-
raise nose.SkipTest("no numexpr")
52+
pytest.skip("no numexpr")
5353
else:
5454
if ne.__version__ < LooseVersion('2.1'):
5555
with tm.assertRaisesRegexp(ImportError, "'numexpr' version is "
5656
".+, must be >= 2.1"):
5757
testit()
5858
elif ne.__version__ == LooseVersion('2.4.4'):
59-
raise nose.SkipTest("numexpr version==2.4.4")
59+
pytest.skip("numexpr version==2.4.4")
6060
else:
6161
testit()
6262
else:

pandas/computation/tests/test_eval.py

+3-3
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
from itertools import product
77
from distutils.version import LooseVersion
88

9-
import nose
9+
import pytest
1010
from nose.tools import assert_raises
1111

1212
from numpy.random import randn, rand, randint
@@ -319,7 +319,7 @@ def get_expected_pow_result(self, lhs, rhs):
319319
except ValueError as e:
320320
if str(e).startswith('negative number cannot be raised to a fractional power'):
321321
if self.engine == 'python':
322-
raise nose.SkipTest(str(e))
322+
pytest.skip(str(e))
323323
else:
324324
expected = np.nan
325325
else:
@@ -1705,7 +1705,7 @@ def test_result_types(self):
17051705

17061706
def test_result_types2(self):
17071707
# xref https://github.com/pandas-dev/pandas/issues/12293
1708-
raise nose.SkipTest("unreliable tests on complex128")
1708+
pytest.skip("unreliable tests on complex128")
17091709

17101710
# Did not test complex64 because DataFrame is converting it to
17111711
# complex128. Due to https://github.com/pandas-dev/pandas/issues/10952

pandas/io/tests/json/test_pandas.py

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# -*- coding: utf-8 -*-
22
# pylint: disable-msg=W0612,E1101
3-
import nose
3+
import pytest
44
from pandas.compat import range, lrange, StringIO, OrderedDict
55
import os
66

@@ -1009,8 +1009,8 @@ def test_latin_encoding(self):
10091009
return
10101010

10111011
# GH 13774
1012-
raise nose.SkipTest("encoding not implemented in .to_json(), "
1013-
"xref #13774")
1012+
pytest.skip("encoding not implemented in .to_json(), "
1013+
"xref #13774")
10141014

10151015
values = [[b'E\xc9, 17', b'', b'a', b'b', b'c'],
10161016
[b'E\xc9, 17', b'a', b'b', b'c'],

pandas/io/tests/json/test_ujson.py

+6-6
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
except ImportError:
88
import simplejson as json
99
import math
10-
import nose
10+
import pytest
1111
import platform
1212
import sys
1313
import time
@@ -28,7 +28,7 @@
2828
def _skip_if_python_ver(skip_major, skip_minor=None):
2929
major, minor = sys.version_info[:2]
3030
if major == skip_major and (skip_minor is None or minor == skip_minor):
31-
raise nose.SkipTest("skipping Python version %d.%d" % (major, minor))
31+
pytest.skip("skipping Python version %d.%d" % (major, minor))
3232

3333

3434
json_unicode = (json.dumps if compat.PY3
@@ -95,7 +95,7 @@ def test_encodeNonCLocale(self):
9595
try:
9696
locale.setlocale(locale.LC_NUMERIC, 'Italian_Italy')
9797
except:
98-
raise nose.SkipTest('Could not set locale for testing')
98+
pytest.skip('Could not set locale for testing')
9999
self.assertEqual(ujson.loads(ujson.dumps(4.78e60)), 4.78e60)
100100
self.assertEqual(ujson.loads('4.78', precise_float=True), 4.78)
101101
locale.setlocale(locale.LC_NUMERIC, savedlocale)
@@ -113,7 +113,7 @@ def test_decimalDecodeTestPrecise(self):
113113

114114
def test_encodeDoubleTinyExponential(self):
115115
if compat.is_platform_windows() and not compat.PY3:
116-
raise nose.SkipTest("buggy on win-64 for py2")
116+
pytest.skip("buggy on win-64 for py2")
117117

118118
num = 1e-40
119119
self.assertEqual(num, ujson.decode(ujson.encode(num)))
@@ -393,8 +393,8 @@ def test_nat(self):
393393
def test_npy_nat(self):
394394
from distutils.version import LooseVersion
395395
if LooseVersion(np.__version__) < '1.7.0':
396-
raise nose.SkipTest("numpy version < 1.7.0, is "
397-
"{0}".format(np.__version__))
396+
pytest.skip("numpy version < 1.7.0, is "
397+
"{0}".format(np.__version__))
398398

399399
input = np.datetime64('NaT')
400400
assert ujson.encode(input) == 'null', "Expected null"

pandas/io/tests/parser/c_parser_only.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
further arguments when parsing.
88
"""
99

10-
import nose
10+
import pytest
1111
import numpy as np
1212

1313
import pandas as pd
@@ -159,7 +159,7 @@ def error(val):
159159

160160
def test_pass_dtype_as_recarray(self):
161161
if compat.is_platform_windows() and self.low_memory:
162-
raise nose.SkipTest(
162+
pytest.skip(
163163
"segfaults on win-64, only when all tests are run")
164164

165165
data = """\

pandas/io/tests/parser/common.py

+4-4
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
import sys
1010
from datetime import datetime
1111

12-
import nose
12+
import pytest
1313
import numpy as np
1414
from pandas.lib import Timestamp
1515

@@ -635,8 +635,8 @@ def test_file(self):
635635
url_table = self.read_table('file://localhost/' + localtable)
636636
except URLError:
637637
# fails on some systems
638-
raise nose.SkipTest("failing on %s" %
639-
' '.join(platform.uname()).strip())
638+
pytest.skip("failing on %s" %
639+
' '.join(platform.uname()).strip())
640640

641641
tm.assert_frame_equal(url_table, local_table)
642642

@@ -1262,7 +1262,7 @@ def test_verbose_import(self):
12621262

12631263
def test_iteration_open_handle(self):
12641264
if PY3:
1265-
raise nose.SkipTest(
1265+
pytest.skip(
12661266
"won't work in Python 3 {0}".format(sys.version_info))
12671267

12681268
with tm.ensure_clean() as path:

pandas/io/tests/parser/compression.py

+4-4
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
of the parsers defined in parsers.py
66
"""
77

8-
import nose
8+
import pytest
99

1010
import pandas.util.testing as tm
1111

@@ -16,7 +16,7 @@ def test_zip(self):
1616
try:
1717
import zipfile
1818
except ImportError:
19-
raise nose.SkipTest('need zipfile to run')
19+
pytest.skip('need zipfile to run')
2020

2121
with open(self.csv1, 'rb') as data_file:
2222
data = data_file.read()
@@ -67,7 +67,7 @@ def test_gzip(self):
6767
try:
6868
import gzip
6969
except ImportError:
70-
raise nose.SkipTest('need gzip to run')
70+
pytest.skip('need gzip to run')
7171

7272
with open(self.csv1, 'rb') as data_file:
7373
data = data_file.read()
@@ -96,7 +96,7 @@ def test_bz2(self):
9696
try:
9797
import bz2
9898
except ImportError:
99-
raise nose.SkipTest('need bz2 to run')
99+
pytest.skip('need bz2 to run')
100100

101101
with open(self.csv1, 'rb') as data_file:
102102
data = data_file.read()

pandas/io/tests/parser/converters.py

+3-3
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
from datetime import datetime
99

10-
import nose
10+
import pytest
1111

1212
import numpy as np
1313
import pandas as pd
@@ -84,8 +84,8 @@ def test_converter_return_string_bug(self):
8484
def test_converters_corner_with_nas(self):
8585
# skip aberration observed on Win64 Python 3.2.2
8686
if hash(np.int64(-1)) != -2:
87-
raise nose.SkipTest("skipping because of windows hash on Python"
88-
" 3.2.2")
87+
pytest.skip("skipping because of windows hash on Python"
88+
" 3.2.2")
8989

9090
data = """id,score,days
9191
1,2,12

pandas/io/tests/parser/parse_dates.py

+4-4
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
from distutils.version import LooseVersion
99
from datetime import datetime
1010

11-
import nose
11+
import pytest
1212
import numpy as np
1313
import pandas.lib as lib
1414
from pandas.lib import Timestamp
@@ -268,9 +268,9 @@ def test_yy_format_with_yearfirst(self):
268268
# See gh-217
269269
import dateutil
270270
if dateutil.__version__ >= LooseVersion('2.5.0'):
271-
raise nose.SkipTest("testing yearfirst=True not-support"
272-
"on datetutil < 2.5.0 this works but"
273-
"is wrong")
271+
pytest.skip("testing yearfirst=True not-support"
272+
"on datetutil < 2.5.0 this works but"
273+
"is wrong")
274274

275275
rs = self.read_csv(StringIO(data), index_col=0,
276276
parse_dates=[['date', 'time']])

pandas/io/tests/parser/python_parser_only.py

+3-3
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99

1010
import csv
1111
import sys
12-
import nose
12+
import pytest
1313

1414
import pandas.util.testing as tm
1515
from pandas import DataFrame, Index
@@ -79,7 +79,7 @@ def test_sniff_delimiter(self):
7979

8080
def test_BytesIO_input(self):
8181
if not compat.PY3:
82-
raise nose.SkipTest(
82+
pytest.skip(
8383
"Bytes-related test - only needs to work on Python 3")
8484

8585
data = BytesIO("שלום::1234\n562::123".encode('cp1255'))
@@ -130,7 +130,7 @@ def test_decompression_regex_sep(self):
130130
import gzip
131131
import bz2
132132
except ImportError:
133-
raise nose.SkipTest('need gzip and bz2 to run')
133+
pytest.skip('need gzip and bz2 to run')
134134

135135
with open(self.csv1, 'rb') as f:
136136
data = f.read()

pandas/io/tests/parser/test_network.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
"""
77

88
import os
9-
import nose
9+
import pytest
1010
import functools
1111
from itertools import product
1212

@@ -59,7 +59,7 @@ def setUp(self):
5959
try:
6060
import s3fs # noqa
6161
except ImportError:
62-
raise nose.SkipTest("s3fs not installed")
62+
pytest.skip("s3fs not installed")
6363

6464
@tm.network
6565
def test_parse_public_s3_bucket(self):

pandas/io/tests/parser/test_read_fwf.py

+4-4
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
from datetime import datetime
1010

11-
import nose
11+
import pytest
1212
import numpy as np
1313
import pandas as pd
1414
import pandas.util.testing as tm
@@ -75,7 +75,7 @@ def test_fwf(self):
7575

7676
def test_BytesIO_input(self):
7777
if not compat.PY3:
78-
raise nose.SkipTest(
78+
pytest.skip(
7979
"Bytes-related test - only needs to work on Python 3")
8080

8181
result = read_fwf(BytesIO("שלום\nשלום".encode('utf8')), widths=[
@@ -192,7 +192,7 @@ def test_fwf_compression(self):
192192
import gzip
193193
import bz2
194194
except ImportError:
195-
raise nose.SkipTest("Need gzip and bz2 to run this test")
195+
pytest.skip("Need gzip and bz2 to run this test")
196196

197197
data = """1111111111
198198
2222222222
@@ -333,7 +333,7 @@ def test_multiple_delimiters(self):
333333

334334
def test_variable_width_unicode(self):
335335
if not compat.PY3:
336-
raise nose.SkipTest(
336+
pytest.skip(
337337
'Bytes-related test - only needs to work on Python 3')
338338
test = """
339339
שלום שלום

pandas/io/tests/parser/usecols.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
for all of the parsers defined in parsers.py
66
"""
77

8-
import nose
8+
import pytest
99

1010
import numpy as np
1111
import pandas.util.testing as tm
@@ -377,7 +377,7 @@ def test_usecols_with_multibyte_characters(self):
377377
tm.assert_frame_equal(df, expected)
378378

379379
def test_usecols_with_multibyte_unicode_characters(self):
380-
raise nose.SkipTest('TODO: see gh-13253')
380+
pytest.skip('TODO: see gh-13253')
381381

382382
s = '''あああ,いい,ううう,ええええ
383383
0.056674973,8,True,a

pandas/io/tests/test_clipboard.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
import numpy as np
33
from numpy.random import randint
44

5-
import nose
5+
import pytest
66
import pandas as pd
77

88
from pandas import DataFrame
@@ -16,7 +16,7 @@
1616
try:
1717
DataFrame({'A': [1, 2]}).to_clipboard()
1818
except PyperclipException:
19-
raise nose.SkipTest("clipboard primitives not installed")
19+
pytest.skip("clipboard primitives not installed")
2020

2121

2222
class TestClipboard(tm.TestCase):

0 commit comments

Comments
 (0)