From c01b061a64c6c15f6b7f2b2b43a79b96e1e304e1 Mon Sep 17 00:00:00 2001
From: Andrew Schonfeld <andrew.schonfeld@numeric.com>
Date: Tue, 5 Nov 2019 09:38:29 -0500
Subject: [PATCH] hotfix for failing test under certain versions of future
 package (1.3.3)

---
 CHANGES.md                | 4 ++++
 docs/source/conf.py       | 4 ++--
 package.json              | 2 +-
 setup.py                  | 2 +-
 tests/dtale/test_views.py | 5 ++++-
 5 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index b2856177..3268f83a 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -38,3 +38,7 @@ Changelog
     * display of histogram column information
     * reload of hidden "processes" input when loading instances data
     * correlations json failures on string conversion
+
+### 1.3.3 (2019-11-05)
+
+  * hotfix for failing test under certain versions of `future` package
diff --git a/docs/source/conf.py b/docs/source/conf.py
index d523fe7a..b896cafc 100644
--- a/docs/source/conf.py
+++ b/docs/source/conf.py
@@ -63,9 +63,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = u'1.3.2'
+version = u'1.3.3'
 # The full version, including alpha/beta/rc tags.
-release = u'1.3.2'
+release = u'1.3.3'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
diff --git a/package.json b/package.json
index 4817392e..c229bae0 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "dtale",
-  "version": "1.3.2",
+  "version": "1.3.3",
   "description": "Numeric Data Viewer",
   "main": "main.js",
   "directories": {
diff --git a/setup.py b/setup.py
index a3354c4a..cf4bd6dd 100644
--- a/setup.py
+++ b/setup.py
@@ -50,7 +50,7 @@ def run_tests(self):
 
 setup(
     name="dtale",
-    version="1.3.2",
+    version="1.3.3",
     author="MAN Alpha Technology",
     author_email="ManAlphaTech@man.com",
     description="Web Client for Visualizing Pandas Objects",
diff --git a/tests/dtale/test_views.py b/tests/dtale/test_views.py
index 1e42f5e5..ffbdd05a 100644
--- a/tests/dtale/test_views.py
+++ b/tests/dtale/test_views.py
@@ -269,7 +269,7 @@ def test_get_data(unittest, test_data):
             response = c.get('/dtale/data', query_string=dict(ids=json.dumps(['0']), query="missing_col == 'blah'"))
             response_data = json.loads(response.data)
             unittest.assertEqual(
-                response_data['error'], "name 'missing_col' is not defined", 'should handle correlations exception'
+                response_data['error'], "name 'missing_col' is not defined", 'should handle data exception'
             )
 
     with app.test_client() as c:
@@ -350,7 +350,10 @@ def test_get_histogram(unittest, test_data):
 
 @pytest.mark.unit
 def test_get_correlations(unittest, test_data):
+    import dtale.views as views
+
     with app.test_client() as c:
+        test_data, _ = views.format_data(test_data)
         with mock.patch('dtale.views.DATA', {c.port: test_data}):
             response = c.get('/dtale/correlations')
             response_data = json.loads(response.data)