Skip to content

Commit 456674b

Browse files
authored
Fix container startup fail when requirement exists (#27661)
1 parent 6cd6410 commit 456674b

File tree

1 file changed

+5
-6
lines changed

1 file changed

+5
-6
lines changed

sdks/python/container/piputil.go

+5-6
Original file line numberDiff line numberDiff line change
@@ -37,15 +37,14 @@ func pipInstallRequirements(files []string, dir, name string) error {
3737
// as possible PyPI downloads. In the first round the --find-links
3838
// option will make sure that only things staged in the worker will be
3939
// used without following their dependencies.
40-
args := []string{"-m", "pip", "install", "-r", filepath.Join(dir, name), "--no-cache-dir", "--disable-pip-version-check", "--no-index", "--no-deps", "--find-links",
41-
"-q", dir}
40+
args := []string{"-m", "pip", "install", "-q", "-r", filepath.Join(dir, name), "--no-cache-dir", "--disable-pip-version-check", "--no-index", "--no-deps", "--find-links", dir}
4241
if err := execx.Execute("python", args...); err != nil {
4342
fmt.Println("Some packages could not be installed solely from the requirements cache. Installing packages from PyPI.")
4443
}
4544
// The second install round opens up the search for packages on PyPI and
4645
// also installs dependencies. The key is that if all the packages have
4746
// been installed in the first round then this command will be a no-op.
48-
args = []string{"-m", "pip", "install", "-r", filepath.Join(dir, name), "--no-cache-dir", "--disable-pip-version-check", "--find-links", "-q", dir}
47+
args = []string{"-m", "pip", "install", "-q", "-r", filepath.Join(dir, name), "--no-cache-dir", "--disable-pip-version-check", "--find-links", dir}
4948
return execx.Execute("python", args...)
5049
}
5150
}
@@ -77,18 +76,18 @@ func pipInstallPackage(files []string, dir, name string, force, optional bool, e
7776
// installed version will match the package specified, the package itself
7877
// will not be reinstalled, but its dependencies will now be resolved and
7978
// installed if necessary. This achieves our goal outlined above.
80-
args := []string{"-m", "pip", "install", "--no-cache-dir", "--disable-pip-version-check", "--upgrade", "--force-reinstall", "--no-deps", "-q",
79+
args := []string{"-m", "pip", "install", "-q", "--no-cache-dir", "--disable-pip-version-check", "--upgrade", "--force-reinstall", "--no-deps",
8180
filepath.Join(dir, packageSpec)}
8281
err := execx.Execute("python", args...)
8382
if err != nil {
8483
return err
8584
}
86-
args = []string{"-m", "pip", "install", "--no-cache-dir", "--disable-pip-version-check", "-q", filepath.Join(dir, packageSpec)}
85+
args = []string{"-m", "pip", "install", "-q", "--no-cache-dir", "--disable-pip-version-check", filepath.Join(dir, packageSpec)}
8786
return execx.Execute("python", args...)
8887
}
8988

9089
// Case when we do not perform a forced reinstall.
91-
args := []string{"-m", "pip", "install", "--no-cache-dir", "--disable-pip-version-check", "-q", filepath.Join(dir, packageSpec)}
90+
args := []string{"-m", "pip", "install", "-q", "--no-cache-dir", "--disable-pip-version-check", filepath.Join(dir, packageSpec)}
9291
return execx.Execute("python", args...)
9392
}
9493
}

0 commit comments

Comments
 (0)