admin/brew
1
0
Fork 0
Code Issues Packages Projects Releases 6 Wiki Activity

Merge pull request #15694 from branchvincent/std_pip_args

Browse Source 
formula: add `std_pip_args`
This commit is contained in:
Mike McQuaid 2023-07-20 15:33:26 +01:00 committed by GitHub
commit 9d2c110eb9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 32 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Library/Homebrew/formula.rb
View File

@ -1622,6 +1622,19 @@ class Formula
["--prefix=#{prefix}", "--libdir=#{lib}", "--buildtype=release", "--wrap-mode=nofallback"]
end
# Standard parameters for pip builds.
sig {
params(prefix: T.any(String, Pathname, FalseClass),
build_isolation: T::Boolean).returns(T::Array[String])
}
def std_pip_args(prefix: self.prefix, build_isolation: false)
args = ["--verbose", "--no-deps", "--no-binary=:all:", "--ignore-installed",
"--use-feature=no-binary-enable-wheel-cache"]
args << "--prefix=#{prefix}" if prefix.present?
args << "--no-build-isolation" unless build_isolation
args
end
# Shared library names according to platform conventions.
#
# Optionally specify a `version` to restrict the shared library to a specific

7
Library/Homebrew/language/python.rb
View File

@ -301,12 +301,7 @@ module Language
def do_install(targets, build_isolation: true)
targets = Array(targets)
args = [
"-v", "--no-deps", "--no-binary", ":all:",
"--use-feature=no-binary-enable-wheel-cache",
"--ignore-installed"
]
args << "--no-build-isolation" unless build_isolation
args = @formula.std_pip_args(prefix: false, build_isolation: build_isolation)
@formula.system @venv_root/"bin/pip", "install", *args, *targets
end
end

30
Library/Homebrew/test/language/python/virtualenv_spec.rb
View File

@ -22,17 +22,19 @@ describe Language::Python::Virtualenv::Virtualenv, :needs_python do
describe "#pip_install" do
it "accepts a string" do
expect(formula).to receive(:std_pip_args).with(prefix: false,
build_isolation: true).and_return(["--std-pip-args"])
expect(formula).to receive(:system)
.with(dir/"bin/pip", "install", "-v", "--no-deps", "--no-binary", ":all:",
"--use-feature=no-binary-enable-wheel-cache", "--ignore-installed", "foo")
.with(dir/"bin/pip", "install", "--std-pip-args", "foo")
.and_return(true)
virtualenv.pip_install "foo"
end
it "accepts a multi-line strings" do
expect(formula).to receive(:std_pip_args).with(prefix: false,
build_isolation: true).and_return(["--std-pip-args"])
expect(formula).to receive(:system)
.with(dir/"bin/pip", "install", "-v", "--no-deps", "--no-binary", ":all:",
"--use-feature=no-binary-enable-wheel-cache", "--ignore-installed", "foo", "bar")
.with(dir/"bin/pip", "install", "--std-pip-args", "foo", "bar")
.and_return(true)
virtualenv.pip_install <<~EOS
@ -42,14 +44,16 @@ describe Language::Python::Virtualenv::Virtualenv, :needs_python do
end
it "accepts an array" do
expect(formula).to receive(:std_pip_args).with(prefix: false,
build_isolation: true).and_return(["--std-pip-args"])
expect(formula).to receive(:system)
.with(dir/"bin/pip", "install", "-v", "--no-deps", "--no-binary", ":all:",
"--use-feature=no-binary-enable-wheel-cache", "--ignore-installed", "foo")
.with(dir/"bin/pip", "install", "--std-pip-args", "foo")
.and_return(true)
expect(formula).to receive(:std_pip_args).with(prefix: false,
build_isolation: true).and_return(["--std-pip-args"])
expect(formula).to receive(:system)
.with(dir/"bin/pip", "install", "-v", "--no-deps", "--no-binary", ":all:",
"--use-feature=no-binary-enable-wheel-cache", "--ignore-installed", "bar")
.with(dir/"bin/pip", "install", "--std-pip-args", "bar")
.and_return(true)
virtualenv.pip_install ["foo", "bar"]
@ -59,18 +63,20 @@ describe Language::Python::Virtualenv::Virtualenv, :needs_python do
res = Resource.new("test")
expect(res).to receive(:stage).and_yield
expect(formula).to receive(:std_pip_args).with(prefix: false,
build_isolation: true).and_return(["--std-pip-args"])
expect(formula).to receive(:system)
.with(dir/"bin/pip", "install", "-v", "--no-deps", "--no-binary", ":all:",
"--use-feature=no-binary-enable-wheel-cache", "--ignore-installed", Pathname.pwd)
.with(dir/"bin/pip", "install", "--std-pip-args", Pathname.pwd)
.and_return(true)
virtualenv.pip_install res
end
it "works without build isolation" do
expect(formula).to receive(:std_pip_args).with(prefix: false,
build_isolation: false).and_return(["--std-pip-args"])
expect(formula).to receive(:system)
.with(dir/"bin/pip", "install", "-v", "--no-deps", "--no-binary", ":all:",
"--use-feature=no-binary-enable-wheel-cache", "--ignore-installed", "--no-build-isolation", "foo")
.with(dir/"bin/pip", "install", "--std-pip-args", "foo")
.and_return(true)
virtualenv.pip_install("foo", build_isolation: false)
end