Merge branch 'master' into ds/custom_editor

* master:
  Move redux logging to a different file (#10605)
  Ensure local host only if connection not available (#10600)
  Fix a bunch of debugger issues (#10572)
  Bump acorn from 6.0.0 to 6.4.1 (#10570)
  Resize plot to fit within pdf page (#10547)
  Update dev build instructions to mention "python.insidersChannel"
  Install the ZMQ prebuilt binaries and verify ZMQ works on startup (#10551)

Author: DonJayamanne

.vscode/launch.json

@@ -234,7 +234,7 @@
                 "--ui=tdd",
                 "--recursive",
                 "--colors",
-                //"--grep", "<suite name>",
+                //"--grep", "<suite>",
                 "--timeout=300000"
             ],
             "env": {
@@ -243,7 +243,7 @@
                 // Remove 'X' to turn on all logging in the debug output
                 "XVSC_PYTHON_FORCE_LOGGING": "1",
                 // Remove `X` prefix and update path to test with real python interpreter (for DS functional tests).
-                "XCI_PYTHON_PATH": "<Python Path>"
+                "XCI_PYTHON_PATH": "<Python Path>",
             },
             "outFiles": [
                 "${workspaceFolder}/out/**/*.js"

CONTRIBUTING.md

@@ -290,24 +290,12 @@ Overall steps for releasing are covered in the
 To create a release _build_, follow the steps outlined in the [release plan](https://github.com/Microsoft/vscode-python/labels/release%20plan) (which has a [template](https://github.com/Microsoft/vscode-python/blob/master/.github/release_plan.md)).
 
 ## Development Build
+If you would like to use the latest version of the extension as committed to `master` that has passed our test suite, then you may set the `"python.insidersChannel"` setting to `"daily"` or `"weekly"` based on how often you would like the extension to check for updates. 
 
-We publish the latest development
-build of the extension onto a cloud storage provider.
-If you are interested in helping us test our development builds or would like
-to stay ahead of the curve, then please feel free to download and install the
-extension from the following
+You may also download and install the extension manually from the following
 [location](https://pvsc.blob.core.windows.net/extension-builds/ms-python-insiders.vsix).
 Once you have downloaded the
 [ms-python-insiders.vsix](https://pvsc.blob.core.windows.net/extension-builds/ms-python-insiders.vsix)
 file, please follow the instructions on
 [this page](https://code.visualstudio.com/docs/editor/extension-gallery#_install-from-a-vsix)
-to install the extension.
-
-The development build of the extension:
-
-* Will be replaced with new releases published onto the
-  [VS Code Marketplace](https://marketplace.visualstudio.com/VSCode).
-* Does not get updated with new development builds of the extension (if you want to
-  test a newer development build, uninstall the old version of the
-  extension and then install the new version)
-* Is built every time a PR is committed into the [`master` branch](https://github.com/Microsoft/vscode-python).
+to install the extension. Do note that the manual install will not automatically update to newer builds unless you set the `"python.insidersChannel"` setting (it will get replaced with released versions from the Marketplace once they are newer than the version install manually).

build/ci/templates/globals.yml

@@ -6,6 +6,7 @@ variables:
   MOCHA_REPORTER_JUNIT: true # Use the mocha-multi-reporters and send output to both console (spec) and JUnit (mocha-junit-reporter).
   VSC_PYTHON_FORCE_LOGGING: true # Enable this to turn on console output for the logger
   VSC_PYTHON_LOG_FILE: '$(Build.ArtifactStagingDirectory)/pvsc.log'
+  VSC_PYTHON_WEBVIEW_LOG_FILE: '$(Build.ArtifactStagingDirectory)/pvsc_webview.log'
   CI_BRANCH_NAME: ${Build.SourceBranchName}
   npm_config_cache: $(Pipeline.Workspace)/.npm
   vmImageMacOS: 'macOS-10.15'

build/webpack/common.js

@@ -35,7 +35,8 @@ exports.nodeModulesToExternalize = [
     '@koa/cors',
     'koa',
     'koa-compress',
-    'koa-logger'
+    'koa-logger',
+    'zeromq'
 ];
 exports.nodeModulesToReplacePaths = [...exports.nodeModulesToExternalize];
 function getDefaultPlugins(name) {

build/webpack/webpack.datascience-ui.config.builder.js

@@ -190,6 +190,7 @@ function buildConfiguration(isNotebook) {
             }),
             ...getPlugins(isNotebook)
         ],
+        externals: ['log4js'],
         resolve: {
             // Add '.ts' and '.tsx' as resolvable extensions.
             extensions: ['.ts', '.tsx', '.js', '.json', '.svg']

build/webpack/webpack.extension.config.js

@@ -2,6 +2,8 @@
 // Licensed under the MIT License.
 'use strict';
 
+const copyWebpackPlugin = require('copy-webpack-plugin');
+const removeFilesWebpackPlugin = require('remove-files-webpack-plugin');
 const path = require('path');
 const tsconfig_paths_webpack_plugin = require('tsconfig-paths-webpack-plugin');
 const constants = require('../constants');
@@ -76,7 +78,15 @@ const config = {
                     ]
                 }
             ]
-        })
+        }),
+        // ZMQ requires prebuilds to be in our node_modules directory. So recreate the ZMQ structure.
+        // However we don't webpack to manage this, so it was part of the excluded modules. Delete it from there
+        // so at runtime we pick up the original structure.
+        new removeFilesWebpackPlugin({ after: { include: ['./out/client/node_modules/zeromq.js'] } }),
+        new copyWebpackPlugin([{ from: './node_modules/zeromq/**/*.js' }]),
+        new copyWebpackPlugin([{ from: './node_modules/zeromq/**/*.node' }]),
+        new copyWebpackPlugin([{ from: './node_modules/zeromq/**/*.json' }]),
+        new copyWebpackPlugin([{ from: './node_modules/node-gyp-build/**/*' }])
     ],
     resolve: {
         alias: {

gulpfile.js

@@ -274,7 +274,9 @@ function getAllowedWarningsForWebPack(buildConfig) {
                 'WARNING in ./node_modules/ws/lib/validation.js',
                 'WARNING in ./node_modules/@jupyterlab/services/node_modules/ws/lib/buffer-util.js',
                 'WARNING in ./node_modules/@jupyterlab/services/node_modules/ws/lib/validation.js',
-                'WARNING in ./node_modules/any-promise/register.js'
+                'WARNING in ./node_modules/any-promise/register.js',
+                'WARNING in ./node_modules/log4js/lib/appenders/index.js',
+                'WARNING in ./node_modules/log4js/lib/clustering.js'
             ];
         case 'extension':
             return [
@@ -709,6 +711,7 @@ function hasNativeDependencies() {
         path.dirname(item.substring(item.indexOf('node_modules') + 'node_modules'.length)).split(path.sep)
     )
         .filter(item => item.length > 0)
+        .filter(item => !item.includes('zeromq')) // This is a known native. Allow this one for now
         .filter(
             item =>
                 jsonProperties.findIndex(flattenedDependency =>

news/2 Fixes/10206.md

@@ -0,0 +1 @@
+Fix interactive window debugging after running cells in a notebook.

news/2 Fixes/10395.md

@@ -0,0 +1 @@
+Fix interactive window debugging when debugging the first cell to be run.

news/2 Fixes/10396.md

@@ -0,0 +1 @@
+Fix interactive window debugging for extra lines in a function.

news/2 Fixes/10597.md

@@ -0,0 +1 @@
+Ensure default `host` is not set, if `connect` or `listen` settings are available.

news/2 Fixes/9403.md

@@ -0,0 +1 @@
+Ensure plot fits within the page of the `PDF`.

news/3 Code Health/10483.md

@@ -0,0 +1 @@
+Add ZMQ library to extension