From a743eb206dc38c38700a14026574ee81b6087ed4 Mon Sep 17 00:00:00 2001 From: Will Barrett Date: Thu, 9 Apr 2020 12:39:09 -0700 Subject: [PATCH 1/3] Check for dttm attrs in viz.py --- superset/viz.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/superset/viz.py b/superset/viz.py index 3de5e0501d6bd..88102aaf41e33 100644 --- a/superset/viz.py +++ b/superset/viz.py @@ -475,6 +475,7 @@ def get_df_payload(self, query_obj=None, **kwargs): logger.warning("Could not cache key {}".format(cache_key)) logger.exception(ex) cache.delete(cache_key) + return { "cache_key": self._any_cache_key, "cached_dttm": self._any_cached_dttm, @@ -484,8 +485,8 @@ def get_df_payload(self, query_obj=None, **kwargs): "form_data": self.form_data, "is_cached": self._any_cache_key is not None, "query": self.query, - "from_dttm": self.from_dttm, - "to_dttm": self.to_dttm, + "from_dttm": self.from_dttm if hasattr(self, 'from_dttm') else None, + "to_dttm": self.to_dttm if hasattr(self, 'to_dttm') else None, "status": self.status, "stacktrace": stacktrace, "rowcount": len(df.index) if df is not None else 0, From 0b17e65cc83441f695a564bc6871981e1d8337b1 Mon Sep 17 00:00:00 2001 From: Will Barrett Date: Thu, 9 Apr 2020 13:06:14 -0700 Subject: [PATCH 2/3] black --- superset/viz.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/superset/viz.py b/superset/viz.py index 88102aaf41e33..d6d8ca6f05992 100644 --- a/superset/viz.py +++ b/superset/viz.py @@ -485,8 +485,8 @@ def get_df_payload(self, query_obj=None, **kwargs): "form_data": self.form_data, "is_cached": self._any_cache_key is not None, "query": self.query, - "from_dttm": self.from_dttm if hasattr(self, 'from_dttm') else None, - "to_dttm": self.to_dttm if hasattr(self, 'to_dttm') else None, + "from_dttm": self.from_dttm if hasattr(self, "from_dttm") else None, + "to_dttm": self.to_dttm if hasattr(self, "to_dttm") else None, "status": self.status, "stacktrace": stacktrace, "rowcount": len(df.index) if df is not None else 0, From c1e0da77dd19ded90338588d0350af868da97658 Mon Sep 17 00:00:00 2001 From: Will Barrett Date: Fri, 10 Apr 2020 09:57:49 -0700 Subject: [PATCH 3/3] Random whitespace change to re-trigger Travis --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 919d8796f61ea..03b45e44d1593 100644 --- a/README.md +++ b/README.md @@ -19,6 +19,7 @@ under the License. Superset ========= + [![Build Status](https://travis-ci.org/apache/incubator-superset.svg?branch=master)](https://travis-ci.org/apache/incubator-superset) [![PyPI version](https://badge.fury.io/py/apache-superset.svg)](https://badge.fury.io/py/apache-superset) [![Coverage Status](https://codecov.io/github/apache/incubator-superset/coverage.svg?branch=master)](https://codecov.io/github/apache/incubator-superset)