Merge branch 'master' of https://github.com/Microsoft/vscode-python

Mikhail Arkhipov (MikhailArkhipov) · Aug 19, 2020 · May 6, 2020 · May 6, 2020 · May 11, 2020 · Jun 1, 2020
commit 67d7cb8509835f479e1f3f0220f18afe3c048a67
diff --git a/.github/ISSUE_TEMPLATE/2_bug_report.md b/.github/ISSUE_TEMPLATE/2_bug_report.md
@@ -50,20 +50,3 @@ XXX
 
 </p>
 </details>
-
-<br />
-
-<details>
-
-<summary>
-Output from <code>Console</code> under the <code>Developer Tools</code> panel (toggle Developer Tools on under <code>Help</code>; turn on source maps to make any tracebacks be useful by running <code>Enable source map support for extension debugging</code>)
-</summary>
-
-<p>
-
-```
-XXXX
-```
-
-</p>
-</details>
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,90 @@
 # Changelog
 
+## 2020.6.3 (30 June 2020)
+
+### Fixes
+
+1. Correctly check for ZMQ support, previously it could allow ZMQ to be supported when zmq could not be imported.
+   ([#12585](https://github.com/Microsoft/vscode-python/issues/12585))
+1. Auto indentation no longer working for notebooks and interactive window.
+   ([#12389](https://github.com/Microsoft/vscode-python/issues/12389))
+1. Add telemetry for tracking run by line.
+   ([#12580](https://github.com/Microsoft/vscode-python/issues/12580))
+1. Add more telemetry to distinguish how is the start page opened.
+   ([#12603](https://github.com/microsoft/vscode-python/issues/12603))
+1. Stop looking for mspythonconfig.json file in subfolders.
+   ([#12614](https://github.com/Microsoft/vscode-python/issues/12614))
+
+## 2020.6.2 (25 June 2020)
+
+### Fixes
+
+1. Fix `linting.pylintEnabled` setting check.
+   ([#12285](https://github.com/Microsoft/vscode-python/issues/12285))
+1. Don't modify LS settings if jediEnabled does not exist.
+   ([#12429](https://github.com/Microsoft/vscode-python/issues/12429))
+
+## 2020.6.1 (17 June 2020)
+
+### Fixes
+
+1. Fixed issue when `python.jediEnabled` setting was not removed and `python.languageServer` setting was not updated.
+   ([#12429](https://github.com/Microsoft/vscode-python/issues/12429))
+
+### Thanks
+
+Thanks to the following projects which we fully rely on to provide some of
+our features:
+
+-   [debugpy](https://pypi.org/project/debugpy/)
+-   [isort](https://pypi.org/project/isort/)
+-   [jedi](https://pypi.org/project/jedi/)
+    and [parso](https://pypi.org/project/parso/)
+-   [Microsoft Python Language Server](https://github.com/microsoft/python-language-server)
+-   [ptvsd](https://pypi.org/project/ptvsd/)
+-   [exuberant ctags](http://ctags.sourceforge.net/) (user-installed)
+-   [rope](https://pypi.org/project/rope/) (user-installed)
+
+Also thanks to the various projects we provide integrations with which help
+make this extension useful:
+
+-   Debugging support:
+    [Django](https://pypi.org/project/Django/),
+    [Flask](https://pypi.org/project/Flask/),
+    [gevent](https://pypi.org/project/gevent/),
+    [Jinja](https://pypi.org/project/Jinja/),
+    [Pyramid](https://pypi.org/project/pyramid/),
+    [PySpark](https://pypi.org/project/pyspark/),
+    [Scrapy](https://pypi.org/project/Scrapy/),
+    [Watson](https://pypi.org/project/Watson/)
+-   Formatting:
+    [autopep8](https://pypi.org/project/autopep8/),
+    [black](https://pypi.org/project/black/),
+    [yapf](https://pypi.org/project/yapf/)
+-   Interpreter support:
+    [conda](https://conda.io/),
+    [direnv](https://direnv.net/),
+    [pipenv](https://pypi.org/project/pipenv/),
+    [pyenv](https://github.com/pyenv/pyenv),
+    [venv](https://docs.python.org/3/library/venv.html#module-venv),
+    [virtualenv](https://pypi.org/project/virtualenv/)
+-   Linting:
+    [bandit](https://pypi.org/project/bandit/),
+    [flake8](https://pypi.org/project/flake8/),
+    [mypy](https://pypi.org/project/mypy/),
+    [prospector](https://pypi.org/project/prospector/),
+    [pylint](https://pypi.org/project/pylint/),
+    [pydocstyle](https://pypi.org/project/pydocstyle/),
+    [pylama](https://pypi.org/project/pylama/)
+-   Testing:
+    [nose](https://pypi.org/project/nose/),
+    [pytest](https://pypi.org/project/pytest/),
+    [unittest](https://docs.python.org/3/library/unittest.html#module-unittest)
+
+And finally thanks to the [Python](https://www.python.org/) development team and
+community for creating a fantastic programming language and community to be a
+part of!
+
 ## 2020.6.0 (16 June 2020)
 
 ### Enhancements

diff --git a/ThirdPartyNotices-Distribution.txt b/ThirdPartyNotices-Distribution.txt
@@ -28271,7 +28271,7 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
 
 -------------------------------------------------------------------
 
-jedi 0.17.0 - MIT
+jedi 0.17.1 - MIT
 Copyright (c) <2013>
 copyright u'jedi contributors
 copyright (c) 2014 by Armin Ronacher.
@@ -28541,6 +28541,16 @@ DEALINGS IN THE SOFTWARE.
 
 = = = = =
 
+Jedi also includes "django-stubs", which is licenced as follows:
+
+Copyright (c) Maxim Kurnikov.
+All rights reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 
 -------------------------------------------------------------------

diff --git a/build/ci/performance/perfJobs.yaml b/build/ci/performance/perfJobs.yaml
@@ -19,7 +19,7 @@ jobs:
         inputs:
           targets: 'prePublishNonBundle'
       - powershell: |
-          mocha --require source-map-support/register --opts ./build/.mocha.performance.opts
+          mocha --require source-map-support/register --config ./build/.mocha.performance.json
           node ./build/ci/performance/savePerformanceResults.js
 
   - job: Testing_Round_2
@@ -33,7 +33,7 @@ jobs:
     pool: DSPerf
     steps:
       - powershell: |
-          mocha --require source-map-support/register --opts ./build/.mocha.performance.opts
+          mocha --require source-map-support/register --config ./build/.mocha.performance.json
           node ./build/ci/performance/savePerformanceResults.js
 
   - job: Testing_Round_3
@@ -47,7 +47,7 @@ jobs:
     pool: DSPerf
     steps:
       - powershell: |
-          mocha --require source-map-support/register --opts ./build/.mocha.performance.opts
+          mocha --require source-map-support/register --config ./build/.mocha.performance.json
           node ./build/ci/performance/savePerformanceResults.js
 
   - job: Testing_Round_4
@@ -61,7 +61,7 @@ jobs:
     pool: DSPerf
     steps:
       - powershell: |
-          mocha --require source-map-support/register --opts ./build/.mocha.performance.opts
+          mocha --require source-map-support/register --config ./build/.mocha.performance.json
           node ./build/ci/performance/savePerformanceResults.js
 
   - job: Testing_Round_5
@@ -75,5 +75,5 @@ jobs:
     pool: DSPerf
     steps:
       - powershell: |
-          mocha --require source-map-support/register --opts ./build/.mocha.performance.opts
+          mocha --require source-map-support/register --config ./build/.mocha.performance.json
           node ./build/ci/performance/savePerformanceResults.js
diff --git a/build/ci/templates/steps/initialization.yml b/build/ci/templates/steps/initialization.yml
@@ -18,7 +18,6 @@ parameters:
   compile: 'true'
   sqlite: 'false'
   installVSCEorNPX: 'true'
-  enableGather: 'false'
 
 steps:
   - bash: |
@@ -93,15 +92,6 @@ steps:
       verbose: true
       customCommand: ci
 
-  - task: Npm@1
-    displayName: 'Install optional python-program-analysis'
-    condition: and(succeeded(), eq('${{ parameters.enableGather }}', 'true'))
-    inputs:
-      workingDir: ${{ parameters.workingDirectory }}
-      command: custom
-      verbose: true
-      customCommand: 'install @msrvida/python-program-analysis'
-
   # On Mac, the command `node` doesn't always point to the current node version.
   # Debugger tests use the variable process.env.NODE_PATH
   - script: |

diff --git a/build/existingFiles.json b/build/existingFiles.json
@@ -208,7 +208,6 @@
     "src/client/language/types.ts",
     "src/client/language/unicode.ts",
     "src/client/languageServices/jediProxyFactory.ts",
-    "src/client/languageServices/languageServerSurveyBanner.ts",
     "src/client/languageServices/proposeLanguageServerBanner.ts",
     "src/client/linters/bandit.ts",
     "src/client/linters/baseLinter.ts",

diff --git a/build/test-requirements.txt b/build/test-requirements.txt
@@ -7,7 +7,7 @@ black ; python_version>='3.6'
 yapf
 pylint
 pycodestyle
-prospector
+prospector==1.2.0 # Last version of prospector with Python 2.7 support
 pydocstyle
 nose
 pytest==4.6.9 # Last version of pytest with Python 2.7 support

diff --git a/build/webpack/webpack.extension.config.js b/build/webpack/webpack.extension.config.js
@@ -13,11 +13,6 @@ const configFileName = path.join(constants.ExtensionRootDir, 'tsconfig.extension
 // Some modules will be pre-genearted and stored in out/.. dir and they'll be referenced via NormalModuleReplacementPlugin
 // We need to ensure they do not get bundled into the output (as they are large).
 const existingModulesInOutDir = common.getListOfExistingModulesInOutDir();
-// tslint:disable-next-line:no-var-requires no-require-imports
-const FileManagerPlugin = require('filemanager-webpack-plugin-fixed');
-// If ENABLE_GATHER variable is defined, don't exclude the python-program-analysis pacakge.
-// See externals, below.
-const ppaPackageList = process.env.ENABLE_GATHER ? [] : ['@msrvida/python-program-analysis'];
 const config = {
     mode: 'production',
     target: 'node',
@@ -61,25 +56,9 @@ const config = {
             { enforce: 'post', test: /linebreak[\/\\]src[\/\\]linebreaker.js/, loader: 'transform-loader?brfs' }
         ]
     },
-    // Packages listed in externals keeps webpack from trying to package them.
-    // The ppaPackageList variable is set to non-empty if the build pipeline has been
-    // authenticated to install @msrvida/python-program-analysis.
-    externals: ['vscode', 'commonjs', ...ppaPackageList, ...existingModulesInOutDir],
+    externals: ['vscode', 'commonjs', ...existingModulesInOutDir],
     plugins: [
         ...common.getDefaultPlugins('extension'),
-        // Copy gather spec files into a known location for the webpacked extension
-        new FileManagerPlugin({
-            onEnd: [
-                {
-                    copy: [
-                        {
-                            source: './node_modules/@msrvida/python-program-analysis/dist/es5/specs/*.yaml',
-                            destination: './out/client/gatherSpecs'
-                        }
-                    ]
-                }
-            ]
-        }),
         new copyWebpackPlugin([
             {
                 from: './node_modules/pdfkit/js/pdfkit.standalone.js',

diff --git a/experiments.json b/experiments.json
@@ -105,12 +105,12 @@
         "name": "LocalZMQKernel - experiment",
         "salt": "LocalZMQKernel",
         "min": 0,
-        "max": 25
+        "max": 75
     },
     {
         "name": "LocalZMQKernel - control",
         "salt": "LocalZMQKernel",
-        "min": 25,
+        "min": 75,
         "max": 100
     },
     {

diff --git a/news/1 Enhancements/10744.md b/news/1 Enhancements/10744.md
diff --git a/news/1 Enhancements/12249.md b/news/1 Enhancements/12249.md
diff --git a/news/1 Enhancements/12486.md b/news/1 Enhancements/12486.md
@@ -0,0 +1 @@
+Update to the latest version of [`jedi`](https://github.com/davidhalter/jedi) (`0.17.1`). This brings completions for Django (via [`django-stubs`](https://github.com/typeddjango/django-stubs)) as well as support for Python 3.9 and various bugfixes (mostly around generic type annotations). (thanks [Peter Law](https://gitlab.com/PeterJCLaw/))
diff --git a/news/1 Enhancements/12694.md b/news/1 Enhancements/12694.md
@@ -0,0 +1 @@
+Include the JUPYTER_PATH environment variable when searching the disk for kernels.
diff --git a/news/1 Enhancements/12732.md b/news/1 Enhancements/12732.md
@@ -0,0 +1 @@
+Added exporting to python, HTML and PDF from the interative window.
diff --git a/news/1 Enhancements/12764.md b/news/1 Enhancements/12764.md
@@ -0,0 +1 @@
+Show a prompt asking user to upgrade Code runner to new version to keep using it when in Deprecate PythonPath experiment.
diff --git a/news/2 Fixes/10579.md b/news/2 Fixes/10579.md
@@ -0,0 +1 @@
+Ensure we only have a single isort process running on a single file.
diff --git a/news/2 Fixes/10587.md b/news/2 Fixes/10587.md
diff --git a/news/2 Fixes/10993.md b/news/2 Fixes/10993.md
@@ -0,0 +1 @@
+Provided a method for external partners to participate in jupyter server URI picking/authentication.
diff --git a/news/2 Fixes/11412.md b/news/2 Fixes/11412.md
@@ -0,0 +1 @@
+Get Jupyter connections to work with a Windows store installed Python/Jupyter combination.
diff --git a/news/2 Fixes/11796.md b/news/2 Fixes/11796.md
@@ -0,0 +1 @@
+Paste can sometimes double paste into a notebook or interactive window editor.
diff --git a/news/2 Fixes/12046.md b/news/2 Fixes/12046.md
@@ -0,0 +1 @@
+Variables should not falsh when running by line.
diff --git a/news/2 Fixes/12155.md b/news/2 Fixes/12155.md
diff --git a/news/2 Fixes/12225.md b/news/2 Fixes/12225.md
diff --git a/news/2 Fixes/12246.md b/news/2 Fixes/12246.md
diff --git a/news/2 Fixes/12285.md b/news/2 Fixes/12285.md
diff --git a/news/2 Fixes/12355.md b/news/2 Fixes/12355.md
@@ -0,0 +1 @@
+If we fail to start a raw kernel daemon then fall back to using process execution.
diff --git a/news/2 Fixes/12389.md b/news/2 Fixes/12389.md
diff --git a/news/2 Fixes/12429.md b/news/2 Fixes/12429.md
diff --git a/news/2 Fixes/12460.md b/news/2 Fixes/12460.md
@@ -0,0 +1 @@
+Fix the export button from the interactive window to export again.
diff --git a/news/2 Fixes/12580.md b/news/2 Fixes/12580.md
diff --git a/news/2 Fixes/12585.md b/news/2 Fixes/12585.md
diff --git a/news/2 Fixes/12588.md b/news/2 Fixes/12588.md
@@ -0,0 +1 @@
+Process Jupyter messages synchronously when possible.
diff --git a/news/2 Fixes/12614.md b/news/2 Fixes/12614.md
diff --git a/news/2 Fixes/12773.md b/news/2 Fixes/12773.md
@@ -0,0 +1 @@
+Open variable explorer when opening variable explorer during debugging.
diff --git a/news/3 Code Health/12539.md b/news/3 Code Health/12539.md
@@ -0,0 +1 @@
+Fix linux nightly tests so they run and report results. Also seems to get rid of stream destroyed messages for raw kernel.
diff --git a/news/3 Code Health/12603.md b/news/3 Code Health/12603.md
diff --git a/news/3 Code Health/12656.md b/news/3 Code Health/12656.md
@@ -0,0 +1 @@
+Log ExP experiments the user belongs to in the output panel.
diff --git a/news/3 Code Health/12722.md b/news/3 Code Health/12722.md
@@ -0,0 +1 @@
+Add more telemetry for "Select Interpreter" command.
diff --git a/package-lock.json b/package-lock.json
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		Update to the latest version of [`jedi`](https://github.com/davidhalter/jedi) (`0.17.1`). This brings completions for Django (via [`django-stubs`](https://github.com/typeddjango/django-stubs)) as well as support for Python 3.9 and various bugfixes (mostly around generic type annotations). (thanks [Peter Law](https://gitlab.com/PeterJCLaw/))
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		Include the JUPYTER_PATH environment variable when searching the disk for kernels.
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		Added exporting to python, HTML and PDF from the interative window.
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		Show a prompt asking user to upgrade Code runner to new version to keep using it when in Deprecate PythonPath experiment.
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		Ensure we only have a single isort process running on a single file.
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		Provided a method for external partners to participate in jupyter server URI picking/authentication.
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		Get Jupyter connections to work with a Windows store installed Python/Jupyter combination.
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		Paste can sometimes double paste into a notebook or interactive window editor.
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		Variables should not falsh when running by line.
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		If we fail to start a raw kernel daemon then fall back to using process execution.