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

Clarify some error messages in deployment notebooks and python installation. (#6658)

Browse Source
This commit is contained in:
Cory Rivera
2019-08-08 16:54:14 -07:00
committed by GitHub
parent 7adb8dd74b
commit 1ff9a2ec4c
5 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -29,7 +29,7 @@ const msgPythonUnpackError = localize('msgPythonUnpackError', "Error while unpac
const msgTaskName = localize('msgTaskName', "Installing Notebook dependencies"); const msgTaskName = localize('msgTaskName', "Installing Notebook dependencies");
const msgInstallPkgStart = localize('msgInstallPkgStart', "Installing Notebook dependencies, see Tasks view for more information"); const msgInstallPkgStart = localize('msgInstallPkgStart', "Installing Notebook dependencies, see Tasks view for more information");
const msgInstallPkgFinish = localize('msgInstallPkgFinish', "Notebook dependencies installation is complete"); const msgInstallPkgFinish = localize('msgInstallPkgFinish', "Notebook dependencies installation is complete");
const msgPythonRunningError = localize('msgPythonRunningError', "Cannot overwrite existing Python installation while python is running."); const msgPythonRunningError = localize('msgPythonRunningError', "Cannot overwrite an existing Python installation while python is running. Please close any active notebooks before proceeding.");
const msgPendingInstallError = localize('msgPendingInstallError', "Another Python installation is currently in progress."); const msgPendingInstallError = localize('msgPendingInstallError', "Another Python installation is currently in progress.");
const msgSkipPythonInstall = localize('msgSkipPythonInstall', "Python already exists at the specific location. Skipping install."); const msgSkipPythonInstall = localize('msgSkipPythonInstall', "Python already exists at the specific location. Skipping install.");
function msgDependenciesInstallationFailed(errorMessage: string): string { return localize('msgDependenciesInstallationFailed', "Installing Notebook dependencies failed with error: {0}", errorMessage); } function msgDependenciesInstallationFailed(errorMessage: string): string { return localize('msgDependenciesInstallationFailed', "Installing Notebook dependencies failed with error: {0}", errorMessage); }
@@ -633,4 +633,4 @@ export interface PipPackageOverview {
name: string; name: string;
versions: string[]; versions: string[];
summary: string; summary: string;
} }

4
extensions/resource-deployment/notebooks/bdc/2019/deploy-bdc-aks.ipynb
View File

@@ -65,7 +65,7 @@
"pandas_minor = int(pandas_version[1])\r\n", "pandas_minor = int(pandas_version[1])\r\n",
"pandas_patch = int(pandas_version[2])\r\n", "pandas_patch = int(pandas_version[2])\r\n",
"if not (pandas_major > 0 or (pandas_major == 0 and pandas_minor > 24) or (pandas_major == 0 and pandas_minor == 24 and pandas_patch >= 2)):\r\n", "if not (pandas_major > 0 or (pandas_major == 0 and pandas_minor > 24) or (pandas_major == 0 and pandas_minor == 24 and pandas_patch >= 2)):\r\n",
" sys.exit('Please upgrade the Notebook dependency before you can proceed, you can do it by running the \"Reinstall Notebook dependencies\" command in Azure Data Studio.')\r\n", " sys.exit('Please upgrade the Notebook dependencies before you proceed. You can do so by running \"Reinstall Notebook dependencies\" from the command palette in Azure Data Studio.')\r\n",
"\r\n", "\r\n",
"def run_command():\r\n", "def run_command():\r\n",
" print(\"Executing: \" + cmd)\r\n", " print(\"Executing: \" + cmd)\r\n",
@@ -359,4 +359,4 @@
"execution_count": 14 "execution_count": 14
} }
] ]
} }

4
extensions/resource-deployment/notebooks/bdc/2019/deploy-bdc-existing-aks.ipynb
View File

@@ -67,7 +67,7 @@
"pandas_minor = int(pandas_version[1])\r\n", "pandas_minor = int(pandas_version[1])\r\n",
"pandas_patch = int(pandas_version[2])\r\n", "pandas_patch = int(pandas_version[2])\r\n",
"if not (pandas_major > 0 or (pandas_major == 0 and pandas_minor > 24) or (pandas_major == 0 and pandas_minor == 24 and pandas_patch >= 2)):\r\n", "if not (pandas_major > 0 or (pandas_major == 0 and pandas_minor > 24) or (pandas_major == 0 and pandas_minor == 24 and pandas_patch >= 2)):\r\n",
" sys.exit('Please upgrade the Notebook dependency before you can proceed, you can do it by running the \"Reinstall Notebook dependencies\" command in Azure Data Studio.')\r\n", " sys.exit('Please upgrade the Notebook dependencies before you proceed. You can do so by running \"Reinstall Notebook dependencies\" from the command palette in Azure Data Studio.')\r\n",
"\r\n", "\r\n",
"def run_command():\r\n", "def run_command():\r\n",
" print(\"Executing: \" + cmd)\r\n", " print(\"Executing: \" + cmd)\r\n",
@@ -246,4 +246,4 @@
"execution_count": 10 "execution_count": 10
} }
] ]
} }

4
extensions/resource-deployment/notebooks/docker/2017/deploy-sql2017-image.ipynb
View File

@@ -48,7 +48,7 @@
"pandas_minor = int(pandas_version[1])\r\n", "pandas_minor = int(pandas_version[1])\r\n",
"pandas_patch = int(pandas_version[2])\r\n", "pandas_patch = int(pandas_version[2])\r\n",
"if not (pandas_major > 0 or (pandas_major == 0 and pandas_minor > 24) or (pandas_major == 0 and pandas_minor == 24 and pandas_patch >= 2)):\r\n", "if not (pandas_major > 0 or (pandas_major == 0 and pandas_minor > 24) or (pandas_major == 0 and pandas_minor == 24 and pandas_patch >= 2)):\r\n",
" sys.exit('Please upgrade the Notebook dependency before you can proceed, you can do it by running the \"Reinstall Notebook dependencies\" command in Azure Data Studio.')\r\n", " sys.exit('Please upgrade the Notebook dependencies before you proceed. You can do so by running \"Reinstall Notebook dependencies\" from the command palette in Azure Data Studio.')\r\n",
"\r\n", "\r\n",
"def run_command():\r\n", "def run_command():\r\n",
" print(\"Executing: \" + cmd)\r\n", " print(\"Executing: \" + cmd)\r\n",
@@ -198,4 +198,4 @@
"execution_count": 8 "execution_count": 8
} }
] ]
} }

4
extensions/resource-deployment/notebooks/docker/2019/deploy-sql2019-image.ipynb
View File

@@ -48,7 +48,7 @@
"pandas_minor = int(pandas_version[1])\r\n", "pandas_minor = int(pandas_version[1])\r\n",
"pandas_patch = int(pandas_version[2])\r\n", "pandas_patch = int(pandas_version[2])\r\n",
"if not (pandas_major > 0 or (pandas_major == 0 and pandas_minor > 24) or (pandas_major == 0 and pandas_minor == 24 and pandas_patch >= 2)):\r\n", "if not (pandas_major > 0 or (pandas_major == 0 and pandas_minor > 24) or (pandas_major == 0 and pandas_minor == 24 and pandas_patch >= 2)):\r\n",
" sys.exit('Please upgrade the Notebook dependency before you can proceed, you can do it by running the \"Reinstall Notebook dependencies\" command in Azure Data Studio.')\r\n", " sys.exit('Please upgrade the Notebook dependencies before you proceed. You can do so by running \"Reinstall Notebook dependencies\" from the command palette in Azure Data Studio.')\r\n",
"\r\n", "\r\n",
"def run_command():\r\n", "def run_command():\r\n",
" print(\"Executing: \" + cmd)\r\n", " print(\"Executing: \" + cmd)\r\n",
@@ -198,4 +198,4 @@
"execution_count": 8 "execution_count": 8
} }
] ]
} }