Merge pull request #154 from mistercrunch/fix_dates

Digging into leap year bug and improvming tests

panoramix/utils.py

@@ -2,6 +2,7 @@ from datetime import datetime
 import functools
 import hashlib
 import json
+import logging
 
 from dateutil.parser import parse
 from sqlalchemy.types import TypeDecorator, TEXT
@@ -45,6 +46,7 @@ def parse_human_datetime(s):
     generated strings
 
     >>> from datetime import date, timedelta
+    >>> from dateutil.relativedelta import relativedelta
     >>> parse_human_datetime('2015-04-03')
     datetime.datetime(2015, 4, 3, 0, 0)
     >>> parse_human_datetime('2/3/1969')
@@ -55,12 +57,18 @@ def parse_human_datetime(s):
     True
     >>> date.today() - timedelta(1) == parse_human_datetime('yesterday').date()
     True
+    >>> parse_human_datetime('one year ago').date() == (datetime.now() - relativedelta(years=1) ).date()
+    True
     """
     try:
         dttm = parse(s)
     except:
-        cal = parsedatetime.Calendar()
-        dttm = dttm_from_timtuple(cal.parse(s)[0])
+        try:
+            cal = parsedatetime.Calendar()
+            dttm = dttm_from_timtuple(cal.parse(s)[0])
+        except Exception as e:
+            logging.exception(e)
+            raise ValueError("Couldn't parse date string [{}]".format(s))
     return dttm
 
 

setup.py

@@ -29,7 +29,7 @@ setup(
         'markdown>=2.6.2, <3.0.0',
         'numpy>=1.9, <2',
         'pandas==0.16.2, <0.17',
-        'parsedatetime>=1.5, <2.0.0',
+        'parsedatetime==2.0.0',
         'pydruid>=0.2.2, <0.3',
         'python-dateutil>=2.4.2, <3.0.0',
         'requests>=2.7.0, <3.0.0',