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

Reinstall pip during python install on Windows to update shebangs in exe files. (#6494)

Browse Source
This commit is contained in:
Cory Rivera
2019-07-25 11:07:22 -07:00
committed by GitHub
parent b2b2840990
commit 08b678b522
1 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -425,17 +425,19 @@ export class JupyterServerInstallation {
} }
private async installOfflinePipDependencies(): Promise<void> { private async installOfflinePipDependencies(): Promise<void> {
let installJupyterCommand: string; // Skip this step if using existing python, since this is for our provided package
if (process.platform === constants.winPlatform) { if (!this._usingExistingPython && process.platform === constants.winPlatform) {
let cmdOptions = this._usingExistingPython ? '--user' : '';
let requirements = path.join(this._pythonPackageDir, 'requirements.txt');
installJupyterCommand = `"${this._pythonExecutable}" -m pip install ${cmdOptions} --no-index -r "${requirements}" --find-links "${this._pythonPackageDir}" --no-warn-script-location`;
}
if (installJupyterCommand) {
this.outputChannel.show(true); this.outputChannel.show(true);
this.outputChannel.appendLine(localize('msgInstallStart', "Installing required packages to run Notebooks...")); this.outputChannel.appendLine(localize('msgInstallStart', "Installing required packages to run Notebooks..."));
let requirements = path.join(this._pythonPackageDir, 'requirements.txt');
let installJupyterCommand = `"${this._pythonExecutable}" -m pip install --no-index -r "${requirements}" --find-links "${this._pythonPackageDir}" --no-warn-script-location`;
await this.executeStreamedCommand(installJupyterCommand); await this.executeStreamedCommand(installJupyterCommand);
// Force reinstall pip to update shebangs in pip*.exe files
installJupyterCommand = `"${this._pythonExecutable}" -m pip install --force-reinstall --no-index pip --find-links "${this._pythonPackageDir}" --no-warn-script-location`;
await this.executeStreamedCommand(installJupyterCommand);
this.outputChannel.appendLine(localize('msgJupyterInstallDone', "... Jupyter installation complete.")); this.outputChannel.appendLine(localize('msgJupyterInstallDone', "... Jupyter installation complete."));
} else { } else {
return Promise.resolve(); return Promise.resolve();