Merge remote-tracking branch 'upstream/master' into feat/extra_strate…

…gies

* upstream/master: (64 commits)
  check roles before fetching reports (#16260)
  chore: upgrade mypy and add type guards (#16227)
  fix: pivot columns with ints for name (#16259)
  chore(pylint): Bump Pylint to 2.9.6 (#16146)
  fix examples tab for dashboard (#16253)
  chore: bump superset-ui packages to 0.17.84 (#16251)
  chore: Shows the dataset description in the gallery dropdown (#16200)
  fix(Dashboard): Omnibar dropdown visibility and keyboard commands (#16168)
  chore: bump py version for integration test (#16213)
  fix: skip perms on query context update (#16250)
  refactor: external metadata fetch API (#16193)
  feat(dao): admin can remove self from object owners (#15149)
  fix(dashboard): cross filter chart highlight when filters badge icon clicked (#16233)
  fix: validate_parameters and query (#16241)
  fix: Remove Advanced Analytics tag for 2 charts (#16240)
  Revert "feat: Changing Dataset names (#16199)" (#16235)
  feat: Allow users to connect via legacy SQLA form (#16201)
  fix: remove encryption from db params (#16214)
  fix(Explore): Show the tooltip only when label does not fit the container in METRICS/FILTERS/GROUP BY/SORT BY of the DATA panel (#16060)
  Show/hide tooltips (#16192)
  ...

# Conflicts:
#	superset/tasks/caching/cache_strategy.py

.github/PULL_REQUEST_TEMPLATE.md

@@ -11,6 +11,7 @@
 <!--- Check any relevant boxes with "x" -->
 <!--- HINT: Include "Fixes #nnn" if you are fixing an existing issue -->
 - [ ] Has associated issue:
+- [ ] Required feature flags:
 - [ ] Changes UI
 - [ ] Includes DB Migration (follow approval process in [SIP-59](https://github.com/apache/superset/issues/13351))
   - [ ] Migration is atomic, supports rollback & is backwards-compatible

.pre-commit-config.yaml

@@ -24,9 +24,10 @@ repos:
     hooks:
       - id: isort
   - repo: https://github.com/pre-commit/mirrors-mypy
-    rev: v0.790
+    rev: v0.910
     hooks:
       - id: mypy
+        additional_dependencies: [types-all]
   - repo: https://github.com/peterdemin/pip-compile-multi
     rev: v2.4.1
     hooks:

.pylintrc

@@ -90,7 +90,7 @@ disable=
     super-with-arguments,
     too-few-public-methods,
     too-many-locals,
-
+    duplicate-code,
 
 [REPORTS]
 

Dockerfile

@@ -64,7 +64,7 @@ RUN /frontend-mem-nag.sh \
 
 # Next, copy in the rest and let webpack do its thing
 COPY ./superset-frontend /app/superset-frontend
-# This is BY FAR the most expensive step (thanks Terser!)
+# This seems to be the most expensive step
 RUN cd /app/superset-frontend \
         && npm run ${BUILD_CMD} \
         && rm -rf node_modules

RELEASING/changelog.py

@@ -384,12 +384,12 @@ def change_log(
         with open(csv, "w") as csv_file:
             log_items = list(logs)
             field_names = log_items[0].keys()
-            writer = lib_csv.DictWriter(
+            writer = lib_csv.DictWriter(  # type: ignore
                 csv_file,
                 delimiter=",",
                 quotechar='"',
                 quoting=lib_csv.QUOTE_ALL,
-                fieldnames=field_names,
+                fieldnames=field_names,  # type: ignore
             )
             writer.writeheader()
             for log in logs:

docker-compose.yml

@@ -118,6 +118,9 @@ services:
     depends_on: *superset-depends-on
     user: *superset-user
     volumes: *superset-volumes
+    # Bump memory limit if processing selenium / thumbails on superset-worker
+    # mem_limit: 2038m
+    # mem_reservation: 128M
 
   superset-worker-beat:
     image: *superset-image

requirements/base.in

@@ -18,3 +18,4 @@
 -e file:.
 pyrsistent>=0.16.1,<0.17
 zipp==3.4.1
+sasl==0.2.1

requirements/base.txt

@@ -1,4 +1,4 @@
-# SHA1:0862095245a068ae2fc00217da78331e1e7ae505
+# SHA1:57a754a4cf09b58d8e02c45bfb1058d2ce4286a6
 #
 # This file is autogenerated by pip-compile-multi
 # To update, run:
@@ -7,37 +7,37 @@
 #
 -e file:.
     # via -r requirements/base.in
-aiohttp==3.7.2
+aiohttp==3.7.4.post0
     # via slackclient
-alembic==1.4.3
+alembic==1.6.5
     # via flask-migrate
 amqp==2.6.1
     # via kombu
 apispec[yaml]==3.3.2
     # via flask-appbuilder
 async-timeout==3.0.1
     # via aiohttp
-attrs==20.2.0
+attrs==21.2.0
     # via
     #   aiohttp
     #   jsonschema
-babel==2.8.0
+babel==2.9.1
     # via flask-babel
-backoff==1.10.0
+backoff==1.11.1
     # via apache-superset
-billiard==3.6.3.0
+billiard==3.6.4.0
     # via celery
-bleach==3.3.0
+bleach==3.3.1
     # via apache-superset
 brotli==1.0.9
     # via flask-compress
 cachelib==0.1.1
     # via apache-superset
 celery==4.4.7
     # via apache-superset
-cffi==1.14.3
+cffi==1.14.6
     # via cryptography
-chardet==3.0.4
+chardet==4.0.0
     # via aiohttp
 click==7.1.2
     # via
@@ -48,23 +48,23 @@ colorama==0.4.4
     # via
     #   apache-superset
     #   flask-appbuilder
-convertdate==2.3.0
+convertdate==2.3.2
     # via holidays
 cron-descriptor==1.2.24
     # via apache-superset
-croniter==0.3.36
+croniter==1.0.15
     # via apache-superset
-cryptography==3.3.2
+cryptography==3.4.7
     # via apache-superset
-defusedxml==0.6.0
+defusedxml==0.7.1
     # via python3-openid
 deprecation==2.1.0
     # via apache-superset
-dnspython==2.0.0
+dnspython==2.1.0
     # via email-validator
-email-validator==1.1.1
+email-validator==1.1.3
     # via flask-appbuilder
-flask==1.1.2
+flask==1.1.4
     # via
     #   apache-superset
     #   flask-appbuilder
@@ -77,45 +77,45 @@ flask==1.1.2
     #   flask-openid
     #   flask-sqlalchemy
     #   flask-wtf
-flask-appbuilder==3.3.0
+flask-appbuilder==3.3.2
     # via apache-superset
 flask-babel==1.0.0
     # via flask-appbuilder
 flask-caching==1.10.1
     # via apache-superset
-flask-compress==1.8.0
+flask-compress==1.10.1
     # via apache-superset
-flask-jwt-extended==3.24.1
+flask-jwt-extended==3.25.1
     # via flask-appbuilder
 flask-login==0.4.1
     # via flask-appbuilder
-flask-migrate==2.5.3
+flask-migrate==3.1.0
     # via apache-superset
 flask-openid==1.2.5
     # via flask-appbuilder
-flask-sqlalchemy==2.4.4
+flask-sqlalchemy==2.5.1
     # via
     #   flask-appbuilder
     #   flask-migrate
-flask-talisman==0.7.0
+flask-talisman==0.8.1
     # via apache-superset
 flask-wtf==0.14.3
     # via
     #   apache-superset
     #   flask-appbuilder
-geographiclib==1.50
+geographiclib==1.52
     # via geopy
-geopy==2.0.0
+geopy==2.2.0
     # via apache-superset
 graphlib-backport==1.0.3
     # via apache-superset
 gunicorn==20.0.4
     # via apache-superset
 holidays==0.10.3
     # via apache-superset
-humanize==3.1.0
+humanize==3.11.0
     # via apache-superset
-idna==2.10
+idna==3.2
     # via
     #   email-validator
     #   yarl
@@ -136,16 +136,16 @@ kombu==4.6.11
     # via celery
 korean-lunar-calendar==0.2.1
     # via holidays
-mako==1.1.3
+mako==1.1.4
     # via alembic
-markdown==3.3.3
+markdown==3.3.4
     # via apache-superset
-markupsafe==1.1.1
+markupsafe==2.0.1
     # via
     #   jinja2
     #   mako
     #   wtforms
-marshmallow==3.9.0
+marshmallow==3.13.0
     # via
     #   flask-appbuilder
     #   marshmallow-enum
@@ -154,23 +154,21 @@ marshmallow-enum==1.5.1
     # via flask-appbuilder
 marshmallow-sqlalchemy==0.23.1
     # via flask-appbuilder
-msgpack==1.0.0
+msgpack==1.0.2
     # via apache-superset
-multidict==5.0.0
+multidict==5.1.0
     # via
     #   aiohttp
     #   yarl
-natsort==7.0.1
-    # via croniter
-numpy==1.19.4
+numpy==1.21.1
     # via
     #   pandas
     #   pyarrow
-packaging==20.4
+packaging==21.0
     # via
     #   bleach
     #   deprecation
-pandas==1.2.2
+pandas==1.2.5
     # via apache-superset
 parsedatetime==2.6
     # via apache-superset
@@ -189,7 +187,7 @@ pyjwt==1.7.1
     #   apache-superset
     #   flask-appbuilder
     #   flask-jwt-extended
-pymeeus==0.3.7
+pymeeus==0.5.11
     # via convertdate
 pyparsing==2.4.7
     # via
@@ -199,23 +197,23 @@ pyrsistent==0.16.1
     # via
     #   -r requirements/base.in
     #   jsonschema
-python-dateutil==2.8.1
+python-dateutil==2.8.2
     # via
     #   alembic
     #   apache-superset
     #   croniter
     #   flask-appbuilder
     #   holidays
     #   pandas
-python-dotenv==0.15.0
+python-dotenv==0.19.0
     # via apache-superset
 python-editor==1.0.4
     # via alembic
 python-geohash==0.8.5
     # via apache-superset
 python3-openid==3.2.0
     # via flask-openid
-pytz==2020.4
+pytz==2021.1
     # via
     #   babel
     #   celery
@@ -228,29 +226,30 @@ pyyaml==5.4.1
     #   apispec
 redis==3.5.3
     # via apache-superset
+sasl==0.2.1
+    # via -r requirements/base.in
 selenium==3.141.0
     # via apache-superset
-simplejson==3.17.2
+simplejson==3.17.3
     # via apache-superset
-six==1.15.0
+six==1.16.0
     # via
     #   bleach
-    #   cryptography
     #   flask-jwt-extended
     #   flask-talisman
     #   holidays
     #   isodate
     #   jsonschema
-    #   packaging
     #   polyline
     #   prison
     #   pyrsistent
     #   python-dateutil
+    #   sasl
     #   sqlalchemy-utils
     #   wtforms-json
 slackclient==2.5.0
     # via apache-superset
-sqlalchemy==1.3.20
+sqlalchemy==1.3.24
     # via
     #   alembic
     #   apache-superset
@@ -266,11 +265,11 @@ sqlparse==0.3.0
     # via apache-superset
 tabulate==0.8.9
     # via apache-superset
-typing-extensions==3.7.4.3
+typing-extensions==3.10.0.0
     # via
     #   aiohttp
     #   apache-superset
-urllib3==1.25.11
+urllib3==1.26.6
     # via selenium
 vine==1.3.0
     # via
@@ -288,7 +287,7 @@ wtforms==2.3.3
     #   wtforms-json
 wtforms-json==0.3.3
     # via apache-superset
-yarl==1.6.2
+yarl==1.6.3
     # via aiohttp
 zipp==3.4.1
     # via -r requirements/base.in

requirements/development.in

@@ -24,5 +24,5 @@ pyhive[hive]>=0.6.1
 psycopg2-binary==2.8.5
 tableschema
 thrift>=0.11.0,<1.0.0
-pygithub>=1.54.1,<2.0.0
 progress>=1.5,<2
+pyinstrument>=4.0.2,<5