Merge branch 'main' into file-comms-4

Author: eleanorjboyd

.github/workflows/build.yml

@@ -9,7 +9,7 @@ on:
       - 'release-*'
 
 env:
-  NODE_VERSION: 18.17.1
+  NODE_VERSION: 20.18.0
   PYTHON_VERSION: '3.10' # YML treats 3.10 the number as 3.1, so quotes around 3.10
   # Force a path with spaces and to test extension works in these scenarios
   # Unicode characters are causing 2.7 failures so skip that for now.

.github/workflows/pr-check.yml

@@ -8,7 +8,7 @@ on:
       - release*
 
 env:
-  NODE_VERSION: 18.17.1
+  NODE_VERSION: 20.18.0
   PYTHON_VERSION: '3.10' # YML treats 3.10 the number as 3.1, so quotes around 3.10
   MOCHA_REPORTER_JUNIT: true # Use the mocha-multi-reporters and send output to both console (spec) and JUnit (mocha-junit-reporter). Also enables a reporter which exits the process running the tests if it haven't already.
   ARTIFACT_NAME_VSIX: ms-python-insiders-vsix

.nvmrc

@@ -1 +1 @@
-v18.17.1
+v20.18.0

build/azure-pipeline.pre-release.yml

@@ -66,7 +66,7 @@ extends:
     buildSteps:
       - task: NodeTool@0
         inputs:
-          versionSpec: '18.17.1'
+          versionSpec: '20.18.0'
         displayName: Select Node version
 
       - task: UsePythonVersion@0

build/azure-pipeline.stable.yml

@@ -61,7 +61,7 @@ extends:
     buildSteps:
       - task: NodeTool@0
         inputs:
-          versionSpec: '18.17.1'
+          versionSpec: '20.18.0'
         displayName: Select Node version
 
       - task: UsePythonVersion@0
@@ -103,7 +103,7 @@ extends:
             project: 'Monaco'
             definition: 593
             buildVersionToDownload: 'latestFromBranch'
-            branchName: 'refs/heads/release/2024.14'
+            branchName: 'refs/heads/release/2024.18'
             targetPath: '$(Build.SourcesDirectory)/python-env-tools/bin'
             artifactName: 'bin-$(vsceTarget)'
             itemPattern: |

build/azure-pipelines/pipeline.yml

@@ -37,13 +37,13 @@ extends:
         testPlatforms:
           - name: Linux
             nodeVersions:
-              - 18.17.1
+              - 20.18.0
           - name: MacOS
             nodeVersions:
-              - 18.17.1
+              - 20.18.0
           - name: Windows
             nodeVersions:
-              - 18.17.1
+              - 20.18.0
         testSteps:
           - template: /build/azure-pipelines/templates/test-steps.yml@self
             parameters:

build/test-requirements.txt

@@ -31,3 +31,6 @@ django-stubs
 # for coverage
 coverage
 pytest-cov
+
+# for pytest-describe related tests
+pytest-describe

package-lock.json

@@ -2,7 +2,7 @@
     "name": "python",
     "displayName": "Python",
     "description": "Python language support with extension access points for IntelliSense (Pylance), Debugging (Python Debugger), linting, formatting, refactoring, unit tests, and more.",
-    "version": "2024.17.0-dev",
+    "version": "2024.19.0-dev",
     "featureFlags": {
         "usingNewInterpreterStorage": true
     },
@@ -24,7 +24,6 @@
         "quickPickItemTooltip",
         "terminalDataWriteEvent",
         "terminalExecuteCommandEvent",
-        "contribIssueReporter",
         "codeActionAI",
         "notebookReplDocument",
         "notebookVariableProvider"
@@ -592,8 +591,8 @@
                         "native"
                     ],
                     "tags": [
-                        "experimental",
-                        "onExP"
+                        "onExP",
+                        "preview"
                     ],
                     "scope": "machine",
                     "type": "string"
@@ -675,8 +674,8 @@
                     "scope": "resource",
                     "type": "boolean",
                     "tags": [
-                        "experimental",
-                        "onExP"
+                        "onExP",
+                        "preview"
                     ]
                 },
                 "python.REPL.provideVariables": {
@@ -1175,12 +1174,12 @@
             {
                 "command": "python.execInREPLEnter",
                 "key": "enter",
-                "when": "!config.interactiveWindow.executeWithShiftEnter && activeEditor == 'workbench.editor.repl' && !inlineChatFocused"
+                "when": "!config.interactiveWindow.executeWithShiftEnter && activeEditor == 'workbench.editor.repl' && !inlineChatFocused && !notebookCellListFocused"
             },
             {
                 "command": "python.execInInteractiveWindowEnter",
                 "key": "enter",
-                "when": "!config.interactiveWindow.executeWithShiftEnter && activeEditor == 'workbench.editor.interactive' && !inlineChatFocused"
+                "when": "!config.interactiveWindow.executeWithShiftEnter && activeEditor == 'workbench.editor.interactive' && !inlineChatFocused && !notebookCellListFocused"
             },
             {
                 "command": "python.refreshTensorBoard",