From 1ff9a2ec4c7b88be01666bdd470bbbb4ab95716e Mon Sep 17 00:00:00 2001 From: Cory Rivera Date: Thu, 8 Aug 2019 16:54:14 -0700 Subject: [PATCH] Clarify some error messages in deployment notebooks and python installation. (#6658) --- extensions/notebook/src/jupyter/jupyterServerInstallation.ts | 4 ++-- .../notebooks/bdc/2019/deploy-bdc-aks.ipynb | 4 ++-- .../notebooks/bdc/2019/deploy-bdc-existing-aks.ipynb | 4 ++-- .../notebooks/docker/2017/deploy-sql2017-image.ipynb | 4 ++-- .../notebooks/docker/2019/deploy-sql2019-image.ipynb | 4 ++-- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/extensions/notebook/src/jupyter/jupyterServerInstallation.ts b/extensions/notebook/src/jupyter/jupyterServerInstallation.ts index 39852a40aa..19c19e3982 100644 --- a/extensions/notebook/src/jupyter/jupyterServerInstallation.ts +++ b/extensions/notebook/src/jupyter/jupyterServerInstallation.ts @@ -29,7 +29,7 @@ const msgPythonUnpackError = localize('msgPythonUnpackError', "Error while unpac const msgTaskName = localize('msgTaskName', "Installing Notebook dependencies"); const msgInstallPkgStart = localize('msgInstallPkgStart', "Installing Notebook dependencies, see Tasks view for more information"); 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 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); } @@ -633,4 +633,4 @@ export interface PipPackageOverview { name: string; versions: string[]; summary: string; -} \ No newline at end of file +} diff --git a/extensions/resource-deployment/notebooks/bdc/2019/deploy-bdc-aks.ipynb b/extensions/resource-deployment/notebooks/bdc/2019/deploy-bdc-aks.ipynb index 9930ea0dc4..bb65514aa9 100644 --- a/extensions/resource-deployment/notebooks/bdc/2019/deploy-bdc-aks.ipynb +++ b/extensions/resource-deployment/notebooks/bdc/2019/deploy-bdc-aks.ipynb @@ -65,7 +65,7 @@ "pandas_minor = int(pandas_version[1])\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", - " 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", "def run_command():\r\n", " print(\"Executing: \" + cmd)\r\n", @@ -359,4 +359,4 @@ "execution_count": 14 } ] -} \ No newline at end of file +} diff --git a/extensions/resource-deployment/notebooks/bdc/2019/deploy-bdc-existing-aks.ipynb b/extensions/resource-deployment/notebooks/bdc/2019/deploy-bdc-existing-aks.ipynb index b7e8999e71..fa557335ed 100644 --- a/extensions/resource-deployment/notebooks/bdc/2019/deploy-bdc-existing-aks.ipynb +++ b/extensions/resource-deployment/notebooks/bdc/2019/deploy-bdc-existing-aks.ipynb @@ -67,7 +67,7 @@ "pandas_minor = int(pandas_version[1])\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", - " 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", "def run_command():\r\n", " print(\"Executing: \" + cmd)\r\n", @@ -246,4 +246,4 @@ "execution_count": 10 } ] -} \ No newline at end of file +} diff --git a/extensions/resource-deployment/notebooks/docker/2017/deploy-sql2017-image.ipynb b/extensions/resource-deployment/notebooks/docker/2017/deploy-sql2017-image.ipynb index 5f6245674a..724bde5f21 100644 --- a/extensions/resource-deployment/notebooks/docker/2017/deploy-sql2017-image.ipynb +++ b/extensions/resource-deployment/notebooks/docker/2017/deploy-sql2017-image.ipynb @@ -48,7 +48,7 @@ "pandas_minor = int(pandas_version[1])\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", - " 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", "def run_command():\r\n", " print(\"Executing: \" + cmd)\r\n", @@ -198,4 +198,4 @@ "execution_count": 8 } ] -} \ No newline at end of file +} diff --git a/extensions/resource-deployment/notebooks/docker/2019/deploy-sql2019-image.ipynb b/extensions/resource-deployment/notebooks/docker/2019/deploy-sql2019-image.ipynb index bb419e2af7..15a78390c6 100644 --- a/extensions/resource-deployment/notebooks/docker/2019/deploy-sql2019-image.ipynb +++ b/extensions/resource-deployment/notebooks/docker/2019/deploy-sql2019-image.ipynb @@ -48,7 +48,7 @@ "pandas_minor = int(pandas_version[1])\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", - " 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", "def run_command():\r\n", " print(\"Executing: \" + cmd)\r\n", @@ -198,4 +198,4 @@ "execution_count": 8 } ] -} \ No newline at end of file +}