Skip to content

Commit 86188a6

Browse files
gfyoungjreback
authored andcommitted
COMPAT, TST: Remove tm.TestCase from testing (#320)
* COMPAT: Use assert_raises_regex in testing assert_raises_regex is the renamed version of assertRaisesRegexp from pandas < 0.20.0. * MAINT: Remove tm.TestCase from testing
1 parent 314033d commit 86188a6

18 files changed

+46
-57
lines changed

pandas_datareader/compat/__init__.py

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,18 @@
88
PANDAS_VERSION = LooseVersion(pd.__version__)
99

1010
PANDAS_0190 = (PANDAS_VERSION >= LooseVersion('0.19.0'))
11+
PANDAS_0200 = (PANDAS_VERSION >= LooseVersion('0.20.0'))
1112

1213
if PANDAS_0190:
1314
from pandas.api.types import is_number
1415
else:
1516
from pandas.core.common import is_number
1617

18+
if PANDAS_0200:
19+
from pandas.util.testing import assert_raises_regex
20+
else:
21+
from pandas.util.testing import assertRaisesRegexp as assert_raises_regex
22+
1723
if compat.PY3:
1824
from urllib.error import HTTPError
1925
else:

pandas_datareader/io/tests/test_jsdmx.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@
99
from pandas_datareader.io import read_jsdmx
1010

1111

12-
class TestJSDMX(tm.TestCase):
12+
class TestJSDMX(object):
1313

14-
def setUp(self):
14+
def setup_method(self, method):
1515
self.dirpath = tm.get_data_path()
1616

1717
def test_tourism(self):

pandas_datareader/io/tests/test_sdmx.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@
99
from pandas_datareader.io.sdmx import read_sdmx, _read_sdmx_dsd
1010

1111

12-
class TestSDMX(tm.TestCase):
12+
class TestSDMX(object):
1313

14-
def setUp(self):
14+
def setup_method(self, method):
1515
self.dirpath = tm.get_data_path()
1616

1717
def test_tourism(self):

pandas_datareader/tests/test_base.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
import pytest
2-
import pandas.util.testing as tm
32
import pandas_datareader.base as base
43

54

6-
class TestBaseReader(tm.TestCase):
5+
class TestBaseReader(object):
76
def test_valid_retry_count(self):
87
with pytest.raises(ValueError):
98
base._BaseReader([], retry_count='stuff')
@@ -21,7 +20,7 @@ def test_invalid_format(self):
2120
b._read_one_data('a', None)
2221

2322

24-
class TestDailyBaseReader(tm.TestCase):
23+
class TestDailyBaseReader(object):
2524
def test_get_params(self):
2625
with pytest.raises(NotImplementedError):
2726
b = base._DailyBaseReader()

pandas_datareader/tests/test_data.py

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7,21 +7,14 @@
77
from pandas_datareader.data import DataReader
88

99

10-
class TestOptionsWarnings(tm.TestCase):
11-
@classmethod
12-
def setUpClass(cls):
13-
super(TestOptionsWarnings, cls).setUpClass()
14-
15-
@classmethod
16-
def tearDownClass(cls):
17-
super(TestOptionsWarnings, cls).tearDownClass()
10+
class TestOptionsWarnings(object):
1811

1912
def test_options_source_warning(self):
2013
with tm.assert_produces_warning():
2114
web.Options('aapl')
2215

2316

24-
class TestDataReader(tm.TestCase):
17+
class TestDataReader(object):
2518
def test_read_yahoo(self):
2619
gs = DataReader("GS", "yahoo")
2720
assert isinstance(gs, DataFrame)

pandas_datareader/tests/test_edgar.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
from pandas_datareader._utils import RemoteDataError
88

99

10-
class TestEdgarIndex(tm.TestCase):
10+
class TestEdgarIndex(object):
1111

1212
@classmethod
1313
def setup_class(cls):

pandas_datareader/tests/test_enigma.py

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,19 +3,16 @@
33

44
from requests.exceptions import HTTPError
55

6-
import pandas.util.testing as tm
7-
86
import pandas_datareader as pdr
97
import pandas_datareader.data as web
108

119
TEST_API_KEY = os.getenv('ENIGMA_API_KEY')
1210

1311

14-
class TestEnigma(tm.TestCase):
12+
class TestEnigma(object):
1513

1614
@classmethod
17-
def setUpClass(cls):
18-
super(TestEnigma, cls).setUpClass()
15+
def setup_class(cls):
1916
pytest.importorskip("lxml")
2017

2118
def test_enigma_datareader(self):

pandas_datareader/tests/test_eurostat.py

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,10 @@
33
import pandas.util.testing as tm
44
import pandas_datareader.data as web
55

6+
from pandas_datareader.compat import assert_raises_regex
67

7-
class TestEurostat(tm.TestCase):
8+
9+
class TestEurostat(object):
810

911
def test_get_cdh_e_fos(self):
1012
# Employed doctorate holders in non managerial and non professional
@@ -87,7 +89,7 @@ def test_get_nrg_pc_202(self):
8789
def test_get_prc_hicp_manr_exceeds_limit(self):
8890
# see gh-149
8991
msg = 'Query size exceeds maximum limit'
90-
with tm.assertRaisesRegexp(ValueError, msg):
92+
with assert_raises_regex(ValueError, msg):
9193
web.DataReader('prc_hicp_manr', 'eurostat',
9294
start=pd.Timestamp('2000-01-01'),
9395
end=pd.Timestamp('2013-01-01'))

pandas_datareader/tests/test_famafrench.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
from pandas_datareader.famafrench import get_available_datasets
88

99

10-
class TestFamaFrench(tm.TestCase):
10+
class TestFamaFrench(object):
1111

1212
def test_get_data(self):
1313
keys = [

pandas_datareader/tests/test_fred.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
from pandas_datareader._utils import RemoteDataError
1212

1313

14-
class TestFred(tm.TestCase):
14+
class TestFred(object):
1515
def test_fred(self):
1616

1717
# Raises an exception when DataReader can't

0 commit comments

Comments
 (0)