Skip to content

Commit 76010cb

Browse files
ericvautour-quandlcouture-ql
ericvautour-quandl
authored and
couture-ql
committed
CP-9045/remove-deprecations-during-tests: Removed deprecated code, stubbed warnings to make test output clean, removed python -W always setup.py -q test since it was deprecated, added ability to run tests individually
1 parent 1920b0d commit 76010cb

File tree

5 files changed

+134
-89
lines changed

5 files changed

+134
-89
lines changed

‎test/test_datatable_data.py

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
import pandas
66
import numpy
77
import six
8+
from datetime import datetime
89
from nasdaqdatalink.model.data import Data
910
from nasdaqdatalink.model.datatable import Datatable
1011
from nasdaqdatalink.utils.request_type_util import RequestType
@@ -143,10 +144,10 @@ def test_pandas_dataframe_date_field_is_datetime(self, request_method):
143144
datatable = Datatable('ZACKS/FC')
144145
results = Data.page(datatable, params={})
145146
df = results.to_pandas()
146-
self.assertIsInstance(df['per_end_date'][0], pandas.datetime)
147-
self.assertIsInstance(df['per_end_date'][1], pandas.datetime)
148-
self.assertIsInstance(df['per_end_date'][2], pandas.datetime)
149-
self.assertIsInstance(df['per_end_date'][3], pandas.datetime)
147+
self.assertIsInstance(df['per_end_date'][0], datetime)
148+
self.assertIsInstance(df['per_end_date'][1], datetime)
149+
self.assertIsInstance(df['per_end_date'][2], datetime)
150+
self.assertIsInstance(df['per_end_date'][3], datetime)
150151

151152
@parameterized.expand(['GET', 'POST'])
152153
def test_to_numpy_returns_numpy_object(self, request_method):

‎test/test_get.py

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,9 @@ def test_setting_api_key_config(self):
4646
self.assertEqual(actual_request_headers['x-api-token'], 'api_key_configured')
4747

4848
def test_sets_api_key_using_authtoken_arg(self):
49-
get('NSE/OIL', authtoken='api_key')
49+
with self.assertWarns(DeprecationWarning):
50+
get('NSE/OIL', authtoken='api_key')
51+
5052
self.assertEqual(ApiConfig.api_key, 'api_key')
5153

5254
def test_sets_api_key_using_api_key_arg(self):
@@ -55,9 +57,11 @@ def test_sets_api_key_using_api_key_arg(self):
5557

5658
@patch.object(Dataset, 'data')
5759
def test_query_params_are_formed_with_old_arg_names(self, mock_method):
58-
get('NSE/OIL', authtoken='authtoken', trim_start='2001-01-01',
59-
trim_end='2010-01-01', collapse='annual',
60-
transformation='rdiff', rows=4, sort_order='desc')
60+
with self.assertWarns(DeprecationWarning):
61+
get('NSE/OIL', authtoken='authtoken', trim_start='2001-01-01',
62+
trim_end='2010-01-01', collapse='annual',
63+
transformation='rdiff', rows=4, sort_order='desc')
64+
6165
self.assertEqual(mock_method.call_count, 1)
6266
self.assertEqual(mock_method.mock_calls[0],
6367
call(handle_column_not_found=True,
@@ -129,10 +133,11 @@ def test_multiple_datasets_args_formed(self, mock):
129133

130134
@patch.object(MergedDataset, 'data')
131135
def test_query_params_are_formed_with_old_arg_names(self, mock_method):
132-
get(['WIKI/AAPL.1', 'WIKI/MSFT.2', 'NSE/OIL'],
133-
authtoken='authtoken', trim_start='2001-01-01',
134-
trim_end='2010-01-01', collapse='annual',
135-
transformation='rdiff', rows=4, sort_order='desc')
136+
with self.assertWarns(DeprecationWarning):
137+
get(['WIKI/AAPL.1', 'WIKI/MSFT.2', 'NSE/OIL'],
138+
authtoken='authtoken', trim_start='2001-01-01',
139+
trim_end='2010-01-01', collapse='annual',
140+
transformation='rdiff', rows=4, sort_order='desc')
136141

137142
self.assertEqual(mock_method.call_count, 1)
138143
self.assertEqual(mock_method.mock_calls[0],

‎test/test_get_point_in_time_data.py

Lines changed: 59 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -29,69 +29,93 @@ def tearDown(self):
2929

3030
@patch('nasdaqdatalink.connection.Connection.request')
3131
def test_get_point_in_time_returns_data_frame_object(self, mock):
32-
df = nasdaqdatalink.get_point_in_time('ZACKS/FC', interval='asofdate', date='2020-01-01')
32+
with self.assertWarns(UserWarning):
33+
df = nasdaqdatalink.get_point_in_time(
34+
'ZACKS/FC', interval='asofdate', date='2020-01-01'
35+
)
36+
3337
self.assertIsInstance(df, pandas.core.frame.DataFrame)
3438

3539
@patch('nasdaqdatalink.connection.Connection.request')
3640
def test_asofdate_call_connection(self, mock):
37-
nasdaqdatalink.get_point_in_time('ZACKS/FC', interval='asofdate', date='2020-01-01')
38-
expected = call('get', 'pit/ZACKS/FC/asofdate/2020-01-01', params={})
41+
with self.assertWarns(UserWarning):
42+
nasdaqdatalink.get_point_in_time('ZACKS/FC', interval='asofdate', date='2020-01-01')
43+
expected = call('get', 'pit/ZACKS/FC/asofdate/2020-01-01', params={})
44+
3945
self.assertEqual(mock.call_args, expected)
4046

4147
@patch('nasdaqdatalink.connection.Connection.request')
4248
def test_asofdate_call_connection_with_datetimes(self, mock):
43-
nasdaqdatalink.get_point_in_time('ZACKS/FC', interval='asofdate', date='2020-01-01T12:55')
44-
expected = call('get', 'pit/ZACKS/FC/asofdate/2020-01-01T12:55', params={})
49+
with self.assertWarns(UserWarning):
50+
nasdaqdatalink.get_point_in_time(
51+
'ZACKS/FC', interval='asofdate', date='2020-01-01T12:55'
52+
)
53+
expected = call('get', 'pit/ZACKS/FC/asofdate/2020-01-01T12:55', params={})
54+
4555
self.assertEqual(mock.call_args, expected)
4656

4757
@patch('nasdaqdatalink.connection.Connection.request')
4858
def test_asofdate_call_without_date(self, mock):
49-
nasdaqdatalink.get_point_in_time('ZACKS/FC', interval='asofdate')
50-
expected = call('get', "pit/ZACKS/FC/asofdate/%s" % date.today(), params={})
59+
with self.assertWarns(UserWarning):
60+
nasdaqdatalink.get_point_in_time('ZACKS/FC', interval='asofdate')
61+
expected = call('get', "pit/ZACKS/FC/asofdate/%s" % date.today(), params={})
62+
5163
self.assertEqual(mock.call_args, expected)
5264

5365
@patch('nasdaqdatalink.connection.Connection.request')
5466
def test_from_call_connection(self, mock):
55-
nasdaqdatalink.get_point_in_time(
56-
'ZACKS/FC',
57-
interval='from',
58-
start_date='2020-01-01',
59-
end_date='2020-01-02'
60-
)
61-
expected = call('get', 'pit/ZACKS/FC/from/2020-01-01/to/2020-01-02', params={})
67+
with self.assertWarns(UserWarning):
68+
nasdaqdatalink.get_point_in_time(
69+
'ZACKS/FC',
70+
interval='from',
71+
start_date='2020-01-01',
72+
end_date='2020-01-02'
73+
)
74+
expected = call('get', 'pit/ZACKS/FC/from/2020-01-01/to/2020-01-02', params={})
75+
6276
self.assertEqual(mock.call_args, expected)
6377

6478
@patch('nasdaqdatalink.connection.Connection.request')
6579
def test_from_call_connection_with_datetimes(self, mock):
66-
nasdaqdatalink.get_point_in_time(
67-
'ZACKS/FC',
68-
interval='from',
69-
start_date='2020-01-01T12:00',
70-
end_date='2020-01-02T14:00'
71-
)
72-
expected = call('get', 'pit/ZACKS/FC/from/2020-01-01T12:00/to/2020-01-02T14:00', params={})
80+
with self.assertWarns(UserWarning):
81+
nasdaqdatalink.get_point_in_time(
82+
'ZACKS/FC',
83+
interval='from',
84+
start_date='2020-01-01T12:00',
85+
end_date='2020-01-02T14:00'
86+
)
87+
expected = call(
88+
'get', 'pit/ZACKS/FC/from/2020-01-01T12:00/to/2020-01-02T14:00', params={}
89+
)
90+
7391
self.assertEqual(mock.call_args, expected)
7492

7593
@patch('nasdaqdatalink.connection.Connection.request')
7694
def test_between_call_connection(self, mock):
77-
nasdaqdatalink.get_point_in_time(
78-
'ZACKS/FC',
79-
interval='between',
80-
start_date='2020-01-01',
81-
end_date='2020-01-02'
82-
)
83-
expected = call('get', 'pit/ZACKS/FC/between/2020-01-01/2020-01-02', params={})
95+
with self.assertWarns(UserWarning):
96+
nasdaqdatalink.get_point_in_time(
97+
'ZACKS/FC',
98+
interval='between',
99+
start_date='2020-01-01',
100+
end_date='2020-01-02'
101+
)
102+
expected = call('get', 'pit/ZACKS/FC/between/2020-01-01/2020-01-02', params={})
103+
84104
self.assertEqual(mock.call_args, expected)
85105

86106
@patch('nasdaqdatalink.connection.Connection.request')
87107
def test_between_call_connection_with_datetimes(self, mock):
88-
nasdaqdatalink.get_point_in_time(
89-
'ZACKS/FC',
90-
interval='between',
91-
start_date='2020-01-01T12:00',
92-
end_date='2020-01-02T14:00'
93-
)
94-
expected = call('get', 'pit/ZACKS/FC/between/2020-01-01T12:00/2020-01-02T14:00', params={})
108+
with self.assertWarns(UserWarning):
109+
nasdaqdatalink.get_point_in_time(
110+
'ZACKS/FC',
111+
interval='between',
112+
start_date='2020-01-01T12:00',
113+
end_date='2020-01-02T14:00'
114+
)
115+
expected = call(
116+
'get', 'pit/ZACKS/FC/between/2020-01-01T12:00/2020-01-02T14:00', params={}
117+
)
118+
95119
self.assertEqual(mock.call_args, expected)
96120

97121
@patch('nasdaqdatalink.connection.Connection.request')

‎test/test_get_table.py

Lines changed: 56 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -39,65 +39,81 @@ def tearDown(self):
3939

4040
@patch('nasdaqdatalink.connection.Connection.request')
4141
def test_datatable_returns_datatable_object(self, mock):
42-
df = nasdaqdatalink.get_table('ZACKS/FC', params={})
42+
with self.assertWarns(UserWarning):
43+
df = nasdaqdatalink.get_table('ZACKS/FC', params={})
44+
4345
self.assertIsInstance(df, pandas.core.frame.DataFrame)
4446

4547
@patch('nasdaqdatalink.connection.Connection.request')
4648
def test_datatable_with_code_returns_datatable_object(self, mock):
47-
df = nasdaqdatalink.get_table('AR/MWCF', code="ICEP_WAC_Z2017_S")
49+
with self.assertWarns(UserWarning):
50+
df = nasdaqdatalink.get_table('AR/MWCF', code="ICEP_WAC_Z2017_S")
51+
4852
self.assertIsInstance(df, pandas.core.frame.DataFrame)
4953

5054
@patch('nasdaqdatalink.connection.Connection.request')
5155
def test_get_table_calls_connection_with_no_params_for_get_request(self, mock):
52-
nasdaqdatalink.get_table('ZACKS/FC')
53-
expected = call('get', 'datatables/ZACKS/FC', params={})
56+
with self.assertWarns(UserWarning):
57+
nasdaqdatalink.get_table('ZACKS/FC')
58+
expected = call('get', 'datatables/ZACKS/FC', params={})
59+
5460
self.assertEqual(mock.call_args, expected)
5561

5662
@patch('nasdaqdatalink.connection.Connection.request')
5763
def test_get_table_calls_connection_with_no_params_for_post_request(self, mock):
58-
RequestType.USE_GET_REQUEST = False
64+
with self.assertWarns(UserWarning):
65+
RequestType.USE_GET_REQUEST = False
66+
67+
nasdaqdatalink.get_table('ZACKS/FC')
68+
expected = call('post', 'datatables/ZACKS/FC', json={})
5969

60-
nasdaqdatalink.get_table('ZACKS/FC')
61-
expected = call('post', 'datatables/ZACKS/FC', json={})
6270
self.assertEqual(mock.call_args, expected)
6371

6472
@patch('nasdaqdatalink.connection.Connection.request')
6573
def test_get_table_calls_connection_with_params_for_get_request(self, mock):
66-
params = {'ticker': ['AAPL', 'MSFT'],
67-
'per_end_date': {'gte': '2015-01-01'},
68-
'qopts': {'columns': ['ticker', 'per_end_date']},
69-
'foo': 'bar',
70-
'baz': 4
71-
}
72-
73-
expected_params = {'ticker[]': ['AAPL', 'MSFT'],
74-
'per_end_date.gte': '2015-01-01',
75-
'qopts.columns[]': ['ticker', 'per_end_date'],
76-
'foo': 'bar',
77-
'baz': 4
78-
}
79-
80-
nasdaqdatalink.get_table('ZACKS/FC', **params)
81-
expected = call('get', 'datatables/ZACKS/FC', params=expected_params)
74+
with self.assertWarns(UserWarning):
75+
params = {
76+
'ticker': ['AAPL', 'MSFT'],
77+
'per_end_date': {'gte': '2015-01-01'},
78+
'qopts': {'columns': ['ticker', 'per_end_date']},
79+
'foo': 'bar',
80+
'baz': 4
81+
}
82+
83+
expected_params = {
84+
'ticker[]': ['AAPL', 'MSFT'],
85+
'per_end_date.gte': '2015-01-01',
86+
'qopts.columns[]': ['ticker', 'per_end_date'],
87+
'foo': 'bar',
88+
'baz': 4
89+
}
90+
91+
nasdaqdatalink.get_table('ZACKS/FC', **params)
92+
expected = call('get', 'datatables/ZACKS/FC', params=expected_params)
93+
8294
self.assertEqual(mock.call_args, expected)
8395

8496
@patch('nasdaqdatalink.connection.Connection.request')
8597
def test_get_table_calls_connection_with_params_for_post_request(self, mock):
86-
RequestType.USE_GET_REQUEST = False
87-
params = {'ticker': ['AAPL', 'MSFT'],
88-
'per_end_date': {'gte': '2015-01-01'},
89-
'qopts': {'columns': ['ticker', 'per_end_date']},
90-
'foo': 'bar',
91-
'baz': 4
92-
}
93-
94-
expected_params = {'ticker': ['AAPL', 'MSFT'],
95-
'per_end_date.gte': '2015-01-01',
96-
'qopts.columns': ['ticker', 'per_end_date'],
97-
'foo': 'bar',
98-
'baz': 4
99-
}
100-
101-
nasdaqdatalink.get_table('ZACKS/FC', **params)
102-
expected = call('post', 'datatables/ZACKS/FC', json=expected_params)
98+
with self.assertWarns(UserWarning):
99+
RequestType.USE_GET_REQUEST = False
100+
params = {
101+
'ticker': ['AAPL', 'MSFT'],
102+
'per_end_date': {'gte': '2015-01-01'},
103+
'qopts': {'columns': ['ticker', 'per_end_date']},
104+
'foo': 'bar',
105+
'baz': 4
106+
}
107+
108+
expected_params = {
109+
'ticker': ['AAPL', 'MSFT'],
110+
'per_end_date.gte': '2015-01-01',
111+
'qopts.columns': ['ticker', 'per_end_date'],
112+
'foo': 'bar',
113+
'baz': 4
114+
}
115+
116+
nasdaqdatalink.get_table('ZACKS/FC', **params)
117+
expected = call('post', 'datatables/ZACKS/FC', json=expected_params)
118+
103119
self.assertEqual(mock.call_args, expected)

‎tox.ini

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,8 @@ envlist = py3.7,py3.8,py3.9,py3.10
77

88
[testenv]
99
commands =
10-
nosetests
10+
nosetests {posargs}
1111
flake8
12-
python -W always setup.py -q test
1312
deps =
1413
nose
1514
flake8

0 commit comments

Comments
 (0)
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy