Merge branch 'patch-1' of github.com:hajdbo/incubator-superset into p…

…atch-1

CONTRIBUTING.md

@@ -432,9 +432,9 @@ npm run lint
 
 ### Python Testing
 
-All python tests are carried out in [tox](http://tox.readthedocs.io/en/latest/index.html)
+All python tests are carried out in [tox](https://tox.readthedocs.io/en/latest/index.html)
 a standardized testing framework.
-All python tests can be run with any of the tox [environments](http://tox.readthedocs.io/en/latest/example/basic.html#a-simple-tox-ini-default-environments), via,
+All python tests can be run with any of the tox [environments](https://tox.readthedocs.io/en/latest/example/basic.html#a-simple-tox-ini-default-environments), via,
 
 ```bash
 tox -e <environment>
@@ -464,7 +464,7 @@ commands are invoked.
 
 ### JavaScript Testing
 
-We use [Jest](https://jestjs.io/) and [Enzyme](http://airbnb.io/enzyme/) to test Javascript. Tests can be run with:
+We use [Jest](https://jestjs.io/) and [Enzyme](https://airbnb.io/enzyme/) to test Javascript. Tests can be run with:
 
 ```bash
 cd superset/assets

README.md

@@ -92,7 +92,7 @@ Database Support
 
 Superset speaks many SQL dialects through SQLAlchemy, a Python
 ORM that is compatible with
-[most common databases](http://docs.sqlalchemy.org/en/rel_1_0/core/engines.html).
+[most common databases](https://docs.sqlalchemy.org/en/rel_1_2/core/engines.html).
 
 Superset can be used to visualize data out of most databases:
 * MySQL

RELEASING.md

@@ -83,7 +83,7 @@ git push apache 0.25 --tags
 # superset package. Committers that want to ship releases
 # should have this access.
 # You'll also need a `.pypirc` as specified here:
-# http://peterdowns.com/posts/first-time-with-pypi.html
+# https://gist.github.com/davydany/b08acef08f75fe297e13ae4d24ce9f4d
 ./pypi_push.sh
 
 # publish an update to the CHANGELOG.md for the right version range

docs/Makefile

@@ -25,7 +25,7 @@ BUILDDIR      = _build
 
 # User-friendly check for sphinx-build
 ifeq ($(shell which $(SPHINXBUILD) >/dev/null 2>&1; echo $$?), 1)
-$(error The '$(SPHINXBUILD)' command was not found. Make sure you have Sphinx installed, then set the SPHINXBUILD environment variable to point to the full path of the '$(SPHINXBUILD)' executable. Alternatively you can add the directory with the executable to your PATH. If you don't have Sphinx installed, grab it from http://sphinx-doc.org/)
+$(error The '$(SPHINXBUILD)' command was not found. Make sure you have Sphinx installed, then set the SPHINXBUILD environment variable to point to the full path of the '$(SPHINXBUILD)' executable. Alternatively you can add the directory with the executable to your PATH. If you don't have Sphinx installed, grab it from https://sphinx-doc.org/)
 endif
 
 # Internal variables.

docs/faq.rst

@@ -272,7 +272,7 @@ Superset in the :ref:`ref_database_deps` section of the docs. Database
 engines not listed in this page may work too. We rely on the
 community to contribute to this knowledge base.
 
-.. _SQLAlchemy dialect: http://docs.sqlalchemy.org/en/latest/dialects/
+.. _SQLAlchemy dialect: https://docs.sqlalchemy.org/en/latest/dialects/
 .. _DBAPI driver: https://www.python.org/dev/peps/pep-0249/
 
 For a database engine to be supported in Superset through the

docs/installation.rst

@@ -215,7 +215,7 @@ setup known to work well in production: ::
         superset:app
 
 Refer to the
-`Gunicorn documentation <http://docs.gunicorn.org/en/stable/design.html>`_
+`Gunicorn documentation <https://docs.gunicorn.org/en/stable/design.html>`_
 for more information.
 
 Note that *gunicorn* does not
@@ -319,7 +319,7 @@ as well as Flask extensions like ``flask-wtf``, ``flask-cache``,
 ``flask-migrate``, and ``flask-appbuilder``. Flask App Builder, the web
 framework used by Superset offers many configuration settings. Please consult
 the `Flask App Builder Documentation
-<http://flask-appbuilder.readthedocs.org/en/latest/config.html>`_
+<https://flask-appbuilder.readthedocs.org/en/latest/config.html>`_
 for more information on how to configure it.
 
 Make sure to change:
@@ -497,9 +497,9 @@ find an ``extra`` field as a ``JSON`` blob.
 
 This JSON string contains extra configuration elements. The ``engine_params``
 object gets unpacked into the
-`sqlalchemy.create_engine <http://docs.sqlalchemy.org/en/latest/core/engines.html#sqlalchemy.create_engine>`_ call,
+`sqlalchemy.create_engine <https://docs.sqlalchemy.org/en/latest/core/engines.html#sqlalchemy.create_engine>`_ call,
 while the ``metadata_params`` get unpacked into the
-`sqlalchemy.MetaData <http://docs.sqlalchemy.org/en/rel_1_0/core/metadata.html#sqlalchemy.schema.MetaData>`_ call. Refer to the SQLAlchemy docs for more information.
+`sqlalchemy.MetaData <https://docs.sqlalchemy.org/en/rel_1_2/core/metadata.html#sqlalchemy.schema.MetaData>`_ call. Refer to the SQLAlchemy docs for more information.
 
 
 Schemas (Postgres & Redshift)
@@ -583,7 +583,7 @@ The following keys in `superset_config.py` can be specified to configure CORS:
 
 
 * ``ENABLE_CORS``: Must be set to True in order to enable CORS
-* ``CORS_OPTIONS``: options passed to Flask-CORS (`documentation <http://flask-cors.corydolphin.com/en/latest/api.html#extension>`)
+* ``CORS_OPTIONS``: options passed to Flask-CORS (`documentation <https://flask-cors.corydolphin.com/en/latest/api.html#extension>`)
 
 
 DOMAIN SHARDING

docs/security.rst

@@ -21,7 +21,7 @@ Security in Superset is handled by Flask AppBuilder (FAB). FAB is a
 "Simple and rapid application development framework, built on top of Flask.".
 FAB provides authentication, user management, permissions and roles.
 Please read its `Security documentation 
-<http://flask-appbuilder.readthedocs.io/en/latest/security.html>`_.
+<https://flask-appbuilder.readthedocs.io/en/latest/security.html>`_.
 
 Provided Roles
 --------------

docs/visualization.rst

@@ -1837,17 +1837,17 @@ Need to add a new Country?
 To add a new country in country map tools, we need to follow the following steps :
 
 1. You need shapefiles which contain data of your map.
-   You can get this file on this site: http://www.diva-gis.org/gdata
+   You can get this file on this site: https://www.diva-gis.org/gdata
 
 2. You need to add ISO 3166-2 with column name ISO for all record in your file. 
    It's important because it's a norm for mapping your data with geojson file
 
 3. You need to convert shapefile to geojson file.
-   This action can make with ogr2ogr tools: http://www.gdal.org/ogr2ogr.html
+   This action can make with ogr2ogr tools: https://www.gdal.org/ogr2ogr.html
 
 4. Put your geojson file in next folder : superset/assets/src/visualizations/CountryMap/countries with the next name : nameofyourcountries.geojson
 
-5. You can to reduce size of geojson file on this site: http://mapshaper.org/
+5. You can to reduce size of geojson file on this site: https://mapshaper.org/
 
 6. Go in file superset/assets/src/explore/controls.jsx
 

setup.py

@@ -120,7 +120,7 @@ def get_git_sha():
     },
     author='Apache Software Foundation',
     author_email='dev@superset.incubator.apache.org',
-    url='http://superset.apache.org/',
+    url='https://superset.apache.org/',
     download_url=(
         'https://dist.apache.org/repos/dist/release/superset/' + version_string
     ),

superset/assets/package.json

@@ -45,7 +45,7 @@
   "engines": {
     "node": ">= 6.11.5 <7.0.0 || >= 8.9.0"
   },
-  "homepage": "http://superset.apache.org/",
+  "homepage": "https://superset.apache.org/",
   "dependencies": {
     "@data-ui/sparkline": "^0.0.54",
     "@superset-ui/chart": "^0.10.2",

superset/assets/spec/javascripts/sqllab/Link_spec.jsx

@@ -24,7 +24,7 @@ import Link from '../../../src/SqlLab/components/Link';
 describe('Link', () => {
   const mockedProps = {
     tooltip: 'This is a tooltip',
-    href: 'http://www.airbnb.com',
+    href: 'https://www.airbnb.com',
   };
   it('renders', () => {
     expect(React.isValidElement(<Link>TEST</Link>)).toBe(true);

superset/assets/src/SqlLab/components/TemplateParamsEditor.jsx

@@ -85,7 +85,7 @@ export default class TemplateParamsEditor extends React.Component {
         in your SQL (example: <code>SELECT * FROM {'{{ my_table }}'} </code>)
         by using&nbsp;
         <a
-          href="http://superset.apache.org/sqllab.html#templating-with-jinja"
+          href="https://superset.apache.org/sqllab.html#templating-with-jinja"
           target="_blank"
           rel="noopener noreferrer"
         >

superset/assets/src/addSlice/AddSliceContainer.jsx

@@ -97,7 +97,7 @@ export default class AddSliceContainer extends React.PureComponent {
                 'If the datasource your are looking for is not ' +
                 'available in the list, ' +
                 'follow the instructions on the how to add it on the ')}
-              <a href="http://superset.apache.org/tutorial.html">{t('Superset tutorial')}</a>
+              <a href="https://superset.apache.org/tutorial.html">{t('Superset tutorial')}</a>
             </p>
           </div>
           <br />

superset/assets/src/modules/geo.js

@@ -49,7 +49,7 @@ export const EARTH_CIRCUMFERENCE_KM = 40075.16;
 export const MILES_PER_KM = 1.60934;
 
 export function kmToPixels(kilometers, latitude, zoomLevel) {
-  // Algorithm from: http://wiki.openstreetmap.org/wiki/Zoom_levels
+  // Algorithm from: https://wiki.openstreetmap.org/wiki/Zoom_levels
   const latitudeRad = latitude * (Math.PI / 180);
   // Seems like the zoomLevel is off by one
   const kmPerPixel = (EARTH_CIRCUMFERENCE_KM * Math.cos(latitudeRad)) / Math.pow(2, zoomLevel + 9);

superset/config.py

@@ -160,10 +160,8 @@
 
 # Uncomment to setup OpenID providers example for OpenID authentication
 # OPENID_PROVIDERS = [
-#    { 'name': 'Yahoo', 'url': 'https://me.yahoo.com' },
-#    { 'name': 'AOL', 'url': 'http://openid.aol.com/<username>' },
-#    { 'name': 'Flickr', 'url': 'http://www.flickr.com/<username>' },
-#    { 'name': 'MyOpenID', 'url': 'https://www.myopenid.com' }]
+#    { 'name': 'Yahoo', 'url': 'https://open.login.yahoo.com/' },
+#    { 'name': 'Flickr', 'url': 'https://www.flickr.com/<username>' },
 
 # ---------------------------------------------------
 # Roles config
@@ -308,7 +306,7 @@
 ADDITIONAL_MIDDLEWARE = []
 
 """
-1) http://docs.python-guide.org/en/latest/writing/logging/
+1) https://docs.python-guide.org/writing/logging/
 2) https://docs.python.org/2/library/logging.config.html
 """
 

superset/data/countries.md

@@ -17,7 +17,7 @@ specific language governing permissions and limitations
 under the License.
 -->
 This data was downloaded from the
-[World's Health Organization's website](http://data.worldbank.org/data-catalog/health-nutrition-and-population-statistics)
+[World's Health Organization's website](https://datacatalog.worldbank.org/dataset/health-nutrition-and-population-statistics)
 
 Here's the script that was used to massage the data:
 

superset/db_engine_specs.py

@@ -1659,7 +1659,7 @@ def _get_fields(cls, cols):
         BigQuery dialect requires us to not use backtick in the fieldname which are
         nested.
         Using literal_column handles that issue.
-        http://docs.sqlalchemy.org/en/latest/core/tutorial.html#using-more-specific-text-with-table-literal-column-and-column
+        https://docs.sqlalchemy.org/en/latest/core/tutorial.html#using-more-specific-text-with-table-literal-column-and-column
         Also explicility specifying column names so we don't encounter duplicate
         column names in the result.
         """

superset/extract_table_names.py

@@ -26,7 +26,7 @@
 # SELECT statements.
 #
 # See:
-# http://groups.google.com/group/sqlparse/browse_thread/thread/b0bd9a022e9d4895
+# https://groups.google.com/forum/#!topic/sqlparse/sL2aAi6dSJU
 import sqlparse
 from sqlparse.sql import Identifier, IdentifierList
 from sqlparse.tokens import DML, Keyword

superset/migrations/env.py

@@ -75,7 +75,7 @@ def run_migrations_online():
 
     # this callback is used to prevent an auto-migration from being generated
     # when there are no changes to the schema
-    # reference: http://alembic.readthedocs.org/en/latest/cookbook.html
+    # reference: https://alembic.sqlalchemy.org/en/latest/cookbook.html
     def process_revision_directives(context, revision, directives):
         if getattr(config.cmd_opts, 'autogenerate', False):
             script = directives[0]

superset/views/core.py

@@ -210,7 +210,7 @@ class DatabaseView(SupersetModelView, DeleteMixin, YamlExportMixin):  # noqa
         'sqlalchemy_uri': utils.markdown(
             'Refer to the '
             '[SqlAlchemy docs]'
-            '(http://docs.sqlalchemy.org/en/rel_1_2/core/engines.html#'
+            '(https://docs.sqlalchemy.org/en/rel_1_2/core/engines.html#'
             'database-urls) '
             'for more information on how to structure your URI.', True),
         'expose_in_sqllab': _('Expose this DB in SQL Lab'),
@@ -233,10 +233,10 @@ class DatabaseView(SupersetModelView, DeleteMixin, YamlExportMixin):  # noqa
             'JSON string containing extra configuration elements.<br/>'
             '1. The ``engine_params`` object gets unpacked into the '
             '[sqlalchemy.create_engine]'
-            '(http://docs.sqlalchemy.org/en/latest/core/engines.html#'
+            '(https://docs.sqlalchemy.org/en/latest/core/engines.html#'
             'sqlalchemy.create_engine) call, while the ``metadata_params`` '
             'gets unpacked into the [sqlalchemy.MetaData]'
-            '(http://docs.sqlalchemy.org/en/rel_1_0/core/metadata.html'
+            '(https://docs.sqlalchemy.org/en/rel_1_0/core/metadata.html'
             '#sqlalchemy.schema.MetaData) call.<br/>'
             '2. The ``metadata_cache_timeout`` is a cache timeout setting '
             'in seconds for metadata fetch of this database. Specify it as '