Cherry pick from main (#14644)

* Update shipped wheels version (#14615) * Update shipped wheels version * News item * Remove redundant files (#14620) * Add extension dependencies at build time (#14636) * Use Node 12.15 in Insiders and Release GitHub Actions (#14641) * Use Node 12.15 on all Insiders and Release GitHub Actions jobs (#14642) Co-authored-by: Joyce Er <joyceerhuiling@gmail.com>
microsoft · Nov 6, 2020 · 2c2b7e1 · 2c2b7e1
1 parent 1b41519
commit 2c2b7e1
Show file tree

Hide file tree

Showing 14 changed files with 60 additions and 175 deletions.
diff --git a/.github/actions/build-vsix/action.yml b/.github/actions/build-vsix/action.yml
@@ -30,5 +30,8 @@ runs:
     - run: npm run updateBuildNumber -- --buildNumber $GITHUB_RUN_ID
       shell: bash
 
+    - run: npm run addExtensionDependencies
+      shell: bash
+
     - run: npm run package
       shell: bash
diff --git a/.github/workflows/insiders.yml b/.github/workflows/insiders.yml
@@ -6,6 +6,7 @@ on:
       - main
 
 env:
+  NODE_VERSION: 12.15.0
   PYTHON_VERSION: 3.9
   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.
   # Key for the cache created at the end of the the 'Cache ./pythonFiles/lib/python' step.
@@ -25,6 +26,11 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v2
 
+      - name: Use Node ${{env.NODE_VERSION}}
+        uses: actions/setup-node@v2.1.2
+        with:
+          node-version: ${{env.NODE_VERSION}}
+
       - name: Use Python ${{env.PYTHON_VERSION}}
         uses: actions/setup-python@v2
         with:
@@ -55,6 +61,11 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v2
 
+      - name: Use Node ${{env.NODE_VERSION}}
+        uses: actions/setup-node@v2.1.2
+        with:
+          node-version: ${{env.NODE_VERSION}}
+
       - name: Install dependencies (npm ci)
         run: npm ci --prefer-offline
 
@@ -118,6 +129,11 @@ jobs:
         with:
           path: ${{env.special-working-directory-relative}}
 
+      - name: Use Node ${{env.NODE_VERSION}}
+        uses: actions/setup-node@v2.1.2
+        with:
+          node-version: ${{env.NODE_VERSION}}
+
       - name: Install dependencies (npm ci)
         run: npm ci
 
@@ -319,6 +335,11 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v2
 
+      - name: Use Node ${{env.NODE_VERSION}}
+        uses: actions/setup-node@v2.1.2
+        with:
+          node-version: ${{env.NODE_VERSION}}
+
       - name: Use Python ${{matrix.python}}
         uses: actions/setup-python@v2
         with:
@@ -390,6 +411,11 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v2
 
+      - name: Use Node ${{env.NODE_VERSION}}
+        uses: actions/setup-node@v2.1.2
+        with:
+          node-version: ${{env.NODE_VERSION}}
+
       - name: Use Python ${{matrix.python}}
         uses: actions/setup-python@v2
         with:

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -9,6 +9,7 @@ on:
 
 env:
   PYTHON_VERSION: 3.8
+  NODE_VERSION: 12.15.0
   MOCHA_REPORTER_JUNIT: false # 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 hasn't already.
   # Key for the cache created at the end of the the 'Cache ./pythonFiles/lib/python' step.
   CACHE_PYTHONFILES: cache-pvsc-pythonFiles
@@ -27,6 +28,11 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v2
 
+      - name: Use Node ${{env.NODE_VERSION}}
+        uses: actions/setup-node@v2.1.2
+        with:
+          node-version: ${{env.NODE_VERSION}}
+
       - name: Use Python ${{env.PYTHON_VERSION}}
         uses: actions/setup-python@v2
         with:
@@ -59,6 +65,11 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v2
 
+      - name: Use Node ${{env.NODE_VERSION}}
+        uses: actions/setup-node@v2.1.2
+        with:
+          node-version: ${{env.NODE_VERSION}}
+
       - name: Install dependencies (npm ci)
         run: npm ci --prefer-offline
 
@@ -105,6 +116,11 @@ jobs:
         with:
           path: ${{env.special-working-directory-relative}}
 
+      - name: Use Node ${{env.NODE_VERSION}}
+        uses: actions/setup-node@v2.1.2
+        with:
+          node-version: ${{env.NODE_VERSION}}
+
       - name: Install dependencies (npm ci)
         run: npm ci
 
@@ -296,6 +312,11 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v2
 
+      - name: Use Node ${{env.NODE_VERSION}}
+        uses: actions/setup-node@v2.1.2
+        with:
+          node-version: ${{env.NODE_VERSION}}
+
       - name: Use Python ${{matrix.python}}
         uses: actions/setup-python@v2
         with:
@@ -367,6 +388,11 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v2
 
+      - name: Use Node ${{env.NODE_VERSION}}
+        uses: actions/setup-node@v2.1.2
+        with:
+          node-version: ${{env.NODE_VERSION}}
+
       - name: Use Python ${{matrix.python}}
         uses: actions/setup-python@v2
         with:

diff --git a/news/1 Enhancements/14614.md b/news/1 Enhancements/14614.md
@@ -0,0 +1 @@
+Update shipped debugger wheels to python 3.8.
diff --git a/pythonFiles/install_debugpy.py b/pythonFiles/install_debugpy.py
@@ -9,7 +9,7 @@
 EXTENSION_ROOT = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
 DEBUGGER_DEST = os.path.join(EXTENSION_ROOT, "pythonFiles", "lib", "python")
 DEBUGGER_PACKAGE = "debugpy"
-DEBUGGER_PYTHON_VERSIONS = ("cp37",)
+DEBUGGER_PYTHON_VERSIONS = ("cp38",)
 
 
 def _contains(s, parts=()):

diff --git a/src/client/activation/languageClientMiddleware.ts b/src/client/activation/languageClientMiddleware.ts
@@ -39,8 +39,8 @@ import { IFileSystem } from '../common/platform/types';
 import { IConfigurationService, IDisposableRegistry, IExperimentsManager, IExtensions } from '../common/types';
 import { isThenable } from '../common/utils/async';
 import { StopWatch } from '../common/utils/stopWatch';
-import { NotebookMiddlewareAddon } from '../datascience/languageserver/notebookMiddlewareAddon';
 import { IServiceContainer } from '../ioc/types';
+import { NotebookMiddlewareAddon } from '../jupyter/languageserver/notebookMiddlewareAddon';
 import { sendTelemetryEvent } from '../telemetry';
 import { EventName } from '../telemetry/constants';
 import { LanguageServerType } from './types';

diff --git a/src/client/api.ts b/src/client/api.ts
@@ -8,11 +8,11 @@ import { Event, Uri } from 'vscode';
 import { isTestExecution } from './common/constants';
 import { traceError } from './common/logger';
 import { IConfigurationService, Resource } from './common/types';
-import { IDataViewerDataProvider, IJupyterUriProvider } from './datascience/types';
 import { getDebugpyLauncherArgs, getDebugpyPackagePath } from './debugger/extension/adapter/remoteLaunchers';
 import { IInterpreterService } from './interpreter/contracts';
 import { IServiceContainer, IServiceManager } from './ioc/types';
 import { JupyterExtensionIntegration } from './jupyter/jupyterIntegration';
+import { IDataViewerDataProvider, IJupyterUriProvider } from './jupyter/types';
 
 /*
  * Do not introduce any breaking changes to this API.

diff --git a/src/client/datascience/api/jupyterIntegration.ts b/src/client/datascience/api/jupyterIntegration.ts
diff --git a/src/client/jupyter/jupyterIntegration.ts b/src/client/jupyter/jupyterIntegration.ts
@@ -22,14 +22,14 @@ import {
     Resource
 } from '../common/types';
 import { isResource } from '../common/utils/misc';
-import { IDataViewerDataProvider, IJupyterUriProvider } from '../datascience/types';
 import { getDebugpyPackagePath } from '../debugger/extension/adapter/remoteLaunchers';
 import { IEnvironmentActivationService } from '../interpreter/activation/types';
 import { IInterpreterQuickPickItem, IInterpreterSelector } from '../interpreter/configuration/types';
 import { IInterpreterService } from '../interpreter/contracts';
 import { IWindowsStoreInterpreter } from '../interpreter/locators/types';
 import { WindowsStoreInterpreter } from '../pythonEnvironments/discovery/locators/services/windowsStoreInterpreter';
 import { PythonEnvironment } from '../pythonEnvironments/info';
+import { IDataViewerDataProvider, IJupyterUriProvider } from './types';
 
 export interface ILanguageServer extends Disposable {
     readonly connection: ILanguageServerConnection;

diff --git a/.../languageserver/notebookConcatDocument.ts → .../languageserver/notebookConcatDocument.ts b/.../languageserver/notebookConcatDocument.ts → .../languageserver/notebookConcatDocument.ts
diff --git a/...ience/languageserver/notebookConverter.ts → ...pyter/languageserver/notebookConverter.ts b/...ience/languageserver/notebookConverter.ts → ...pyter/languageserver/notebookConverter.ts
diff --git a/...languageserver/notebookMiddlewareAddon.ts → ...languageserver/notebookMiddlewareAddon.ts b/...languageserver/notebookMiddlewareAddon.ts → ...languageserver/notebookMiddlewareAddon.ts
diff --git a/src/client/datascience/types.ts → src/client/jupyter/types.ts b/src/client/datascience/types.ts → src/client/jupyter/types.ts
diff --git a/src/test/datascience/mockJupyterExtensionIntegration.ts b/src/test/datascience/mockJupyterExtensionIntegration.ts