From 1eff48facb3e1826f1ffb6ca80c94b5fff06b04b Mon Sep 17 00:00:00 2001
From: Maxime Beauchemin <maximebeauchemin@gmail.com>
Date: Mon, 12 Jun 2017 13:21:14 -0700
Subject: [PATCH] Bumping some dependencies (#2945)

Most notably Flask AppBuilder to 1.9.0
---
 setup.py                                      |  6 ++---
 .../javascripts/components/ModalTrigger.jsx   |  1 +
 superset/assets/package.json                  | 22 +++++++++----------
 .../javascripts/sqllab/QuerySearch_spec.jsx   | 11 ++++++----
 4 files changed, 22 insertions(+), 18 deletions(-)

diff --git a/setup.py b/setup.py
index 327c1615e..dc4f42d22 100644
--- a/setup.py
+++ b/setup.py
@@ -45,11 +45,11 @@ setup(
         'boto3==1.4.4',
         'celery==3.1.23',
         'cryptography==1.7.2',
-        'flask-appbuilder==1.8.1',
+        'flask-appbuilder==1.9.0',
         'flask-cache==0.13.1',
         'flask-migrate==2.0.3',
         'flask-script==2.0.5',
-        'flask-sqlalchemy==2.0',
+        'flask-sqlalchemy==2.1',
         'flask-testing==0.6.2',
         'flask-wtf==0.14.2',
         'future>=0.16.0, <0.17',
@@ -61,7 +61,7 @@ setup(
         'pydruid==0.3.1',
         'PyHive>=0.3.0',
         'python-dateutil==2.6.0',
-        'requests==2.13.0',
+        'requests==2.17.3',
         'simplejson==3.10.0',
         'six==1.10.0',
         'sqlalchemy==1.1.9',
diff --git a/superset/assets/javascripts/components/ModalTrigger.jsx b/superset/assets/javascripts/components/ModalTrigger.jsx
index 628f0067b..315a75354 100644
--- a/superset/assets/javascripts/components/ModalTrigger.jsx
+++ b/superset/assets/javascripts/components/ModalTrigger.jsx
@@ -87,6 +87,7 @@ export default class ModalTrigger extends React.Component {
         </Button>
       );
     }
+    /* eslint-disable jsx-a11y/interactive-supports-focus */
     return (
       <span className={classNames} onClick={this.open} role="button">
         {this.props.triggerNode}
diff --git a/superset/assets/package.json b/superset/assets/package.json
index 80b1b6401..c466dac9c 100644
--- a/superset/assets/package.json
+++ b/superset/assets/package.json
@@ -47,7 +47,7 @@
     "classnames": "^2.2.5",
     "d3": "^3.5.15",
     "d3-cloud": "^1.2.1",
-    "d3-sankey": "^0.4.1",
+    "d3-sankey": "^0.4.2",
     "d3-scale": "^1.0.3",
     "d3-tip": "^0.6.7",
     "datamaps": "^0.5.8",
@@ -67,11 +67,11 @@
     "nvd3": "1.8.5",
     "prop-types": "^15.5.8",
     "react": "^15.5.1",
-    "react-ace": "^4.1.5",
+    "react-ace": "^5.0.1",
     "react-addons-css-transition-group": "^15.4.2",
     "react-addons-shallow-compare": "^15.4.2",
     "react-alert": "^2.0.1",
-    "react-bootstrap": "^0.30.3",
+    "react-bootstrap": "^0.31.0",
     "react-bootstrap-table": "^3.1.7",
     "react-dom": "^15.5.1",
     "react-draggable": "^2.1.2",
@@ -93,28 +93,28 @@
     "supercluster": "https://github.com/georgeke/supercluster/tarball/ac3492737e7ce98e07af679623aad452373bbc40",
     "topojson": "^1.6.22",
     "urijs": "^1.18.10",
-    "victory": "^0.18.4",
+    "victory": "^0.21.0",
     "viewport-mercator-project": "^2.1.0"
   },
   "devDependencies": {
     "babel-cli": "^6.14.0",
     "babel-core": "^6.10.4",
     "babel-istanbul": "^0.12.2",
-    "babel-loader": "^6.2.4",
+    "babel-loader": "^7.0.0",
     "babel-plugin-css-modules-transform": "^1.1.0",
     "babel-polyfill": "^6.23.0",
     "babel-preset-airbnb": "^2.1.1",
     "babel-preset-es2015": "^6.14.0",
     "babel-preset-react": "^6.11.1",
-    "chai": "^3.5.0",
-    "codeclimate-test-reporter": "^0.4.1",
+    "chai": "^4.0.2",
+    "codeclimate-test-reporter": "^0.5.0",
     "css-loader": "^0.28.0",
     "enzyme": "^2.0.0",
     "eslint": "^3.19.0",
-    "eslint-config-airbnb": "^14.1.0",
+    "eslint-config-airbnb": "^15.0.1",
     "eslint-plugin-import": "^2.2.0",
-    "eslint-plugin-jsx-a11y": "^4.0.0",
-    "eslint-plugin-react": "^6.10.3",
+    "eslint-plugin-jsx-a11y": "^5.0.3",
+    "eslint-plugin-react": "^7.0.1",
     "exports-loader": "^0.6.3",
     "file-loader": "^0.11.1",
     "github-changes": "^1.0.4",
@@ -130,7 +130,7 @@
     "react-test-renderer": "^15.5.1",
     "redux-mock-store": "^1.2.3",
     "sinon": "^2.1.0",
-    "style-loader": "^0.16.1",
+    "style-loader": "^0.18.2",
     "transform-loader": "^0.2.3",
     "url-loader": "^0.5.7",
     "webpack": "^2.3.3",
diff --git a/superset/assets/spec/javascripts/sqllab/QuerySearch_spec.jsx b/superset/assets/spec/javascripts/sqllab/QuerySearch_spec.jsx
index e68ebd062..349a4b19a 100644
--- a/superset/assets/spec/javascripts/sqllab/QuerySearch_spec.jsx
+++ b/superset/assets/spec/javascripts/sqllab/QuerySearch_spec.jsx
@@ -18,7 +18,10 @@ describe('QuerySearch', () => {
       React.isValidElement(<QuerySearch {...mockedProps} />),
     ).to.equal(true);
   });
-  const wrapper = shallow(<QuerySearch {...mockedProps} />);
+  let wrapper;
+  beforeEach(() => {
+    wrapper = shallow(<QuerySearch {...mockedProps} />);
+  });
 
   it('should have three Select', () => {
     expect(wrapper.find(Select)).to.have.length(3);
@@ -56,9 +59,9 @@ describe('QuerySearch', () => {
   });
 
   it('refreshes queries when clicked', () => {
-    const search = sinon.spy(QuerySearch.prototype, 'refreshQueries');
+    const spy = sinon.spy(QuerySearch.prototype, 'refreshQueries');
+    wrapper = shallow(<QuerySearch {...mockedProps} />);
     wrapper.find(Button).simulate('click');
-    /* eslint-disable no-unused-expressions */
-    expect(search).to.have.been.called;
+    expect(spy.called).to.equal(true);
   });
 });