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

Fix python install issues caused by other preexisting Python versions. (#6294)

Browse Source 
* Remove --user option when doing pip installs for our standalone Python version.

* Use force-reinstall option when installing sparkmagic since we use a custom version.

* Use force-reinstall when installing pip packages from Manage Packages dialog so that dependencies don't get split across multiple locations.

* Update PATH after install to include additional package directories.
This commit is contained in:
Cory Rivera
2019-07-09 17:05:00 -07:00
committed by GitHub
parent 7216560c1a
commit 5bf62978eb
1 changed files with 17 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -256,7 +256,8 @@ export class JupyterServerInstallation {
} }
} }
if (this._usingExistingPython) { let isPythonInstalled = await JupyterServerInstallation.isPythonInstalled(this.apiWrapper);
if (isPythonInstalled) {
let pythonUserDir = await this.getPythonUserDir(this._pythonExecutable); let pythonUserDir = await this.getPythonUserDir(this._pythonExecutable);
if (pythonUserDir) { if (pythonUserDir) {
this.pythonEnvVarPath = pythonUserDir + delimiter + this.pythonEnvVarPath; this.pythonEnvVarPath = pythonUserDir + delimiter + this.pythonEnvVarPath;
@@ -309,6 +310,7 @@ export class JupyterServerInstallation {
let notebookConfig = this.apiWrapper.getConfiguration(constants.notebookConfigKey); let notebookConfig = this.apiWrapper.getConfiguration(constants.notebookConfigKey);
await notebookConfig.update(constants.pythonPathConfigKey, this._pythonInstallationPath, ConfigurationTarget.Global); await notebookConfig.update(constants.pythonPathConfigKey, this._pythonInstallationPath, ConfigurationTarget.Global);
await notebookConfig.update(constants.existingPythonConfigKey, this._usingExistingPython, ConfigurationTarget.Global); await notebookConfig.update(constants.existingPythonConfigKey, this._usingExistingPython, ConfigurationTarget.Global);
await this.configurePackagePaths();
}; };
let installReady = new Deferred<void>(); let installReady = new Deferred<void>();
if (!fs.existsSync(this._pythonExecutable) || this._forceInstall || this._usingExistingPython) { if (!fs.existsSync(this._pythonExecutable) || this._forceInstall || this._usingExistingPython) {
@@ -364,7 +366,9 @@ export class JupyterServerInstallation {
} }
public installPipPackage(packageName: string, version: string): Promise<void> { public installPipPackage(packageName: string, version: string): Promise<void> {
let cmd = `"${this.pythonExecutable}" -m pip install --user ${packageName}==${version}`; // Force reinstall in case some dependencies are split across multiple locations
let cmdOptions = this._usingExistingPython ? '--user --force-reinstall' : '--force-reinstall';
let cmd = `"${this.pythonExecutable}" -m pip install ${cmdOptions} ${packageName}==${version}`;
return this.executeStreamedCommand(cmd); return this.executeStreamedCommand(cmd);
} }
@@ -406,8 +410,9 @@ export class JupyterServerInstallation {
private async installOfflinePipDependencies(): Promise<void> { private async installOfflinePipDependencies(): Promise<void> {
let installJupyterCommand: string; let installJupyterCommand: string;
if (process.platform === constants.winPlatform) { if (process.platform === constants.winPlatform) {
let cmdOptions = this._usingExistingPython ? '--user' : '';
let requirements = path.join(this._pythonPackageDir, 'requirements.txt'); let requirements = path.join(this._pythonPackageDir, 'requirements.txt');
installJupyterCommand = `"${this._pythonExecutable}" -m pip install --user --no-index -r "${requirements}" --find-links "${this._pythonPackageDir}" --no-warn-script-location`; installJupyterCommand = `"${this._pythonExecutable}" -m pip install ${cmdOptions} --no-index -r "${requirements}" --find-links "${this._pythonPackageDir}" --no-warn-script-location`;
} }
if (installJupyterCommand) { if (installJupyterCommand) {
@@ -423,11 +428,13 @@ export class JupyterServerInstallation {
private async installSparkMagic(doOnlineInstall: boolean): Promise<void> { private async installSparkMagic(doOnlineInstall: boolean): Promise<void> {
let installSparkMagic: string; let installSparkMagic: string;
if (process.platform === constants.winPlatform || this._usingExistingPython) { if (process.platform === constants.winPlatform || this._usingExistingPython) {
// Overwrite existing install of sparkmagic, since we use a custom version
let cmdOptions = this._usingExistingPython ? '--user --force-reinstall' : '--force-reinstall';
let sparkWheel = path.join(this._pythonPackageDir, `sparkmagic-${constants.sparkMagicVersion}-py3-none-any.whl`); let sparkWheel = path.join(this._pythonPackageDir, `sparkmagic-${constants.sparkMagicVersion}-py3-none-any.whl`);
if (doOnlineInstall) { if (doOnlineInstall) {
installSparkMagic = `"${this._pythonExecutable}" -m pip install --user "${sparkWheel}" --no-warn-script-location`; installSparkMagic = `"${this._pythonExecutable}" -m pip install ${cmdOptions} "${sparkWheel}" --no-warn-script-location`;
} else { } else {
installSparkMagic = `"${this._pythonExecutable}" -m pip install --user --no-index "${sparkWheel}" --find-links "${this._pythonPackageDir}" --no-warn-script-location`; installSparkMagic = `"${this._pythonExecutable}" -m pip install ${cmdOptions} --no-index "${sparkWheel}" --find-links "${this._pythonPackageDir}" --no-warn-script-location`;
} }
} }
@@ -442,10 +449,11 @@ export class JupyterServerInstallation {
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 installCommand = `"${this._pythonExecutable}" -m pip install --user jupyter==1.0.0 pandas==0.24.2`; let cmdOptions = this._usingExistingPython ? '--user' : '';
let installCommand = `"${this._pythonExecutable}" -m pip install ${cmdOptions} jupyter==1.0.0 pandas==0.24.2`;
await this.executeStreamedCommand(installCommand); await this.executeStreamedCommand(installCommand);
installCommand = `"${this._pythonExecutable}" -m pip install --user prose-codeaccelerator==1.3.0 --extra-index-url https://prose-python-packages.azurewebsites.net`; installCommand = `"${this._pythonExecutable}" -m pip install ${cmdOptions} prose-codeaccelerator==1.3.0 --extra-index-url https://prose-python-packages.azurewebsites.net`;
await this.executeStreamedCommand(installCommand); await this.executeStreamedCommand(installCommand);
this.outputChannel.appendLine(localize('msgJupyterInstallDone', "... Jupyter installation complete.")); this.outputChannel.appendLine(localize('msgJupyterInstallDone', "... Jupyter installation complete."));
@@ -461,7 +469,8 @@ export class JupyterServerInstallation {
} }
await this.executeStreamedCommand(installCommand); await this.executeStreamedCommand(installCommand);
installCommand = `"${this._pythonExecutable}" -m pip install --user prose-codeaccelerator==1.3.0 --extra-index-url https://prose-python-packages.azurewebsites.net`; let cmdOptions = this._usingExistingPython ? '--user' : '';
installCommand = `"${this._pythonExecutable}" -m pip install ${cmdOptions} prose-codeaccelerator==1.3.0 --extra-index-url https://prose-python-packages.azurewebsites.net`;
await this.executeStreamedCommand(installCommand); await this.executeStreamedCommand(installCommand);
this.outputChannel.appendLine(localize('msgJupyterInstallDone', "... Jupyter installation complete.")); this.outputChannel.appendLine(localize('msgJupyterInstallDone', "... Jupyter installation complete."));