Merge pull request #163 from sol-eng/patch-python-root-warning

Switch to an env variable to ignore root warning
sol-eng · May 11, 2023 · 55d7453 · 55d7453
2 parents 454ab46 + 4c97b42
commit 55d7453
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/internal/jupyter/install.go b/internal/jupyter/install.go
@@ -24,7 +24,7 @@ func InstallJupyter(pythonPath string) error {
 
 // Install various Jupyter related packages from PyPI
 func InstallJupyterAndComponents(pythonPath string) error {
-	licenseCommand := pythonPath + " -m pip install --no-warn-script-location --disable-pip-version-check --root-user-action=ignore jupyter jupyterlab rsp_jupyter rsconnect_jupyter workbench_jupyterlab"
+	licenseCommand := "PIP_ROOT_USER_ACTION=ignore " + pythonPath + " -m pip install --no-warn-script-location --disable-pip-version-check jupyter jupyterlab rsp_jupyter rsconnect_jupyter workbench_jupyterlab"
 	err := system.RunCommand(licenseCommand, true, 2)
 	if err != nil {
 		return fmt.Errorf("issue installing Jupyter with the command '%s': %w", licenseCommand, err)
@@ -111,7 +111,7 @@ func installIpykernel(pythonPath string) error {
 		return fmt.Errorf("issue removing python from the path: %w", err)
 	}
 
-	installCommand := basePath + "/pip install --no-warn-script-location --disable-pip-version-check --root-user-action=ignore ipykernel"
+	installCommand := "PIP_ROOT_USER_ACTION=ignore " + basePath + "/pip install --no-warn-script-location --disable-pip-version-check ipykernel"
 	err = system.RunCommand(installCommand, true, 1)
 	if err != nil {
 		return fmt.Errorf("issue installing ipykernel with the command '%s': %w", installCommand, err)

diff --git a/internal/languages/python.go b/internal/languages/python.go
@@ -426,7 +426,7 @@ func DownloadAndInstallPython(pythonVersion string, osType config.OperatingSyste
 }
 
 func UpgradePythonTools(pythonVersion string) error {
-	upgradeCommand := "/opt/python/" + pythonVersion + "/bin/pip install --upgrade --no-warn-script-location --disable-pip-version-check --root-user-action=ignore pip setuptools wheel"
+	upgradeCommand := "PIP_ROOT_USER_ACTION=ignore /opt/python/" + pythonVersion + "/bin/pip install --upgrade --no-warn-script-location --disable-pip-version-check pip setuptools wheel"
 	err := system.RunCommand(upgradeCommand, true, 2)
 	if err != nil {
 		return fmt.Errorf("issue upgrading pip, setuptools and wheel for Python with the command '%s': %w", upgradeCommand, err)