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

Remove prose from notebooks default package list (#13173)

Browse Source
This commit is contained in:
Chris LaFreniere
2020-11-02 10:54:32 -08:00
committed by GitHub
parent 7559d8463f
commit 04117b2333
4 changed files with 2 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
extensions/notebook/src/integrationTest/notebookIntegration.test.ts
View File

@@ -60,7 +60,7 @@ describe('Notebook Extension Python Installation', function () {
console.log('Uninstalling existing pip dependencies'); console.log('Uninstalling existing pip dependencies');
let install = jupyterController.jupyterInstallation; let install = jupyterController.jupyterInstallation;
let pythonExe = JupyterServerInstallation.getPythonExePath(pythonInstallDir, false); let pythonExe = JupyterServerInstallation.getPythonExePath(pythonInstallDir, false);
let command = `"${pythonExe}" -m pip uninstall -y jupyter pandas sparkmagic prose-codeaccelerator`; let command = `"${pythonExe}" -m pip uninstall -y jupyter pandas sparkmagic`;
await executeStreamedCommand(command, { env: install.execOptions.env }, install.outputChannel); await executeStreamedCommand(command, { env: install.execOptions.env }, install.outputChannel);
console.log('Uninstalling existing pip dependencies is done'); console.log('Uninstalling existing pip dependencies is done');

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

@@ -120,9 +120,6 @@ export class JupyterServerInstallation implements IJupyterServerInstallation {
}, { }, {
name: 'pandas', name: 'pandas',
version: '0.24.2' version: '0.24.2'
}, {
name: 'prose-codeaccelerator',
version: '1.3.0'
}]; }];
this._requiredKernelPackages.set(constants.pysparkDisplayName, sparkPackages); this._requiredKernelPackages.set(constants.pysparkDisplayName, sparkPackages);
this._requiredKernelPackages.set(constants.sparkScalaDisplayName, sparkPackages); this._requiredKernelPackages.set(constants.sparkScalaDisplayName, sparkPackages);
@@ -526,7 +523,7 @@ export class JupyterServerInstallation implements IJupyterServerInstallation {
let versionSpecifier = useMinVersion ? '>=' : '=='; let versionSpecifier = useMinVersion ? '>=' : '==';
let packagesStr = packages.map(pkg => `"${pkg.name}${versionSpecifier}${pkg.version}"`).join(' '); let packagesStr = packages.map(pkg => `"${pkg.name}${versionSpecifier}${pkg.version}"`).join(' ');
let cmd = `"${this.pythonExecutable}" -m pip install --user ${packagesStr} --extra-index-url https://prose-python-packages.azurewebsites.net`; let cmd = `"${this.pythonExecutable}" -m pip install --user ${packagesStr}`;
return this.executeStreamedCommand(cmd); return this.executeStreamedCommand(cmd);
} }

10
extensions/notebook/src/jupyter/serverInstance.ts
View File

@@ -339,16 +339,6 @@ export class PerFolderServerInstance implements IServerInstance {
// Note: Get env from the install since it gets used elsewhere // Note: Get env from the install since it gets used elsewhere
let env = this.getEnvWithConfigPaths(install.execOptions.env); let env = this.getEnvWithConfigPaths(install.execOptions.env);
// 'MSHOST_TELEMETRY_ENABLED' and 'MSHOST_ENVIRONMENT' environment variables are set
// for telemetry purposes used by PROSE in the process where the Jupyter kernel runs
if (vscode.workspace.getConfiguration('telemetry').get<boolean>('enableTelemetry', true)) {
env['MSHOST_TELEMETRY_ENABLED'] = true;
} else {
env['MSHOST_TELEMETRY_ENABLED'] = false;
}
env['MSHOST_ENVIRONMENT'] = 'ADSClient-' + vscode.version;
// Start the notebook process // Start the notebook process
let options: SpawnOptions = { let options: SpawnOptions = {
shell: true, shell: true,

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

@@ -246,9 +246,6 @@ describe('Jupyter Server Installation', function () {
}, { }, {
name: 'pandas', name: 'pandas',
version: '0.24.2' version: '0.24.2'
}, {
name: 'prose-codeaccelerator',
version: '1.3.0'
}]; }];
let packages = installation.getRequiredPackagesForKernel(pysparkDisplayName); let packages = installation.getRequiredPackagesForKernel(pysparkDisplayName);
should(packages).be.deepEqual(expectedPackages, "Unexpected packages for PySpark kernel."); should(packages).be.deepEqual(expectedPackages, "Unexpected packages for PySpark kernel.");