Merge pull request apache#13 from timifasubaa/airbnb-master

Sync with open source master

.gitignore

@@ -31,9 +31,10 @@ app.db
 *.entry.js
 *.js.map
 node_modules
-npm-debug.log
+npm-debug.log*
 yarn.lock
 superset/assets/version_info.json
 
 # IntelliJ
 *.iml
+venv

.travis.yml

@@ -10,7 +10,6 @@ cache:
 env:
   global:
     - TRAVIS_CACHE=$HOME/.travis_cache/
-    - TRAVIS_NODE_VERSION="8.8.1"
   matrix:
     - TOX_ENV=flake8
     - TOX_ENV=javascript
@@ -19,8 +18,6 @@ env:
     - TOX_ENV=py34-sqlite
     - TOX_ENV=py27-mysql
     - TOX_ENV=py27-sqlite
-before_install:
-  - npm install -g npm@'>=5.4.1'
 before_script:
   - mysql -u root -e "DROP DATABASE IF EXISTS superset; CREATE DATABASE superset DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci"
   - mysql -u root -e "CREATE USER 'mysqluser'@'localhost' IDENTIFIED BY 'mysqluserpassword';"
@@ -31,6 +28,4 @@ before_script:
 install:
   - pip install --upgrade pip
   - pip install tox tox-travis
-  - pip install --upgrade flake8
-  - rm -rf ~/.nvm && git clone https://github.com/creationix/nvm.git ~/.nvm && (cd ~/.nvm && git checkout `git describe --abbrev=0 --tags`) && source ~/.nvm/nvm.sh && nvm install $TRAVIS_NODE_VERSION
 script: tox -e $TOX_ENV

MANIFEST.in

@@ -3,6 +3,7 @@ recursive-include superset/migrations *
 recursive-include superset/static *
 recursive-exclude superset/static/docs *
 recursive-exclude superset/static/spec *
+recursive-exclude superset/static/images/viz_thumbnails_large *
 recursive-exclude superset/static/assets/node_modules *
 recursive-include superset/templates *
 recursive-include superset/translations *

README.md

@@ -165,6 +165,8 @@ the world know they are using Superset. Join our growing community!
  - [Konfío](http://konfio.mx)
  - [Lyft](https://www.lyft.com/)
  - [Maieutical Labs](https://cloudschooling.it)
+ - [PeopleDoc](https://www.people-doc.com) 
+ - [Ona](https://ona.io)
  - [Pronto Tools](http://www.prontotools.io)
  - [Qunar](https://www.qunar.com/)
  - [Shopee](https://shopee.sg)

dev-reqs.txt

@@ -2,6 +2,7 @@ codeclimate-test-reporter
 coveralls
 flake8
 flask_cors
+ipdb
 mock
 mysqlclient
 nose

docs/gallery.rst

@@ -2,88 +2,88 @@ Gallery
 =======
 
 .. image:: _static/img/viz_thumbnails/line.png
-   :scale: 25 %
+   :scale: 50 %
 
 .. image:: _static/img/viz_thumbnails/bubble.png
-   :scale: 25 %
+   :scale: 50 %
 
 .. image:: _static/img/viz_thumbnails/table.png
-   :scale: 25 %
+   :scale: 50 %
 
 .. image:: _static/img/viz_thumbnails/pie.png
-   :scale: 25 %
+   :scale: 50 %
 
 .. image:: _static/img/viz_thumbnails/bar.png
-   :scale: 25 %
+   :scale: 50 %
 
 .. image:: _static/img/viz_thumbnails/world_map.png
-   :scale: 25 %
+   :scale: 50 %
 
 .. image:: _static/img/viz_thumbnails/sankey.png
-   :scale: 25 %
+   :scale: 50 %
 
 .. image:: _static/img/viz_thumbnails/word_cloud.png
-   :scale: 25 %
+   :scale: 50 %
 
 .. image:: _static/img/viz_thumbnails/filter_box.png
-   :scale: 25 %
+   :scale: 50 %
 
 .. image:: _static/img/viz_thumbnails/pivot_table.png
-   :scale: 25 %
+   :scale: 50 %
 
 .. image:: _static/img/viz_thumbnails/directed_force.png
-   :scale: 25 %
+   :scale: 50 %
 
 .. image:: _static/img/viz_thumbnails/compare.png
-   :scale: 25 %
+   :scale: 50 %
 
 .. image:: _static/img/viz_thumbnails/sunburst.png
-   :scale: 25 %
+   :scale: 50 %
 
 .. image:: _static/img/viz_thumbnails/area.png
-   :scale: 25 %
+   :scale: 50 %
 
 .. image:: _static/img/viz_thumbnails/big_number.png
-   :scale: 25 %
+   :scale: 50 %
 
 .. image:: _static/img/viz_thumbnails/big_number_total.png
-   :scale: 25 %
+   :scale: 50 %
 
 .. image:: _static/img/viz_thumbnails/bullet.png
-   :scale: 25 %
+   :scale: 50 %
 
 .. image:: _static/img/viz_thumbnails/dist_bar.png
-   :scale: 25 %
+   :scale: 50 %
 
 .. image:: _static/img/viz_thumbnails/heatmap.png
-   :scale: 25 %
+   :scale: 50 %
 
 .. image:: _static/img/viz_thumbnails/markup.png
-   :scale: 25 %
+   :scale: 50 %
 
 .. image:: _static/img/viz_thumbnails/para.png
-   :scale: 25 %
+   :scale: 50 %
 
 .. image:: _static/img/viz_thumbnails/iframe.png
-   :scale: 25 %
+   :scale: 50 %
 
 .. image:: _static/img/viz_thumbnails/box_plot.png
-   :scale: 25 %
+   :scale: 50 %
 
 .. image:: _static/img/viz_thumbnails/treemap.png
-   :scale: 25 %
+   :scale: 50 %
 
 .. image:: _static/img/viz_thumbnails/cal_heatmap.png
-   :scale: 25 %
+   :scale: 50 %
 
 .. image:: _static/img/viz_thumbnails/horizon.png
-   :scale: 25 %
+   :scale: 50 %
 
 .. image:: _static/img/viz_thumbnails/mapbox.png
-   :scale: 25 %
+   :scale: 50 %
 
 .. image:: _static/img/viz_thumbnails/separator.png
-   :scale: 25 %
+   :scale: 50 %
 
 .. image:: _static/img/viz_thumbnails/histogram.png
-   :scale: 25 %
+   :scale: 50 %

docs/installation.rst

@@ -53,6 +53,12 @@ the required dependencies are installed: ::
 
     sudo apt-get install build-essential libssl-dev libffi-dev python-dev python-pip libsasl2-dev libldap2-dev
 
+**Ubuntu 16.04** If you have python3.5 installed alongside with python2.7, as is default on **Ubuntu 16.04 LTS**, run this command also
+
+    sudo apt-get install build-essential libssl-dev libffi-dev python3.5-dev python-pip libsasl2-dev libldap2-dev
+
+otherwhise build for ``cryptography`` fails.
+
 For **Fedora** and **RHEL-derivatives**, the following command will ensure
 that the required dependencies are installed: ::
 
@@ -343,6 +349,16 @@ For setting your timeouts, this is done in the Superset metadata and goes
 up the "timeout searchpath", from your slice configuration, to your
 data source's configuration, to your database's and ultimately falls back
 into your global default defined in ``CACHE_CONFIG``.
+
+.. code-block:: python
+
+    CACHE_CONFIG = {
+	    'CACHE_TYPE': 'redis',
+	    'CACHE_DEFAULT_TIMEOUT': 60 * 60 * 24, # 1 day default (in secs)
+	    'CACHE_KEY_PREFIX': 'superset_results',
+	    'CACHE_REDIS_URL': 'redis://localhost:6379/0',
+	}
+
 
 
 Deeper SQLAlchemy integration

docs/tutorial.rst

@@ -23,7 +23,7 @@ Under the **Sources** menu, select the *Databases* option:
 .. image:: _static/img/tutorial/tutorial_01_sources_database.png
    :scale: 70%
 
-On the resulting page, click on the green plus sign, near the top left:
+On the resulting page, click on the green plus sign, near the top right:
 
 .. image:: _static/img/tutorial/tutorial_02_add_database.png
    :scale: 70%

setup.py

@@ -49,37 +49,39 @@ def get_git_sha():
         'colorama==0.3.9',
         'cryptography==1.9',
         'flask==0.12.2',
-        'flask-appbuilder==1.9.5',
+        'flask-appbuilder==1.9.6',
         'flask-cache==0.13.1',
-        'flask-migrate==2.0.3',
-        'flask-script==2.0.5',
+        'flask-migrate==2.1.1',
+        'flask-script==2.0.6',
         'flask-sqlalchemy==2.1',
-        'flask-testing==0.6.2',
+        'flask-testing==0.7.1',
         'flask-wtf==0.14.2',
         'flower==0.9.2',
         'future>=0.16.0, <0.17',
+        'geopy==1.11.0',
         'python-geohash==0.8.5',
         'humanize==0.5.1',
         'gunicorn==19.7.1',
-        'idna==2.5',
-        'markdown==2.6.8',
-        'pandas==0.20.3',
+        'idna==2.6',
+        'markdown==2.6.11',
+        'pandas==0.22.0',
         'parsedatetime==2.0.0',
         'pathlib2==2.3.0',
         'polyline==1.3.2',
-        'pydruid==0.3.1',
+        'pydruid==0.4.1',
         'PyHive>=0.4.0',
-        'python-dateutil==2.6.0',
+        'python-dateutil==2.6.1',
         'pyyaml>=3.11',
-        'requests==2.17.3',
-        'simplejson==3.10.0',
+        'requests==2.18.4',
+        'simplejson==3.13.2',
         'six==1.11.0',
-        'sqlalchemy==1.1.9',
-        'sqlalchemy-utils==0.32.16',
-        'sqlparse==0.2.3',
+        'sqlalchemy==1.2.2',
+        'sqlalchemy-utils==0.32.21',
+        'sqlparse==0.2.4',
         'thrift>=0.9.3',
         'thrift-sasl>=0.2.1',
         'unidecode>=0.04.21',
+        'bleach==2.1.2',
     ],
     extras_require={
         'cors': ['Flask-Cors>=2.0.0'],

superset/assets/javascripts/SqlLab/components/VisualizeModal.jsx

@@ -9,7 +9,7 @@ import { Alert, Button, Col, Modal } from 'react-bootstrap';
 import Select from 'react-select';
 import { Table } from 'reactable';
 import shortid from 'shortid';
-import { getExploreUrl } from '../../explore/exploreUtils';
+import { exportChart } from '../../explore/exploreUtils';
 import * as actions from '../actions';
 import { VISUALIZE_VALIDATION_ERRORS } from '../constants';
 import visTypes from '../../explore/stores/visTypes';
@@ -166,7 +166,8 @@ class VisualizeModal extends React.PureComponent {
         }
         notify.info(t('Creating a data source and popping a new tab'));
 
-        window.open(getExploreUrl(formData));
+        // open new window for data visualization
+        exportChart(formData);
       })
       .fail(() => {
         notify.error(this.props.errorMessage);
@@ -294,7 +295,7 @@ function mapStateToProps(state) {
   return {
     datasource: state.datasource,
     errorMessage: state.errorMessage,
-    timeout: state.common ? state.common.SUPERSET_WEBSERVER_TIMEOUT : null,
+    timeout: state.common ? state.common.conf.SUPERSET_WEBSERVER_TIMEOUT : null,
   };
 }