Merge pull request #86 from lyft/merge_apache_20191127b

Merge apache 20191127b

CHANGELOG.md

@@ -18,6 +18,15 @@ under the License.
 -->
 ## Change Log
 
+### 0.35.1 (2019/11/15 13:47 +00:00)
+- [#8457](https://github.com/apache/incubator-superset/pull/8457) [fix] Improve csv upload functionality (#8457) (@villebro)
+- [#8566](https://github.com/apache/incubator-superset/pull/8566) [druid] Fix, pydruid forced dependency (#8566) (@dpgaspar)
+- [#8558](https://github.com/apache/incubator-superset/pull/8558) bump legacy-preset-chart-nvd3 to 0.11.5 (#8558) (@nytai)
+- [#8498](https://github.com/apache/incubator-superset/pull/8498) build: bump dompurify version because of nasty xss bypass. (#8498) (@MarcusSorealheis)
+- [#8477](https://github.com/apache/incubator-superset/pull/8477) [cli] Fix, import datasources exported by UI (#8477) (@dpgaspar)
+- [#8487](https://github.com/apache/incubator-superset/pull/8487) fixing typo. (#8487) (@MarcusSorealheis)
+- [#8430](https://github.com/apache/incubator-superset/pull/8430) [pydruid] Bumping the pydruid version (#8430) (@john-bodley)
+
 ### 0.35.0 (2019/10/31 11:12 +00:00)
 - [#8436](https://github.com/apache/incubator-superset/pull/8436) [fix] Updating parse_human_timedelta typing (#8436) (@john-bodley)
 - [#8423](https://github.com/apache/incubator-superset/pull/8423) chore: disable another flaky cypress test (#8423) (@mistercrunch)

RELEASING/README.md

@@ -72,6 +72,11 @@ set your GITHUB_TOKEN environment variable.
 github-changes -o apache -r incubator-superset --token $GITHUB_TOKEN --between-tags <PREVIOUS_RELEASE_TAG>...<CURRENT_RELEASE_TAG>
 ```
 
+Then, in `UPDATING.md`, a file that contains a list of notifications around
+deprecations and upgrading-related topics,
+make sure to move the content now under the `Next Version` section under a new
+section for the new release.
+
 Finally bump the version number on `superset/static/assets/package.json`:
 
 ```json
@@ -88,14 +93,14 @@ the same terminal session won't be used for crafting the release candidate and t
 final release. Therefore, it's a good idea to do the following every time you
 work on a new phase of the release process to make sure you aren't releasing
 the wrong files/using wrong names. There's a script to help you set correctly all the
-necessary environment variables. Change you current directory to `superset/RELEASING`
+necessary environment variables. Change your current directory to `superset/RELEASING`
 
 ```bash
     # usage: set_release_env.sh <SUPERSET_VERSION> <SUPERSET_VERSION_RC> "<PGP_KEY_FULLNAME>"
     . ./set_release_env.sh XX.YY.ZZ QQ "YOUR PGP KEY NAME"
 ```
 
-The script will output the exported variables, for example for 0.34.1 RC1:
+The script will output the exported variables. Here's example for 0.34.1 RC1:
 
 ```
     -------------------------------
@@ -169,7 +174,7 @@ https://lists.apache.org/thread.html/e60f080ebdda26896214f7d3d5be1ccadfab95d48fb
 To easily send a voting request to Superset community, still on the `superset/RELEASING` directory:
 
 ```bash
-    # Note use Superset's virtualenv 
+    # Note: use Superset's virtualenv 
     (venv)$ python send_email.py vote_pmc
 ```
 
@@ -189,7 +194,7 @@ https://lists.apache.org/thread.html/50a6b134d66b86b237d5d7bc89df1b567246d125a71
 To easily send the result email, still on the `superset/RELEASING` directory:
 
 ```bash
-    # Note use Superset's virtualenv 
+    # Note: use Superset's virtualenv 
     (venv)$ python send_email.py result_pmc
 ```
 
@@ -212,19 +217,34 @@ started at [email protected].
 To easily send the voting request to Apache community, still on the `superset/RELEASING` directory:
 
 ```bash
-    # Note use Superset's virtualenv 
+    # Note: use Superset's virtualenv 
     (venv)$ python send_email.py vote_ipmc
 ```
 
-### Announcing
+Once 3+ binding votes (by IPMC members) have been cast and at
+least 72 hours have past, you can post a [RESULT] thread
 
-Once it's all done, an [ANNOUNCE] thread announcing the release to the dev@ mailing list is the final step.
+To easily send the result email, still on the `superset/RELEASING` directory:
 
 ```bash
-    # Note use Superset's virtualenv 
-    (venv)$ python send_email.py announce
+    # Note: use Superset's virtualenv 
+    (venv)$ python send_email.py result_ipmc
+```
+
+Again, the script will interactively ask for extra information needed to fill out the email template. Based on the
+voting description, it will generate a passing, non passing or non conclusive email. 
+here's an example:
+
+```bash
+    Sender email (ex: [email protected]): [email protected]
+    Apache username: your_apache_user
+    Apache password: your_apache_password
+    A List of people with +1 binding vote (ex: Alan, Justin): Alan,Jeff,
+    A List of people with +1 non binding vote (ex: Ville):
+    A List of people with -1 vote (ex: John):
 ```
 
+
 ### Validating a release
 
 https://www.apache.org/info/verification.html
@@ -252,25 +272,32 @@ Then tag the final release:
     git tag -f ${SUPERSET_VERSION}
 ```
 
-Now you can announce the release on the mailing list, make sure to use the
-proper template
+### Update CHANGELOG and UPDATING on superset
+
+Now that we have a final Apache source release we need to open a pull request on Superset
+with the changes on `CHANGELOG.md` and `UPDATING.md`.
 
 ### Publishing a Convenience Release to PyPI
+
 From the root of the repo running ./pypi_push.sh will build the
 Javascript bundle and echo the twine command allowing you to publish
 to PyPI. You may need to ask a fellow committer to grant
 you access to it if you don't have access already. Make sure to create
 an account first if you don't have one, and reference your username
 while requesting access to push packages.
 
-## Post release
+### Announcing
 
-In `UPDATING.md`, a file that contains a list of notifications around
-deprecations and upgrading-related topics,
-make sure to move the content now under the `Next Version` section under a new
-section for the new release.
+Once it's all done, an [ANNOUNCE] thread announcing the release to the dev@ mailing list is the final step.
+
+```bash
+    # Note use Superset's virtualenv 
+    (venv)$ python send_email.py announce
+```
+
+## Post release
 
-# Refresh documentation website
+#### Refresh documentation website
 
 Every once in a while we want to compile the documentation and publish it.
 Here's how to do it.

RELEASING/email_templates/announce.j2

@@ -37,7 +37,7 @@ https://pypi.org/project/apache-superset/
 
 If you have any usage questions, or have problems when upgrading or
 find any problems about enhancements included in this release, please
-don’t hesitate to let us know by sending feedback to this mailing
+don't hesitate to let us know by sending feedback to this mailing
 list.
 
 =====

RELEASING/send_email.py

@@ -123,9 +123,7 @@ def __repr__(self):
     help="Your Apache email this will be used for SMTP From",
 )
 @click.option(
-    "--apache_username",
-    prompt="Apache username",
-    help="Your LDAP Apache username",
+    "--apache_username", prompt="Apache username", help="Your LDAP Apache username"
 )
 @click.option(
     "--apache_password",
@@ -196,7 +194,9 @@ def vote_pmc(base_parameters, receiver_email):
     prompt="A List of people with -1 vote (ex: John)",
 )
 @click.pass_obj
-def result_pmc(base_parameters, receiver_email, vote_bindings, vote_nonbindings, vote_negatives):
+def result_pmc(
+    base_parameters, receiver_email, vote_bindings, vote_nonbindings, vote_negatives
+):
     template_file = "email_templates/result_pmc.j2"
     base_parameters.template_arguments["receiver_email"] = receiver_email
     base_parameters.template_arguments["vote_bindings"] = string_comma_to_list(
@@ -257,10 +257,39 @@ def vote_ipmc(base_parameters, receiver_email, voting_thread, vote_mentors):
     type=str,
     prompt="The receiver email (To:)",
 )
+@click.option(
+    "--vote_bindings",
+    default="",
+    type=str,
+    prompt="A List of people with +1 binding vote (ex: Alan,Justin)",
+)
+@click.option(
+    "--vote_nonbindings",
+    default="",
+    type=str,
+    prompt="A List of people with +1 non binding vote (ex: Ville)",
+)
+@click.option(
+    "--vote_negatives",
+    default="",
+    type=str,
+    prompt="A List of people with -1 vote (ex: John)",
+)
 @click.pass_obj
-def result_ipmc(base_parameters, receiver_email):
+def result_ipmc(
+    base_parameters, receiver_email, vote_bindings, vote_nonbindings, vote_negatives
+):
     template_file = "email_templates/result_ipmc.j2"
     base_parameters.template_arguments["receiver_email"] = receiver_email
+    base_parameters.template_arguments["vote_bindings"] = string_comma_to_list(
+        vote_bindings
+    )
+    base_parameters.template_arguments["vote_nonbindings"] = string_comma_to_list(
+        vote_nonbindings
+    )
+    base_parameters.template_arguments["vote_negatives"] = string_comma_to_list(
+        vote_negatives
+    )
     message = render_template(template_file, **base_parameters.template_arguments)
     inter_send_email(
         base_parameters.username,

UPDATING.md

@@ -21,7 +21,11 @@ under the License.
 This file documents any backwards-incompatible changes in Superset and
 assists people when migrating to a new version.
 
-## Next Version
+## 0.35.0
+
+* [8512](https://github.com/apache/incubator-superset/pull/8512): `DRUID_IS_ACTIVE` now
+defaults to False. To enable Druid-API-based functionality, override the
+`DRUID_IS_ACTIVE` configuration variable by setting it to `True` for your deployment.
 
 * [8450](https://github.com/apache/incubator-superset/pull/8450): The time ranger picker
 now uses UTC for the tooltips and default placeholder timestamps (sans timezone).

superset/app.py

@@ -96,6 +96,22 @@ def post_init(self) -> None:
     def configure_celery(self) -> None:
         celery_app.config_from_object(self.config["CELERY_CONFIG"])
         celery_app.set_default()
+        flask_app = self.flask_app
+
+        # Here, we want to ensure that every call into Celery task has an app context
+        # setup properly
+        task_base = celery_app.Task
+
+        class AppContextTask(task_base):  # type: ignore
+            # pylint: disable=too-few-public-methods
+            abstract = True
+
+            # Grab each call into the task and set up an app context
+            def __call__(self, *args, **kwargs):
+                with flask_app.app_context():
+                    return task_base.__call__(self, *args, **kwargs)
+
+        celery_app.Task = AppContextTask
 
     @staticmethod
     def init_views() -> None:

superset/assets/package.json

@@ -17,7 +17,7 @@
     "build": "cross-env NODE_OPTIONS=--max_old_space_size=8192 NODE_ENV=production webpack --mode=production --colors --progress",
     "lint": "eslint --ignore-path=.eslintignore --ext .js,.jsx . && tslint -c tslint.json ./{src,spec}/**/*.ts{,x}",
     "lint-fix": "eslint --fix --ignore-path=.eslintignore --ext .js,.jsx . && tslint -c tslint.json --fix ./{src,spec}/**/*.ts{,x} && npm run clean-css",
-    "clean-css": "prettier --write src/**/*.{css,less,sass,scss}",
+    "clean-css": "prettier --write 'src/**/*.{css,less,sass,scss}'",
     "cypress": "cypress",
     "cypress-debug": "cypress open --config watchForFileChanges=true",
     "install-cypress": "npm install [email protected]"
@@ -233,7 +233,8 @@
   },
   "stylelint": {
     "rules": {
-      "block-opening-brace-space-before": "always"
+      "block-opening-brace-space-before": "always",
+      "no-missing-end-of-source-newline": "never"
     }
   }
 }

superset/assets/src/CRUD/crud.less

@@ -16,6 +16,8 @@
  * specific language governing permissions and limitations
  * under the License.
  */
+@import "../../stylesheets/less/variables.less";
+
 .CRUD {
   .text-right {
     text-align: right;
@@ -24,24 +26,24 @@
     padding: 10px;
   }
   .control-label {
-    font-weight: bold;
-    font-size: 16px;
+    font-weight: @font-weight-bold;
+    font-size: @font-size-l;
   }
   .tiny-cell {
     width: 5px;
   }
   i.fa-caret-down,
   i.fa-caret-up {
-    width: "5px";
+    width: 5px;
   }
   td.expanded {
-    border-top: "0px";
-    padding: "0px";
+    border-top: 0;
+    padding: 0;
   }
   .frame {
-    border: "1px solid #AAA";
+    border: 1px solid @gray-heading;
     border-radius: 5;
     padding: 10;
-    background: "#F4F4F4";
+    background: @gray-bg;
   }
 }

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

@@ -196,7 +196,7 @@ class TableElement extends React.PureComponent {
         <div className="pull-left">
           <a
             href="#"
-            className="table-name text-bigger"
+            className="table-name"
             onClick={(e) => { this.toggleTable(e); }}
           >
             <strong>

superset/assets/src/SqlLab/main.less

@@ -126,7 +126,8 @@ div.Workspace {
   form {
     margin-block-end: 0;
   }
-  .leftItems form, .rightItems {
+  .leftItems form,
+  .rightItems {
     & > span {
       margin-right: 5px;
       margin-bottom: 5px;
@@ -151,12 +152,12 @@ div.Workspace {
   height: 10px;
   display: inline-block;
   background-color: @gray-light;
-  line-height: 8px;
+  line-height: 8px; // set specifically for closing 'x'
   text-align: center;
   vertical-align: middle;
-  font-size: 15px;
+  font-size: @font-size-m;
   margin-top: -3px;
-  font-weight: bold;
+  font-weight: @font-weight-bold;
 }
 .running {
   background-color: fade(@success, @opacity-heavy);
@@ -185,7 +186,7 @@ div.Workspace {
   padding: 0px !important;
   margin: 0px;
   border: none;
-  font-size: 12px;
+  font-size: @font-size-s;
   background-color: transparent !important;
 }
 
@@ -233,7 +234,7 @@ div.Workspace {
 
   .ddbtn-tab {
     font-size: inherit;
-    font-weight: bold;
+    font-weight: @font-weight-bold;
 
     &:active {
       background: none;
@@ -361,7 +362,7 @@ a.Link {
   border: none;
   text-align: left;
   color: @lightest;
-  font-size: 10px;
+  font-size: @font-size-xs;
 }
 .tooltip-inner {
   max-width: 500px;
@@ -414,5 +415,5 @@ a.Link {
 }
 
 .cost-estimate {
-  font-size: 12px;
+  font-size: @font-size-s;
 }

superset/assets/src/chart/chart.less

@@ -16,7 +16,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
+@import "../../stylesheets/less/variables.less";
+
 .chart-tooltip {
   opacity: 0.75;
-  font-size: 12px;
+  font-size: @font-size-s;
 }