Skip to content

Commit

Permalink
hotfix for failing test under certain versions of future package (1.3.3)
Browse files Browse the repository at this point in the history
  • Loading branch information
Andrew Schonfeld committed Nov 5, 2019
1 parent d0d8be0 commit c01b061
Show file tree
Hide file tree
Showing 5 changed files with 12 additions and 5 deletions.
4 changes: 4 additions & 0 deletions CHANGES.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
4 changes: 2 additions & 2 deletions docs/source/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "dtale",
"version": "1.3.2",
"version": "1.3.3",
"description": "Numeric Data Viewer",
"main": "main.js",
"directories": {
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
5 changes: 4 additions & 1 deletion tests/dtale/test_views.py
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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)
Expand Down

0 comments on commit c01b061

Please sign in to comment.