Merge pull request #66 from lyft/merge-apache-1a02d615

Merge apache 1a02d61

.gitignore

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

CHANGELOG.md

@@ -352,7 +352,7 @@ under the License.
 - [#7148](https://github.com/apache/incubator-superset/pull/7148) Celery task for warming up cache (#7148) (@betodealmeida)
 - [#7206](https://github.com/apache/incubator-superset/pull/7206) feat: [lyftga] add tooltips to deck.gl viz types (#7206) (@khtruong)
 - [e714dc1](https://github.com/apache/incubator-superset/commit/e714dc19feb42fefbc573272edc06a50963b0849) Merge branch 'master' into lyftga (@mistercrunch)
-- [#7215](https://github.com/apache/incubator-superset/pull/7215) Fix <Select> clearable (#7215) (@mistercrunch)
+- [#7215](https://github.com/apache/incubator-superset/pull/7215) Fix `<Select>` clearable (#7215) (@mistercrunch)
 - [#7218](https://github.com/apache/incubator-superset/pull/7218) Allow bigint to be used as time column in Presto (#7218) (@betodealmeida)
 - [#7032](https://github.com/apache/incubator-superset/pull/7032) Fetch charts with GET to benefit from browser cache and conditional requests (#7032) (@betodealmeida)
 - [#7210](https://github.com/apache/incubator-superset/pull/7210) chore: revert bignumber.js patch for charts and reapply the original bignumber.js change to SQL editor in an opt-in fashion (#7210) (@xtinec)

UPDATING.md

@@ -23,6 +23,11 @@ assists people when migrating to a new version.
 
 ## Next Version
 
+* [8117](https://github.com/apache/incubator-superset/pull/8117): If you are
+using `ENABLE_PROXY_FIX = True`, review the newly-introducted variable,
+`PROXY_FIX_CONFIG`, which changes the proxy behavior in accordance with
+[Werkzeug](https://werkzeug.palletsprojects.com/en/0.15.x/middleware/proxy_fix/)
+
 * [8069](https://github.com/apache/incubator-superset/pull/8069): introduces
 [MessagePack](https://github.com/msgpack/msgpack-python) and
 [PyArrow](https://arrow.apache.org/docs/python/) for async query results

requirements.txt

@@ -10,6 +10,7 @@ apispec[yaml]==1.3.3      # via flask-appbuilder
 asn1crypto==0.24.0        # via cryptography
 attrs==19.1.0             # via jsonschema
 babel==2.7.0              # via flask-babel
+backoff==1.8.0
 billiard==3.6.0.0         # via celery
 bleach==3.1.0
 celery==4.3.0
@@ -21,7 +22,7 @@ croniter==0.3.30
 cryptography==2.7
 decorator==4.4.0          # via retry
 defusedxml==0.6.0         # via python3-openid
-flask-appbuilder==2.1.9
+flask-appbuilder==2.1.13
 flask-babel==0.12.2       # via flask-appbuilder
 flask-caching==1.7.2
 flask-compress==1.4.0

setup.py

@@ -65,15 +65,16 @@ def get_git_sha():
     zip_safe=False,
     scripts=["superset/bin/superset"],
     install_requires=[
+        "backoff>=1.8.0",
         "bleach>=3.0.2, <4.0.0",
         "celery>=4.3.0, <5.0.0",
         "click>=6.0, <7.0.0",  # `click`>=7 forces "-" instead of "_"
         "colorama",
         "contextlib2",
         "croniter>=0.3.28",
         "cryptography>=2.4.2",
-        "flask>=1.0.0, <2.0.0",
-        "flask-appbuilder>=2.1.9, <2.3.0",
+        "flask>=1.1.0, <2.0.0",
+        "flask-appbuilder>=2.1.13, <2.3.0",
         "flask-caching",
         "flask-compress",
         "flask-talisman",

superset/__init__.py

@@ -28,7 +28,6 @@
 from flask_migrate import Migrate
 from flask_talisman import Talisman
 from flask_wtf.csrf import CSRFProtect
-from werkzeug.contrib.fixers import ProxyFix
 import wtforms_json
 
 from superset import config
@@ -139,7 +138,9 @@ def get_manifest():
     CORS(app, **app.config.get("CORS_OPTIONS"))
 
 if app.config.get("ENABLE_PROXY_FIX"):
-    app.wsgi_app = ProxyFix(app.wsgi_app)
+    from werkzeug.middleware.proxy_fix import ProxyFix
+
+    app.wsgi_app = ProxyFix(app.wsgi_app, **app.config.get("PROXY_FIX_CONFIG"))
 
 if app.config.get("ENABLE_CHUNK_ENCODING"):
 

superset/assets/.eslintrc

@@ -28,37 +28,47 @@
     "browser": true
   },
   "rules": {
-    "prefer-template": 0,
-    "new-cap": 0,
-    "no-restricted-syntax": 0,
-    "guard-for-in": 0,
-    "prefer-arrow-callback": 0,
+    "camelcase": ["error", {
+      "allow": ["^UNSAFE_"],
+      "properties": "never"
+    }],
+    "class-methods-use-this": 0,
     "func-names": 0,
-    "react/jsx-no-bind": 0,
-    "no-confusing-arrow": 0,
-    "jsx-a11y/no-static-element-interactions": 0,
+    "guard-for-in": 0,
+    "import/extensions": ["error", {
+      ".js": "always",
+      ".jsx": "always",
+      ".ts": "always",
+      ".tsx": "always",
+      ".json": "always"
+    }],
+    "import/no-named-as-default": 0,
+    "import/prefer-default-export": 0,
+    "indent": 0,
     "jsx-a11y/anchor-has-content": 0,
-    "react/require-default-props": 0,
-    "no-plusplus": 0,
-    "no-mixed-operators": 0,
-    "no-continue": 0,
+    "jsx-a11y/href-no-hash": 0,
+    "jsx-a11y/no-static-element-interactions": 0,
+    "new-cap": 0,
     "no-bitwise": 0,
+    "no-confusing-arrow": 0,
+    "no-continue": 0,
+    "no-mixed-operators": 0,
     "no-multi-assign": 0,
-    "react/no-array-index-key": 0,
-    "no-restricted-properties": 0,
+    "no-multi-spaces": 0,
+    "no-plusplus": 0,
     "no-prototype-builtins": 0,
-    "jsx-a11y/href-no-hash": 0,
+    "no-restricted-properties": 0,
+    "no-restricted-syntax": 0,
+    "padded-blocks": 0,
+    "prefer-arrow-callback": 0,
+    "prefer-template": 0,
     "react/forbid-prop-types": 0,
-    "class-methods-use-this": 0,
-    "import/no-named-as-default": 0,
-    "import/prefer-default-export": 0,
+    "react/jsx-no-bind": 0,
+    "react/no-array-index-key": 0,
+    "react/no-string-refs": 0,
     "react/no-unescaped-entities": 0,
     "react/no-unused-prop-types": 0,
-    "react/no-string-refs": 0,
-    "indent": 0,
-    "no-multi-spaces": 0,
-    "padded-blocks": 0,
-    "import/extensions": [".js", ".jsx", ".ts", ".tsx", ".json"]
+    "react/require-default-props": 0
   },
   "settings": {
     "import/resolver": "webpack"