Merge branch 'master' into fix-embed-code-resize

.github/workflows/release.yml

@@ -53,11 +53,14 @@ jobs:
             ${{ runner.os }}-npm-
 
       - name: Install dependencies
+        working-directory: ./superset-frontend
         run: npm ci
-      - name: Build packages
-        run: npm run plugins:build
       - name: Run unit tests
+        working-directory: ./superset-frontend
         run: npm run test -- plugins packages
+      - name: Build packages
+        working-directory: ./superset-frontend
+        run: npm run plugins:build
 
       - name: Configure npm and git
         run: |
@@ -73,6 +76,7 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Bump version and publish package(s)
+        working-directory: ./superset-frontend
         run: |
           git tag -d `git tag | grep -E '^trigger-'`
           npm run plugins:release-from-tag

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

@@ -66,14 +66,17 @@ jobs:
         with:
           python-version: ${{ matrix.python-version }}
           cache: 'pip'
-          cache-dependency-path: 'requirements/integration.txt'
+          cache-dependency-path: |
+            requirements/base.txt
+            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/base.txt
             pip install -r requirements/integration.txt
       - name: pre-commit
         run: pre-commit run --all-files

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

@@ -80,7 +80,7 @@ jobs:
       - name: Python unit tests (PostgreSQL)
         if: steps.check.outcome == 'failure'
         run: |
-          ./scripts/python_tests.sh
+          ./scripts/python_tests.sh -m 'chart_data_flow or sql_json_flow'
       - name: Upload code coverage
         if: steps.check.outcome == 'failure'
         run: |
@@ -158,7 +158,7 @@ jobs:
       - name: Python unit tests (PostgreSQL)
         if: steps.check.outcome == 'failure'
         run: |
-          ./scripts/python_tests.sh
+          ./scripts/python_tests.sh -m 'chart_data_flow or sql_json_flow'
       - name: Upload code coverage
         if: steps.check.outcome == 'failure'
         run: |

CONTRIBUTING.md

@@ -1358,7 +1358,7 @@ Note not all fields are correctly categorized. The fields vary based on visualiz
 | `columns`                                                                                              | _array(string)_                                   | The **Breakdowns** widget                         |
 | `groupby`                                                                                              | _array(string)_                                   | The **Group by** or **Series** widget             |
 | `limit`                                                                                                | _number_                                          | The **Series Limit** widget                       |
-| `metric`<br>`metric_2`<br>`metrics`<br>`percent_mertics`<br>`secondary_metric`<br>`size`<br>`x`<br>`y` | _string_,_object_,_array(string)_,_array(object)_ | The metric(s) depending on the visualization type |
+| `metric`<br>`metric_2`<br>`metrics`<br>`percent_metrics`<br>`secondary_metric`<br>`size`<br>`x`<br>`y` | _string_,_object_,_array(string)_,_array(object)_ | The metric(s) depending on the visualization type |
 | `order_asc`                                                                                            | _boolean_                                         | The **Sort Descending** widget                    |
 | `row_limit`                                                                                            | _number_                                          | The **Row limit** widget                          |
 | `timeseries_limit_metric`                                                                              | _object_                                          | The **Sort By** widget                            |

UPDATING.md

@@ -31,6 +31,7 @@ assists people when migrating to a new version.
 - [17290](https://github.com/apache/superset/pull/17290): Bumps pandas to `1.3.4` and pyarrow to `5.0.0`
 - [16660](https://github.com/apache/incubator-superset/pull/16660): The `columns` Jinja parameter has been renamed `table_columns` to make the `columns` query object parameter available in the Jinja context.
 - [16711](https://github.com/apache/incubator-superset/pull/16711): The `url_param` Jinja function will now by default escape the result. For instance, the value `O'Brien` will now be changed to `O''Brien`. To disable this behavior, call `url_param` with `escape_result` set to `False`: `url_param("my_key", "my default", escape_result=False)`.
+- [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)
 
 ### Potential Downtime
 

scripts/python_tests.sh

@@ -31,4 +31,5 @@ superset db upgrade
 superset init
 
 echo "Running tests"
-pytest --durations=0 --maxfail=1 --cov=superset $@
+
+pytest --durations=0 --maxfail=1 --cov=superset "$@"

superset-frontend/.prettierignore

@@ -20,6 +20,7 @@ lib/
 tmp/
 node_modules/
 tsconfig.json
+lerna.json
 CHANGELOG.md
 *.geojson
 *-topo.json