ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-02-16 18:46:40 -05:00
Code Issues Packages Projects Releases Wiki Activity

Require jupyter notebook >= 6.5.6 (#24466)

Browse Source 
* Require jupyter notebook >= 6.5.6

* remove traitlets & pin version
This commit is contained in:
Charles Gagnon
2023-09-19 11:17:08 -07:00
committed by GitHub
parent ebc7ef5a43
commit b0ff2ef08e
2 changed files with 9 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
extensions/notebook/src/jupyter/jupyterServerInstallation.ts
View File

@@ -83,10 +83,10 @@ export const requiredJupyterPkg: PythonPkgDetails = {
version: '1.0.0' version: '1.0.0'
}; };
// https://github.com/microsoft/azuredatastudio/issues/23945 // Require notebook 6.5.6 for https://github.com/jupyter/notebook/issues/7048
export const requiredNotebookPkg: PythonPkgDetails = { export const requiredNotebookPkg: PythonPkgDetails = {
name: 'notebook', name: 'notebook',
version: '6.5.5', version: '6.5.6',
installExactVersion: true installExactVersion: true
}; };
@@ -97,13 +97,6 @@ export const requiredIpykernelPkg: PythonPkgDetails = {
installExactVersion: true installExactVersion: true
}; };
// https://github.com/microsoft/azuredatastudio/issues/24443
export const requiredTraitletsPkg: PythonPkgDetails = {
name: 'traitlets',
version: '5.9.0',
installExactVersion: true
};
export const requiredPowershellPkg: PythonPkgDetails = { export const requiredPowershellPkg: PythonPkgDetails = {
name: 'powershell-kernel', name: 'powershell-kernel',
version: '0.1.4' version: '0.1.4'
@@ -164,11 +157,11 @@ export class JupyterServerInstallation implements IJupyterServerInstallation {
this._kernelSetupCache = new Map<string, boolean>(); this._kernelSetupCache = new Map<string, boolean>();
this._requiredKernelPackages = new Map<string, PythonPkgDetails[]>(); this._requiredKernelPackages = new Map<string, PythonPkgDetails[]>();
this._requiredKernelPackages.set(constants.ipykernelDisplayName, [requiredJupyterPkg, requiredNotebookPkg, requiredIpykernelPkg, requiredTraitletsPkg]); this._requiredKernelPackages.set(constants.ipykernelDisplayName, [requiredJupyterPkg, requiredNotebookPkg, requiredIpykernelPkg]);
this._requiredKernelPackages.set(constants.python3DisplayName, [requiredJupyterPkg, requiredNotebookPkg, requiredIpykernelPkg, requiredTraitletsPkg]); this._requiredKernelPackages.set(constants.python3DisplayName, [requiredJupyterPkg, requiredNotebookPkg, requiredIpykernelPkg]);
this._requiredKernelPackages.set(constants.powershellDisplayName, [requiredJupyterPkg, requiredPowershellPkg, requiredNotebookPkg, requiredIpykernelPkg, requiredTraitletsPkg]); this._requiredKernelPackages.set(constants.powershellDisplayName, [requiredJupyterPkg, requiredPowershellPkg, requiredNotebookPkg, requiredIpykernelPkg]);
let allPackages = [requiredJupyterPkg, requiredNotebookPkg, requiredIpykernelPkg, requiredTraitletsPkg, requiredPowershellPkg]; let allPackages = [requiredJupyterPkg, requiredNotebookPkg, requiredIpykernelPkg, requiredPowershellPkg];
this._requiredKernelPackages.set(constants.allKernelsName, allPackages); this._requiredKernelPackages.set(constants.allKernelsName, allPackages);
this._requiredPackagesSet = new Set<string>(); this._requiredPackagesSet = new Set<string>();

6
extensions/notebook/src/test/python/jupyterInstallation.test.ts
View File

@@ -11,7 +11,7 @@ import * as uuid from 'uuid';
import * as fs from 'fs-extra'; import * as fs from 'fs-extra';
import * as request from 'request'; import * as request from 'request';
import * as utils from '../../common/utils'; import * as utils from '../../common/utils';
import { requiredJupyterPkg, JupyterServerInstallation, requiredPowershellPkg, PythonInstallSettings, PythonPkgDetails, requiredNotebookPkg, requiredIpykernelPkg, requiredTraitletsPkg } from '../../jupyter/jupyterServerInstallation'; import { requiredJupyterPkg, JupyterServerInstallation, requiredPowershellPkg, PythonInstallSettings, PythonPkgDetails, requiredNotebookPkg, requiredIpykernelPkg } from '../../jupyter/jupyterServerInstallation';
import { powershellDisplayName, python3DisplayName, winPlatform } from '../../common/constants'; import { powershellDisplayName, python3DisplayName, winPlatform } from '../../common/constants';
describe('Jupyter Server Installation', function () { describe('Jupyter Server Installation', function () {
@@ -226,12 +226,12 @@ describe('Jupyter Server Installation', function () {
it('Get required packages test - Python 3 kernel', async function () { it('Get required packages test - Python 3 kernel', async function () {
let packages = installation.getRequiredPackagesForKernel(python3DisplayName); let packages = installation.getRequiredPackagesForKernel(python3DisplayName);
should(packages).be.deepEqual([requiredJupyterPkg, requiredNotebookPkg, requiredIpykernelPkg, requiredTraitletsPkg]); should(packages).be.deepEqual([requiredJupyterPkg, requiredNotebookPkg, requiredIpykernelPkg]);
}); });
it('Get required packages test - Powershell kernel', async function () { it('Get required packages test - Powershell kernel', async function () {
let packages = installation.getRequiredPackagesForKernel(powershellDisplayName); let packages = installation.getRequiredPackagesForKernel(powershellDisplayName);
should(packages).be.deepEqual([requiredJupyterPkg, requiredPowershellPkg, requiredNotebookPkg, requiredIpykernelPkg, requiredTraitletsPkg]); should(packages).be.deepEqual([requiredJupyterPkg, requiredPowershellPkg, requiredNotebookPkg, requiredIpykernelPkg]);
}); });
it('Install python test - Run install while Python is already running', async function () { it('Install python test - Run install while Python is already running', async function () {