Compare commits

...

3 Commits

Author SHA1 Message Date
Daniel Gaspar
cc69e3ab20 0.35.0rc2 2019-10-28 09:50:37 +00:00
John Bodley
59318977f1 [fix] Updating parse_human_timedelta typing (#8436) 2019-10-28 09:48:56 +00:00
Daniel Gaspar
11774262d8 0.35.0rc1 2019-10-23 10:46:37 +01:00
4 changed files with 4 additions and 5 deletions

View File

@@ -1,6 +1,6 @@
{
"name": "superset",
"version": "0.999.0dev",
"version": "0.35.0rc2",
"description": "Superset is a data exploration platform designed to be visual, intuitive, and interactive.",
"license": "Apache-2.0",
"directories": {

View File

@@ -78,9 +78,7 @@ class QueryObject:
)
self.is_timeseries = is_timeseries
self.time_range = time_range
self.time_shift = (
utils.parse_human_timedelta(time_shift) if time_shift else None
)
self.time_shift = utils.parse_human_timedelta(time_shift)
self.groupby = groupby or []
# Temporal solution for backward compatability issue

View File

@@ -291,7 +291,7 @@ class DashboardEncoder(json.JSONEncoder):
return json.JSONEncoder(sort_keys=True).default(self, o)
def parse_human_timedelta(s: str) -> timedelta:
def parse_human_timedelta(s: Optional[str]) -> timedelta:
"""
Returns ``datetime.datetime`` from natural language time deltas

View File

@@ -130,6 +130,7 @@ class UtilsTestCase(unittest.TestCase):
self.assertEqual(parse_human_timedelta("now"), timedelta(0))
self.assertEqual(parse_human_timedelta("1 year"), timedelta(366))
self.assertEqual(parse_human_timedelta("-1 year"), timedelta(-365))
self.assertEqual(parse_human_timedelta(None), timedelta(0))
@patch("superset.utils.core.datetime")
def test_parse_past_timedelta(self, mock_datetime):