Merge branch 'switch-to-uuid' into use-tcp-for-test-server

Author: eleanorjboyd

.eslintignore

@@ -48,8 +48,6 @@ src/test/testing/common/services/configSettingService.unit.test.ts
 
 src/test/common/exitCIAfterTestReporter.ts
 
-src/test/common/net/fileDownloader.unit.test.ts
-src/test/common/net/httpClient.unit.test.ts
 
 src/test/common/terminals/activator/index.unit.test.ts
 src/test/common/terminals/activator/base.unit.test.ts
@@ -76,7 +74,6 @@ src/test/common/platform/filesystem.test.ts
 
 src/test/common/utils/cacheUtils.unit.test.ts
 src/test/common/utils/decorators.unit.test.ts
-src/test/common/utils/localize.functional.test.ts
 src/test/common/utils/version.unit.test.ts
 
 src/test/common/configSettings/configSettings.unit.test.ts
@@ -108,7 +105,6 @@ src/test/common/interpreterPathService.unit.test.ts
 
 src/test/pythonFiles/formatting/dummy.ts
 
-src/test/debugger/extension/banner.unit.test.ts
 src/test/debugger/extension/adapter/adapter.test.ts
 src/test/debugger/extension/adapter/outdatedDebuggerPrompt.unit.test.ts
 src/test/debugger/extension/adapter/factory.unit.test.ts
@@ -124,7 +120,6 @@ src/test/telemetry/index.unit.test.ts
 src/test/telemetry/envFileTelemetry.unit.test.ts
 
 src/test/application/diagnostics/checks/macPythonInterpreter.unit.test.ts
-src/test/application/diagnostics/checks/pythonPathDeprecated.unit.test.ts
 src/test/application/diagnostics/checks/pythonInterpreter.unit.test.ts
 src/test/application/diagnostics/checks/invalidLaunchJsonDebugger.unit.test.ts
 src/test/application/diagnostics/checks/powerShellActivation.unit.test.ts
@@ -139,7 +134,6 @@ src/test/performance/load.perf.test.ts
 
 src/client/interpreter/configuration/interpreterSelector/commands/base.ts
 src/client/interpreter/configuration/interpreterSelector/commands/resetInterpreter.ts
-src/client/interpreter/configuration/interpreterSelector/commands/setShebangInterpreter.ts
 src/client/interpreter/configuration/pythonPathUpdaterServiceFactory.ts
 src/client/interpreter/configuration/services/globalUpdaterService.ts
 src/client/interpreter/configuration/services/workspaceUpdaterService.ts
@@ -148,7 +142,6 @@ src/client/interpreter/helpers.ts
 src/client/interpreter/virtualEnvs/condaInheritEnvPrompt.ts
 src/client/interpreter/display/index.ts
 
-src/client/api.ts
 src/client/extension.ts
 src/client/sourceMapSupport.ts
 src/client/startupTelemetry.ts
@@ -178,12 +171,9 @@ src/client/testing/common/runner.ts
 
 src/client/common/helpers.ts
 src/client/common/net/browser.ts
-src/client/common/net/fileDownloader.ts
-src/client/common/net/httpClient.ts
 src/client/common/net/socket/socketCallbackHandler.ts
 src/client/common/net/socket/socketServer.ts
 src/client/common/net/socket/SocketStream.ts
-src/client/common/asyncDisposableRegistry.ts
 src/client/common/editor.ts
 src/client/common/contextKey.ts
 src/client/common/experiments/telemetry.ts
@@ -208,10 +198,6 @@ src/client/common/terminal/shellDetectors/vscEnvironmentShellDetector.ts
 src/client/common/terminal/shellDetectors/terminalNameShellDetector.ts
 src/client/common/terminal/shellDetectors/settingsShellDetector.ts
 src/client/common/terminal/shellDetectors/baseShellDetector.ts
-src/client/common/terminal/environmentActivationProviders/baseActivationProvider.ts
-src/client/common/terminal/environmentActivationProviders/commandPrompt.ts
-src/client/common/terminal/environmentActivationProviders/bash.ts
-src/client/common/terminal/environmentActivationProviders/pyenvActivationProvider.ts
 src/client/common/utils/decorators.ts
 src/client/common/utils/enum.ts
 src/client/common/utils/platform.ts

.github/workflows/community-feedback-auto-comment.yml

@@ -0,0 +1,30 @@
+name: Community Feedback Auto Comment
+
+on:
+  issues:
+    types:
+      - labeled
+jobs:
+  add-comment:
+    if: github.event.label.name == 'needs community feedback'
+    runs-on: ubuntu-latest
+
+    permissions:
+      issues: write
+
+    steps:
+      - name: Check For Existing Comment
+        uses: peter-evans/find-comment@v2
+        id: finder
+        with:
+          issue-number: ${{ github.event.issue.number }}
+          comment-author: 'github-actions[bot]'
+          body-includes: Thanks for the feature request! We are going to give the community
+
+      - name: Add Community Feedback Comment
+        if: steps.finder.outputs.comment-id == ''
+        uses: peter-evans/create-or-update-comment@v3
+        with:
+          issue-number: ${{ github.event.issue.number }}
+          body: |
+            Thanks for the feature request! We are going to give the community 60 days from when this issue was created to provide 7 👍 upvotes on the opening comment to gauge general interest in this idea. If there's enough upvotes then we will consider this feature request in our future planning. If there's unfortunately not enough upvotes then we will close this issue.

.github/workflows/python27-issue-response.yml

@@ -0,0 +1,14 @@
+on:
+  issues:
+    types: [opened]
+
+jobs:
+  python27-issue-response:
+    runs-on: ubuntu-latest
+    if: "contains(github.event.issue.body, 'Python version (& distribution if applicable, e.g. Anaconda): 2.7')"
+    steps:
+      - name: Check for Python 2.7 string
+        run: |
+          response="We're sorry, but we no longer support Python 2.7. If you need to work with Python 2.7, you will have to pin to 2022.2.* version of the extension, which was the last version that had the debugger (debugpy) with support for python 2.7, and was tested with `2.7`. Thank you for your understanding! \n ![https://user-images.githubusercontent.com/51720070/80000627-39dacc00-8472-11ea-9755-ac7ba0acbb70.gif](https://user-images.githubusercontent.com/51720070/80000627-39dacc00-8472-11ea-9755-ac7ba0acbb70.gif)"
+          gh issue comment ${{ github.event.issue.number }} --body "$response"
+          gh issue close ${{ github.event.issue.number }}

.github/workflows/triage-info-needed.yml

@@ -0,0 +1,100 @@
+name: Triage "info-needed" label
+
+on:
+  issue_comment:
+    types: [created]
+
+env:
+  TRIAGERS: '["karrtikr","karthiknadig","paulacamargo25","eleanorjboyd", "brettcannon"]'
+
+jobs:
+  add_label:
+    runs-on: ubuntu-latest
+    if: contains(github.event.issue.labels.*.name, 'triage-needed') && !contains(github.event.issue.labels.*.name, 'info-needed')
+    env:
+      KEYWORDS: '["\\?", "please", "kindly", "let me know", "try", "can you", "could you", "would you", "may I", "provide", "let us know", "tell me", "give me", "send me", "what", "when", "where", "why", "how"]'
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v3
+      - name: Check for author
+        uses: actions/github-script@v6
+        with:
+          github-token: ${{ secrets.GITHUB_TOKEN }}
+          script: |
+            const issue = await github.issues.get({
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              issue_number: context.issue.number
+            });
+            const commentAuthor = context.payload.comment.user.login;
+            const commentBody = context.payload.comment.body;
+            const isTeamMember = ${{ env.TRIAGERS }}.includes(commentAuthor);
+
+            const keywords = ${{ env.KEYWORDS }};
+            const isRequestForInfo = new RegExp(keywords.join('|'), 'i').test(commentBody);
+
+            const shouldAddLabel = isTeamMember && commentAuthor !== issue.data.user.login && isRequestForInfo;
+
+            if (shouldAddLabel) {
+              await github.issues.addLabels({
+                owner: context.repo.owner,
+                repo: context.repo.repo,
+                issue_number: context.issue.number,
+                labels: ['info-needed']
+              });
+            }
+
+  remove_label:
+    if: contains(github.event.issue.labels.*.name, 'info-needed') && contains(github.event.issue.labels.*.name, 'triage-needed')
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v3
+      - name: Check for author
+        uses: actions/github-script@v6
+        with:
+          github-token: ${{ secrets.GITHUB_TOKEN }}
+          script: |
+            const issue = await github.issues.get({
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              issue_number: context.issue.number
+            });
+            const commentAuthor = context.payload.comment.user.login;
+            const issueAuthor = issue.data.user.login;
+            if (commentAuthor === issueAuthor) {
+              await github.issues.removeLabel({
+                owner: context.repo.owner,
+                repo: context.repo.repo,
+                issue_number: context.issue.number,
+                name: 'info-needed'
+              });
+              return;
+            }
+            if (${{ env.TRIAGERS }}.includes(commentAuthor)) {
+              // If one of triagers made a comment, ignore it
+              return;
+            }
+            // Loop through all the comments on the issue in reverse order and find the last username that a TRIAGER mentioned
+            // If the comment author is the last mentioned username, remove the "info-needed" label
+            const comments = await github.issues.listComments({
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              issue_number: context.issue.number
+            });
+            for (const comment of comments.data.slice().reverse()) {
+              if (!${{ env.TRIAGERS }}.includes(comment.user.login)) {
+                continue;
+              }
+              const matches = comment.body.match(/@\w+/g) || [];
+              const mentionedUsernames = matches.map(match => match.replace('@', ''));
+              if (mentionedUsernames.includes(commentAuthor)) {
+                await github.issues.removeLabel({
+                  owner: context.repo.owner,
+                  repo: context.repo.repo,
+                  issue_number: context.issue.number,
+                  name: 'info-needed'
+                });
+                break;
+              }
+            }

.vscode/launch.json

@@ -253,6 +253,14 @@
             "request": "attach",
             "listen": { "host": "localhost", "port": 5678 },
             "justMyCode": true
+        },
+        {
+            "name": "Pytest Module",
+            "type": "python",
+            "request": "launch",
+            "module": "pytest",
+            "args": ["${workspaceFolder}/pythonFiles/tests/pytestadapter"],
+            "justMyCode": true
         }
     ],
     "compounds": [

.vscode/settings.json

@@ -66,4 +66,4 @@
     ],
     "typescript.preferences.importModuleSpecifier": "relative",
     "debug.javascript.usePreview": false
-}
+   }

README.md

@@ -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 offers support for Jupyter notebooks via 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!
 

build/existingFiles.json

@@ -379,6 +379,7 @@
     "src/test/common/socketStream.test.ts",
     "src/test/common/terminals/activation.bash.unit.test.ts",
     "src/test/common/terminals/activation.commandPrompt.unit.test.ts",
+    "src/test/common/terminals/activation.nushell.unit.test.ts",
     "src/test/common/terminals/activation.conda.unit.test.ts",
     "src/test/common/terminals/activation.unit.test.ts",
     "src/test/common/terminals/activator/base.unit.test.ts",

gulpfile.js

@@ -82,9 +82,13 @@ 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.
+    packageJson.extensionPack = packageJson.extensionPack.filter(
+        (item, index) => packageJson.extensionPack.indexOf(item) === index,
+    );
     await fsExtra.writeFile('package.json', JSON.stringify(packageJson, null, 4), 'utf-8');
 }
 

package.json

@@ -1693,15 +1693,28 @@
                 {
                     "group": "Python",
                     "command": "python.createEnvironment",
-                    "when": "resourceLangId == pip-requirements && !virtualWorkspace && shellExecutionSupported"
+                    "when": "resourceLangId == pip-requirements && !virtualWorkspace && shellExecutionSupported && !inDiffEditor"
                 },
                 {
                     "group": "Python",
                     "command": "python.createEnvironment",
-                    "when": "resourceFilename == pyproject.toml && pipInstallableToml && !virtualWorkspace && shellExecutionSupported"
+                    "when": "resourceFilename == pyproject.toml && pipInstallableToml && !virtualWorkspace && shellExecutionSupported  && !inDiffEditor"
                 }
             ],
             "editor/context": [
+                {
+                    "submenu": "python.run",
+                    "group": "Python",
+                    "when": "editorLangId == python && !virtualWorkspace && shellExecutionSupported"
+                },
+                {
+                    "command": "python.sortImports",
+                    "group": "Refactor",
+                    "title": "%python.command.python.sortImports.title%",
+                    "when": "editorLangId == python && !notebookEditorFocused && !virtualWorkspace && shellExecutionSupported"
+                }
+            ],
+            "python.run": [
                 {
                     "command": "python.execInTerminal",
                     "group": "Python",
@@ -1716,12 +1729,6 @@
                     "command": "python.execSelectionInTerminal",
                     "group": "Python",
                     "when": "editorFocus && editorLangId == python && !virtualWorkspace && shellExecutionSupported"
-                },
-                {
-                    "command": "python.sortImports",
-                    "group": "Refactor",
-                    "title": "%python.command.python.sortImports.title%",
-                    "when": "editorLangId == python && !notebookEditorFocused && !virtualWorkspace && shellExecutionSupported"
                 }
             ],
             "editor/title": [
@@ -1767,6 +1774,13 @@
                 }
             ]
         },
+        "submenus": [
+            {
+                "id": "python.run",
+                "label": "%python.editor.context.submenu.runPython%",
+                "icon": "$(play)"
+            }
+        ],
         "viewsWelcome": [
             {
                 "view": "testing",

package.nls.json

@@ -25,6 +25,7 @@
     "python.command.python.launchTensorBoard.title": "Launch TensorBoard",
     "python.command.python.refreshTensorBoard.title": "Refresh TensorBoard",
     "python.menu.createNewFile.title": "Python File",
+    "python.editor.context.submenu.runPython": "Run Python",
     "python.activeStateToolPath.description": "Path to the State Tool executable for ActiveState runtimes (version 0.36+).",
     "python.autoComplete.extraPaths.description": "List of paths to libraries and the like that need to be imported by auto complete engine. E.g. when using Google App SDK, the paths are not in system path, hence need to be added into this list.",
     "python.condaPath.description": "Path to the conda executable to use for activation (version 4.4+).",

pythonFiles/create_conda.py

@@ -9,7 +9,7 @@
 from typing import Optional, Sequence, Union
 
 CONDA_ENV_NAME = ".conda"
-CWD = pathlib.PurePath(os.getcwd())
+CWD = pathlib.Path.cwd()
 
 
 class VenvError(Exception):