Skip to content

Commit 95c6356

Browse files
committed
Merge pull request pandas-dev#120 from manahl/timefixes
Fixes to support latest versions of dateutil and Numpy
2 parents 0046df4 + bd54d1f commit 95c6356

File tree

3 files changed

+3
-15
lines changed

3 files changed

+3
-15
lines changed

arctic/date/_parse.py

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,4 @@
22

33

44
def parse(string, agnostic=False, **kwargs):
5-
parsed = _parse(string, **kwargs)
6-
if agnostic or (parsed == _parse(string, yearfirst=True, **kwargs)
7-
== _parse(string, dayfirst=True, **kwargs)):
8-
return parsed
9-
else:
10-
raise ValueError("The date was ambiguous: %s" % string)
5+
return _parse(string, yearfirst=True, dayfirst=False, **kwargs)

tests/integration/tickstore/test_ts_read.py

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,7 @@ def test_read(tickstore_lib):
4040
assert_array_equal(df['ASK'].values, np.array([1545.25, np.nan]))
4141
assert_array_equal(df['BID'].values, np.array([1545, np.nan]))
4242
assert_array_equal(df['PRICE'].values, np.array([1545, 1543.75]))
43-
assert_array_equal(df.index.values, np.array(['2007-07-22T04:59:47.070000000+0100',
44-
'2007-07-22T23:00:00.600000000+0100'], dtype='datetime64[ns]'))
43+
assert_array_equal(df.index.values.astype('object'), np.array([1185076787070000000, 1185141600600000000]))
4544
assert tickstore_lib._collection.find_one()['c'] == 2
4645

4746

@@ -87,8 +86,7 @@ def test_read_multiple_symbols(tickstore_lib):
8786
assert_array_equal(df['ASK'].values, np.array([1545.25, np.nan]))
8887
assert_array_equal(df['BID'].values, np.array([1545, np.nan]))
8988
assert_array_equal(df['PRICE'].values, np.array([1545, 1543.75]))
90-
assert_array_equal(df.index.values, np.array(['2007-07-22T04:59:47.070000000+0100',
91-
'2007-07-22T23:00:00.600000000+0100'], dtype='datetime64[ns]'))
89+
assert_array_equal(df.index.values.astype('object'), np.array([1185076787070000000, 1185141600600000000]))
9290
assert tickstore_lib._collection.find_one()['c'] == 1
9391

9492

tests/unit/date/test_daterange.py

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -60,11 +60,6 @@ def test_daterange_arg_parsing(date_range):
6060
assert d1.unbounded is False
6161

6262

63-
def test_ambiguous_parse():
64-
with pytest.raises(ValueError):
65-
DateRange('02/01/2011')
66-
67-
6863
def test_daterange_eq():
6964
d1 = DateRange('20110101', '20111231')
7065
d2 = DateRange('20110101', '20111231')

0 commit comments

Comments
 (0)