ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-02-17 02:51:36 -05:00
Code Issues Packages Projects Releases Wiki Activity

Only conda install pykerberos on non-windows platforms. (#8544)

Browse Source
This commit is contained in:
Cory Rivera
2019-12-03 16:40:11 -08:00
committed by GitHub
parent b38b53b658
commit 255ea1945b
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -83,10 +83,8 @@ export class JupyterServerInstallation {
]; ];
private readonly _expectedPythonPackages = this._commonPackages.concat(this._commonPipPackages); private readonly _expectedPythonPackages = this._commonPackages.concat(this._commonPipPackages);
private readonly _expectedCondaPackages = this._commonPackages.concat([{ name: 'pykerberos', version: '1.2.1' }]);
private readonly _expectedCondaPipPackages = this._commonPipPackages; private readonly _expectedCondaPipPackages = this._commonPipPackages;
private readonly _expectedCondaPackages: PythonPkgDetails[];
constructor(extensionPath: string, outputChannel: OutputChannel, apiWrapper: ApiWrapper, pythonInstallationPath?: string) { constructor(extensionPath: string, outputChannel: OutputChannel, apiWrapper: ApiWrapper, pythonInstallationPath?: string) {
this.extensionPath = extensionPath; this.extensionPath = extensionPath;
@@ -98,6 +96,12 @@ export class JupyterServerInstallation {
this._usingExistingPython = JupyterServerInstallation.getExistingPythonSetting(this.apiWrapper); this._usingExistingPython = JupyterServerInstallation.getExistingPythonSetting(this.apiWrapper);
this._prompter = new CodeAdapter(); this._prompter = new CodeAdapter();
if (process.platform !== constants.winPlatform) {
this._expectedCondaPackages = this._commonPackages.concat([{ name: 'pykerberos', version: '1.2.1' }]);
} else {
this._expectedCondaPackages = this._commonPackages;
}
} }
private async installDependencies(backgroundOperation: azdata.BackgroundOperation, forceInstall: boolean): Promise<void> { private async installDependencies(backgroundOperation: azdata.BackgroundOperation, forceInstall: boolean): Promise<void> {