From 173a5ff162bdfff8e10dd91f557602113066acf8 Mon Sep 17 00:00:00 2001 From: luabud Date: Mon, 17 Oct 2022 08:36:00 -0700 Subject: [PATCH 1/8] No longer install the Jupyter extension by default --- README.md | 6 ++++-- build/license-header.txt | 3 --- gulpfile.js | 2 +- package.json | 8 ++++++-- 4 files changed, 11 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index 48f5ffc8b551..e5c24d689f38 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,7 @@ The Python extension does offer [some support](https://github.com/microsoft/vsco ## Installed extensions -The Python extension will automatically install the [Pylance](https://marketplace.visualstudio.com/items?itemName=ms-python.vscode-pylance), [Jupyter](https://marketplace.visualstudio.com/items?itemName=ms-toolsai.jupyter) and [isort](https://marketplace.visualstudio.com/items?itemName=ms-python.isort) extensions to give you the best experience when working with Python files and Jupyter notebooks. However, Pylance is an optional dependency, meaning the Python extension will remain fully functional if it fails to be installed. You can also [uninstall](https://code.visualstudio.com/docs/editor/extension-marketplace#_uninstall-an-extension) it at the expense of some features if you’re using a different language server. +The Python extension will automatically install the [Pylance](https://marketplace.visualstudio.com/items?itemName=ms-python.vscode-pylance) and [isort](https://marketplace.visualstudio.com/items?itemName=ms-python.isort) extensions to give you the best experience when working with Python files. However, they are both optional dependencies, meaning the Python extension will remain fully functional if either one fails to be installed. You can [uninstall](https://code.visualstudio.com/docs/editor/extension-marketplace#_uninstall-an-extension) Pylance at the expense of some features if you’re using a different language server. Extensions installed through the marketplace are subject to the [Marketplace Terms of Use](https://cdn.vsassets.io/v/M146_20190123.39/_content/Microsoft-Visual-Studio-Marketplace-Terms-of-Use.pdf). @@ -37,7 +37,9 @@ Extensions installed through the marketplace are subject to the [Marketplace Ter ## Jupyter Notebook quick start -The Python extension and the [Jupyter extension](https://marketplace.visualstudio.com/items?itemName=ms-toolsai.jupyter) work together to give you a great Notebook experience in VS Code. +The Python extension no longer offers support for Jupyter notebooks out of the box. However, it works with the [Jupyter extension](https://marketplace.visualstudio.com/items?itemName=ms-toolsai.jupyter) to provide you a great Python notebook experience in VS Code. + +- Install the [Jupyter extension](https://marketplace.visualstudio.com/items?itemName=ms-toolsai.jupyter). - Open or create a Jupyter Notebook file (.ipynb) and start coding in our Notebook Editor! diff --git a/build/license-header.txt b/build/license-header.txt index c95da3f6a07c..c3210ded8c9e 100644 --- a/build/license-header.txt +++ b/build/license-header.txt @@ -1,8 +1,5 @@ PLEASE NOTE: This is the license for the Python extension for Visual Studio Code. The Python extension automatically installs other extensions as optional dependencies, which can be uninstalled at any time. These extensions have separate licenses: - - The Jupyter extension is released under an MIT License: - https://marketplace.visualstudio.com/items/ms-toolsai.jupyter/license - - The isort extension is released under an MIT License: https://marketplace.visualstudio.com/items/ms-python.isort/license diff --git a/gulpfile.js b/gulpfile.js index cb901ad9f10c..5731cda8b2e1 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -82,7 +82,7 @@ async function addExtensionPackDependencies() { // extension dependencies need not be installed during development const packageJsonContents = await fsExtra.readFile('package.json', 'utf-8'); const packageJson = JSON.parse(packageJsonContents); - packageJson.extensionPack = ['ms-toolsai.jupyter', 'ms-python.vscode-pylance', 'ms-python.isort'].concat( + packageJson.extensionPack = ['ms-python.vscode-pylance', 'ms-python.isort'].concat( packageJson.extensionPack ? packageJson.extensionPack : [], ); await fsExtra.writeFile('package.json', JSON.stringify(packageJson, null, 4), 'utf-8'); diff --git a/package.json b/package.json index c843fb5edded..460a37f5c288 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "python", "displayName": "Python", - "description": "IntelliSense (Pylance), Linting, Debugging (multi-threaded, remote), Jupyter Notebooks, code formatting, refactoring, unit tests, and more.", + "description": "IntelliSense (Pylance), Linting, Debugging (multi-threaded, remote), code formatting, refactoring, unit tests, and more.", "version": "2022.19.0-dev", "featureFlags": { "usingNewInterpreterStorage": true @@ -2002,5 +2002,9 @@ "id": "f1f59ae4-9318-4f3c-a9b5-81b2eaa5f8a5", "publisherDisplayName": "Microsoft", "publisherId": "998b010b-e2af-44a5-a6cd-0b5fd3b9b6f8" - } + }, + "extensionPack": [ + "ms-python.vscode-pylance", + "ms-python.isort" + ] } From 178c7be2b81a48d8edd2fb28477ca7e1d7688d99 Mon Sep 17 00:00:00 2001 From: Luciana Abud <45497113+luabud@users.noreply.github.com> Date: Mon, 14 Nov 2022 18:14:36 -0800 Subject: [PATCH 2/8] Update README.md Co-authored-by: Brett Cannon --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index e5c24d689f38..00b55c354fa2 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,7 @@ The Python extension does offer [some support](https://github.com/microsoft/vsco ## Installed extensions -The Python extension will automatically install the [Pylance](https://marketplace.visualstudio.com/items?itemName=ms-python.vscode-pylance) and [isort](https://marketplace.visualstudio.com/items?itemName=ms-python.isort) extensions to give you the best experience when working with Python files. However, they are both optional dependencies, meaning the Python extension will remain fully functional if either one fails to be installed. You can [uninstall](https://code.visualstudio.com/docs/editor/extension-marketplace#_uninstall-an-extension) Pylance at the expense of some features if you’re using a different language server. +The Python extension will automatically install the [Pylance](https://marketplace.visualstudio.com/items?itemName=ms-python.vscode-pylance) and [isort](https://marketplace.visualstudio.com/items?itemName=ms-python.isort) extensions to give you the best experience when working with Python files. However, they are both optional dependencies, meaning the Python extension will remain fully functional if either one fails to be installed. You can [uninstall](https://code.visualstudio.com/docs/editor/extension-marketplace#_uninstall-an-extension) Pylance at the expense of some features if you’re using a different language server. Extensions installed through the marketplace are subject to the [Marketplace Terms of Use](https://cdn.vsassets.io/v/M146_20190123.39/_content/Microsoft-Visual-Studio-Marketplace-Terms-of-Use.pdf). From 9ff03e4597f5bbac87f52cda55a3c447da7aac8e Mon Sep 17 00:00:00 2001 From: Luciana Abud <45497113+luabud@users.noreply.github.com> Date: Thu, 17 Nov 2022 09:22:11 -0800 Subject: [PATCH 3/8] Apply suggestions from code review Co-authored-by: Brett Cannon --- gulpfile.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/gulpfile.js b/gulpfile.js index 5731cda8b2e1..0eb4d4f4b94d 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -85,6 +85,8 @@ async function addExtensionPackDependencies() { packageJson.extensionPack = ['ms-python.vscode-pylance', 'ms-python.isort'].concat( packageJson.extensionPack ? packageJson.extensionPack : [], ); + // Remove potential duplicates. + packageJson.extensionPack = packageJson.extensionPack.filter((item, index) => packageJson.extensionPack.indexOf(item) === index); await fsExtra.writeFile('package.json', JSON.stringify(packageJson, null, 4), 'utf-8'); } From 8bbd3695de3eb11b708e7518c2760de6f077cbfb Mon Sep 17 00:00:00 2001 From: luabud Date: Thu, 17 Nov 2022 09:28:05 -0800 Subject: [PATCH 4/8] format file --- gulpfile.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/gulpfile.js b/gulpfile.js index 0eb4d4f4b94d..c221cff4aee8 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -86,7 +86,9 @@ async function addExtensionPackDependencies() { packageJson.extensionPack ? packageJson.extensionPack : [], ); // Remove potential duplicates. - packageJson.extensionPack = packageJson.extensionPack.filter((item, index) => packageJson.extensionPack.indexOf(item) === index); + packageJson.extensionPack = packageJson.extensionPack.filter( + (item, index) => packageJson.extensionPack.indexOf(item) === index, + ); await fsExtra.writeFile('package.json', JSON.stringify(packageJson, null, 4), 'utf-8'); } From f480446c8a0d731bc135de866cad4ead5eabadb6 Mon Sep 17 00:00:00 2001 From: Luciana Abud <45497113+luabud@users.noreply.github.com> Date: Tue, 22 Nov 2022 13:37:41 -0800 Subject: [PATCH 5/8] Update README.md Co-authored-by: Brett Cannon --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 00b55c354fa2..c8f76b064606 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,7 @@ The Python extension does offer [some support](https://github.com/microsoft/vsco ## Installed extensions -The Python extension will automatically install the [Pylance](https://marketplace.visualstudio.com/items?itemName=ms-python.vscode-pylance) and [isort](https://marketplace.visualstudio.com/items?itemName=ms-python.isort) extensions to give you the best experience when working with Python files. However, they are both optional dependencies, meaning the Python extension will remain fully functional if either one fails to be installed. You can [uninstall](https://code.visualstudio.com/docs/editor/extension-marketplace#_uninstall-an-extension) Pylance at the expense of some features if you’re using a different language server. +The Python extension will automatically install the [Pylance](https://marketplace.visualstudio.com/items?itemName=ms-python.vscode-pylance) and [isort](https://marketplace.visualstudio.com/items?itemName=ms-python.isort) extensions to give you the best experience when working with Python files. However, they are both optional dependencies, meaning the Python extension will remain functional if either one is not installed. You can [uninstall](https://code.visualstudio.com/docs/editor/extension-marketplace#_uninstall-an-extension) Pylance at the expense of some features if you’re using a different language server. Extensions installed through the marketplace are subject to the [Marketplace Terms of Use](https://cdn.vsassets.io/v/M146_20190123.39/_content/Microsoft-Visual-Studio-Marketplace-Terms-of-Use.pdf). From 83e271ec39c2d9c6f7dcd128d5cf4c0e846ea4fc Mon Sep 17 00:00:00 2001 From: Luciana Abud <45497113+luabud@users.noreply.github.com> Date: Fri, 17 Mar 2023 14:28:48 -0700 Subject: [PATCH 6/8] Remove isort from extensionPack --- package.json | 1 - 1 file changed, 1 deletion(-) diff --git a/package.json b/package.json index b839ab15205d..9f4f034279cc 100644 --- a/package.json +++ b/package.json @@ -1939,6 +1939,5 @@ }, "extensionPack": [ "ms-python.vscode-pylance", - "ms-python.isort" ] } From 51cb47c23ff113626882cdef8f51532238e556af Mon Sep 17 00:00:00 2001 From: Luciana Abud <45497113+luabud@users.noreply.github.com> Date: Fri, 17 Mar 2023 15:21:01 -0700 Subject: [PATCH 7/8] Remove extensionPack refernece --- package.json | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/package.json b/package.json index 9f4f034279cc..0f56394b7198 100644 --- a/package.json +++ b/package.json @@ -1936,8 +1936,5 @@ "id": "f1f59ae4-9318-4f3c-a9b5-81b2eaa5f8a5", "publisherDisplayName": "Microsoft", "publisherId": "998b010b-e2af-44a5-a6cd-0b5fd3b9b6f8" - }, - "extensionPack": [ - "ms-python.vscode-pylance", - ] + } } From 55564bb43cb48f38695351af38f7ea18dfd9dd52 Mon Sep 17 00:00:00 2001 From: Luciana Abud <45497113+luabud@users.noreply.github.com> Date: Fri, 17 Mar 2023 15:25:10 -0700 Subject: [PATCH 8/8] Update gulpfile.js --- gulpfile.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gulpfile.js b/gulpfile.js index aa93978d9dce..a344b165a6cc 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -82,7 +82,7 @@ async function addExtensionPackDependencies() { // extension dependencies need not be installed during development const packageJsonContents = await fsExtra.readFile('package.json', 'utf-8'); const packageJson = JSON.parse(packageJsonContents); - packageJson.extensionPack = ['ms-toolsai.jupyter', 'ms-python.vscode-pylance'].concat( + packageJson.extensionPack = ['ms-python.vscode-pylance'].concat( packageJson.extensionPack ? packageJson.extensionPack : [], ); // Remove potential duplicates.