Merge branch 'master' of https://github.com/Nithin-Philips/superset i…

…nto add-classNames-to-superset-filter-buttons

.github/workflows/superset-python-integrationtest.yml

@@ -51,13 +51,16 @@ jobs:
         uses: actions/setup-python@v2
         with:
           python-version: ${{ matrix.python-version }}
+          cache: 'pip'
+          cache-dependency-path: 'requirements/testing.txt'
       - name: Install dependencies
         if: steps.check.outcome == 'failure'
         uses: ./.github/actions/cached-dependencies
         with:
           run: |
             apt-get-install
             pip-upgrade
+            pip install wheel
             pip install -r requirements/testing.txt
             setup-mysql
       - name: Run celery
@@ -115,13 +118,16 @@ jobs:
         uses: actions/setup-python@v2
         with:
           python-version: ${{ matrix.python-version }}
+          cache: 'pip'
+          cache-dependency-path: 'requirements/testing.txt'
       - name: Install dependencies
         if: steps.check.outcome == 'failure'
         uses: ./.github/actions/cached-dependencies
         with:
           run: |
             apt-get-install
             pip-upgrade
+            pip install wheel
             pip install -r requirements/testing.txt
             setup-postgres
       - name: Run celery
@@ -171,13 +177,16 @@ jobs:
         uses: actions/setup-python@v2
         with:
           python-version: ${{ matrix.python-version }}
+          cache: 'pip'
+          cache-dependency-path: 'requirements/testing.txt'
       - name: Install dependencies
         if: steps.check.outcome == 'failure'
         uses: ./.github/actions/cached-dependencies
         with:
           run: |
             apt-get-install
             pip-upgrade
+            pip install wheel
             pip install -r requirements/testing.txt
             mkdir ${{ github.workspace }}/.temp
       - name: Run celery

.github/workflows/superset-python-misc.yml

@@ -33,13 +33,16 @@ jobs:
         uses: actions/setup-python@v2
         with:
           python-version: ${{ matrix.python-version }}
+          cache: 'pip'
+          cache-dependency-path: 'requirements/testing.txt'
       - name: Install dependencies
         if: steps.check.outcome == 'failure'
         uses: ./.github/actions/cached-dependencies
         with:
           run: |
             apt-get-install
             pip-upgrade
+            pip install wheel
             pip install -r requirements/testing.txt
       - name: pylint
         if: steps.check.outcome == 'failure'
@@ -62,12 +65,15 @@ jobs:
         uses: actions/setup-python@v2
         with:
           python-version: ${{ matrix.python-version }}
+          cache: 'pip'
+          cache-dependency-path: 'requirements/integration.txt'
       - name: Install dependencies
         uses: ./.github/actions/cached-dependencies
         with:
           run: |
             apt-get-install
             pip-upgrade
+            pip install wheel
             pip install -r requirements/integration.txt
       - name: pre-commit
         run: pre-commit run --all-files
@@ -88,12 +94,15 @@ jobs:
         uses: actions/setup-python@v2
         with:
           python-version: ${{ matrix.python-version }}
+          cache: 'pip'
+          cache-dependency-path: 'requirements/base.txt'
       - name: Install dependencies
         uses: ./.github/actions/cached-dependencies
         with:
           run: |
             apt-get-install
             pip-upgrade
+            pip install wheel
             pip install -r requirements/base.txt
       - name: Test babel extraction
         run: flask fab babel-extract --target superset/translations --output superset/translations/messages.pot --config superset/translations/babel.cfg -k _,__,t,tn,tct

.github/workflows/superset-python-presto-hive.yml

@@ -62,13 +62,16 @@ jobs:
         uses: actions/setup-python@v2
         with:
           python-version: ${{ matrix.python-version }}
+          cache: 'pip'
+          cache-dependency-path: 'requirements/testing.txt'
       - name: Install dependencies
         if: steps.check.outcome == 'failure'
         uses: ./.github/actions/cached-dependencies
         with:
           run: |
             apt-get-install
             pip-upgrade
+            pip install wheel
             pip install -r requirements/testing.txt
             setup-postgres
       - name: Run celery
@@ -137,13 +140,16 @@ jobs:
         uses: actions/setup-python@v2
         with:
           python-version: ${{ matrix.python-version }}
+          cache: 'pip'
+          cache-dependency-path: 'requirements/testing.txt'
       - name: Install dependencies
         if: steps.check.outcome == 'failure'
         uses: ./.github/actions/cached-dependencies
         with:
           run: |
             apt-get-install
             pip-upgrade
+            pip install wheel
             pip install -r requirements/testing.txt
             setup-postgres
       - name: Run celery

.github/workflows/superset-python-unittest.yml

@@ -35,6 +35,8 @@ jobs:
         uses: actions/setup-python@v2
         with:
           python-version: ${{ matrix.python-version }}
+          cache: 'pip'
+          cache-dependency-path: 'requirements/testing.txt'
 # TODO: separated requiermentes.txt file just for unit tests
       - name: Install dependencies
         if: steps.check.outcome == 'failure'
@@ -43,6 +45,7 @@ jobs:
           run: |
             apt-get-install
             pip-upgrade
+            pip install wheel
             pip install -r requirements/testing.txt
             mkdir ${{ github.workspace }}/.temp
       - name: Python unit tests

.gitignore

@@ -14,7 +14,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-*.ipynb
 *.bak
 *.db
 *.pyc

.pre-commit-config.yaml

@@ -49,4 +49,5 @@ repos:
     rev: v2.4.1 # Use the sha or tag you want to point at
     hooks:
       - id: prettier
+        args: ['--ignore-path=./superset-frontend/.prettierignore']
         files: 'superset-frontend'

.rat-excludes

@@ -59,5 +59,5 @@ tsconfig.tsbuildinfo
 .*iml
 .esprintrc
 .prettierignore
-superset-frontend/packages/generator-superset
-superset-frontend/temporary_superset_ui
+generator-superset/*
+temporary_superset_ui/*

UPDATING.md

@@ -34,7 +34,9 @@ assists people when migrating to a new version.
 ### Potential Downtime
 
 - [16756](https://github.com/apache/incubator-superset/pull/16756): a change which renames the `dbs.allow_csv_upload` column to `dbs.allow_file_upload` via a (potentially locking) DDL operation.
-
+- [17539](https://github.com/apache/superset/pull/17539): all Superset CLI commands
+  (init, load_examples and etc) require setting the FLASK_APP environment variable
+  (which is set by default when .flaskenv is loaded)
 ### Deprecations
 
 ### Other

docs/src/pages/docs/installation/kubernetes.mdx

@@ -94,25 +94,20 @@ postgresql:
 
 #### Dependencies
 
-You can specify pip packages to be installed before startup, e.g. to install extra database drivers:
+Install additional packages and do any other bootstrap configuration in this script. For production clusters it's
+recommended to build own image with this step done in CI. The following example installs the Big Query and Elasticsearch
+database drivers so that you can connect to those datasources in your Superset installation.
 
 ```yaml
-additionalRequirements:
-  - psycopg2
-  - redis
-  - elasticsearch-dbapi
-  - pymssql
-  - gsheetsdb
-  # Force verstion to work around https://github.com/betodealmeida/gsheets-db-api/issues/15
-  - moz-sql-parser==4.9.21002
-  # For OAuth
-  - Authlib
-  # For webdriver / reports
-  - gevent
+bootstrapScript: |
+  #!/bin/bash
+  pip install psycopg2==2.8.5 \
+    redis==3.2.1 \
+    pybigquery==2.26.0 \
+    elasticsearch-dbapi==0.2.5 &&\
+  if [ ! -f ~/bootstrap ]; then echo "Running Superset with uid {{ .Values.runAsUser }}" > ~/bootstrap; fi
 ```
 
-__WARNING__: The list will replace the default one from the default `values.yaml` entirely, not _add_ to it...
-
 #### superset_config.py
 
 The default `superset_config.py` is fairly minimal and you will very likely need to extend it. This is done by specifying one or more key/value entries in `configOverrides`, e.g.:

superset-frontend/.eslintignore

@@ -28,3 +28,4 @@ src/dashboard/deprecated/*
 src/temp/*
 **/node_modules
 *.d.ts
+temporary_superset_ui/**/*

superset-frontend/.prettierignore

@@ -0,0 +1,26 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+coverage/
+esm/
+lib/
+tmp/
+node_modules/
+tsconfig.json
+CHANGELOG.md
+*.geojson
+*-topo.json
+temporary_superset_ui/

superset-frontend/jest.config.js

@@ -26,6 +26,7 @@ module.exports = {
     '^spec/(.*)$': '<rootDir>/spec/$1',
   },
   testEnvironment: 'jsdom',
+  modulePathIgnorePatterns: ['<rootDir>/temporary_superset_ui'],
   setupFilesAfterEnv: ['<rootDir>/spec/helpers/setup.ts'],
   testURL: 'http://localhost',
   collectCoverageFrom: ['src/**/*.{js,jsx,ts,tsx}', '!**/*.stories.*'],

superset-frontend/lerna.json

@@ -0,0 +1,13 @@
+{
+  "lerna": "3.2.1",
+  "npmClient": "npm",
+  "packages": ["packages/*", "plugins/*", "temporary_superset_ui/*"],
+  "useWorkspaces": true,
+  "version": "0.0.0",
+  "ignoreChanges": [
+    "**/*.md",
+    "**/*.spec.tsx?",
+    "**/*.spec.jsx?",
+    "**/__mocks__/**"
+  ]
+}

superset-frontend/temporary_superset_ui/superset-ui/.eslintignore

@@ -0,0 +1,9 @@
+coverage/
+node_modules/
+public/
+esm/
+lib/
+tmp/
+dist/
+temporary-plugins/
+storybook-static/