steve/databricks-cli
steve
/
databricks-cli
mirror of https://github.com/databricks/cli.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add upgrade and upgrade eager flags to pip install call (#1636) 

## Changes
Add upgrade and upgrade eager flags to pip install call for Databricks
labs projects. See [this
documentation](https://pip.pypa.io/en/stable/cli/pip_install/#cmdoption-U)
for more information about the flags.

Resolves #1634

## Tests
- [x] Manually
This commit is contained in:
Cor 2024-07-31 11:35:06 +02:00 committed by GitHub
parent ecba875fe5
commit 5afcc25d27
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cmd/labs/project/installer.go
View File

@ -272,8 +272,10 @@ func (i *installer) installPythonDependencies(ctx context.Context, spec string)
// - python3 -m ensurepip --default-pip // - python3 -m ensurepip --default-pip
// - curl -o https://bootstrap.pypa.io/get-pip.py | python3 // - curl -o https://bootstrap.pypa.io/get-pip.py | python3
var buf bytes.Buffer var buf bytes.Buffer
// Ensure latest version(s) is installed with the `--upgrade` and `--upgrade-strategy eager` flags
// https://pip.pypa.io/en/stable/cli/pip_install/#cmdoption-U
_, err := process.Background(ctx, _, err := process.Background(ctx,
[]string{i.virtualEnvPython(ctx), "-m", "pip", "install", spec}, []string{i.virtualEnvPython(ctx), "-m", "pip", "install", "--upgrade", "--upgrade-strategy", "eager", spec},
process.WithCombinedOutput(&buf), process.WithCombinedOutput(&buf),
process.WithDir(libDir)) process.WithDir(libDir))
if err != nil { if err != nil {

8
cmd/labs/project/installer_test.go
View File

@ -199,7 +199,7 @@ func TestInstallerWorksForReleases(t *testing.T) {
stub.WithStdoutFor(`python[\S]+ --version`, "Python 3.10.5") stub.WithStdoutFor(`python[\S]+ --version`, "Python 3.10.5")
// on Unix, we call `python3`, but on Windows it is `python.exe` // on Unix, we call `python3`, but on Windows it is `python.exe`
stub.WithStderrFor(`python[\S]+ -m venv .*/.databricks/labs/blueprint/state/venv`, "[mock venv create]") stub.WithStderrFor(`python[\S]+ -m venv .*/.databricks/labs/blueprint/state/venv`, "[mock venv create]")
stub.WithStderrFor(`python[\S]+ -m pip install .`, "[mock pip install]") stub.WithStderrFor(`python[\S]+ -m pip install --upgrade --upgrade-strategy eager .`, "[mock pip install]")
stub.WithStdoutFor(`python[\S]+ install.py`, "setting up important infrastructure") stub.WithStdoutFor(`python[\S]+ install.py`, "setting up important infrastructure")
// simulate the case of GitHub Actions // simulate the case of GitHub Actions
@ -406,7 +406,7 @@ func TestUpgraderWorksForReleases(t *testing.T) {
// Install stubs for the python calls we need to ensure were run in the // Install stubs for the python calls we need to ensure were run in the
// upgrade process. // upgrade process.
ctx, stub := process.WithStub(ctx) ctx, stub := process.WithStub(ctx)
stub.WithStderrFor(`python[\S]+ -m pip install .`, "[mock pip install]") stub.WithStderrFor(`python[\S]+ -m pip install --upgrade --upgrade-strategy eager .`, "[mock pip install]")
stub.WithStdoutFor(`python[\S]+ install.py`, "setting up important infrastructure") stub.WithStdoutFor(`python[\S]+ install.py`, "setting up important infrastructure")
py, _ := python.DetectExecutable(ctx) py, _ := python.DetectExecutable(ctx)
@ -430,13 +430,13 @@ func TestUpgraderWorksForReleases(t *testing.T) {
// Check if the stub was called with the 'python -m pip install' command // Check if the stub was called with the 'python -m pip install' command
pi := false pi := false
for _, call := range stub.Commands() { for _, call := range stub.Commands() {
if strings.HasSuffix(call, "-m pip install .") { if strings.HasSuffix(call, "-m pip install --upgrade --upgrade-strategy eager .") {
pi = true pi = true
break break
} }
} }
if !pi { if !pi {
t.Logf(`Expected stub command 'python[\S]+ -m pip install .' not found`) t.Logf(`Expected stub command 'python[\S]+ -m pip install --upgrade --upgrade-strategy eager .' not found`)
t.FailNow() t.FailNow()
} }
} }