Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

python: create venv's --without-pip #15792

Merged
merged 1 commit into from
Jul 31, 2023
Merged

python: create venv's --without-pip #15792

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 14 additions & 6 deletions Library/Homebrew/language/python.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,10 +134,12 @@
# or "python3.x")
# @param formula [Formula] the active {Formula}
# @return [Virtualenv] a {Virtualenv} instance
def virtualenv_create(venv_root, python = "python", formula = self, system_site_packages: true)
def virtualenv_create(venv_root, python = "python", formula = self, system_site_packages: true,
without_pip: true)
# odeprecated "Language::Python::Virtualenv.virtualenv_create's without_pip" unless without_pip
ENV.refurbish_args
venv = Virtualenv.new formula, venv_root, python
venv.create(system_site_packages: system_site_packages)
venv.create(system_site_packages: system_site_packages, without_pip: without_pip)

Check warning on line 142 in Library/Homebrew/language/python.rb

View check run for this annotation

Codecov / codecov/patch

Library/Homebrew/language/python.rb#L142 

Added line #L142 was not covered by tests

# Find any Python bindings provided by recursive dependencies
formula_deps = formula.recursive_dependencies
Expand Down Expand Up @@ -180,7 +182,8 @@
# formula preference for python or python@x.y, or to resolve an ambiguous
# case where it's not clear whether python or python@x.y should be the
# default guess.
def virtualenv_install_with_resources(using: nil, system_site_packages: true, link_manpages: false)
def virtualenv_install_with_resources(using: nil, system_site_packages: true, without_pip: true,
link_manpages: false)
python = using
if python.nil?
wanted = python_names.select { |py| needs_python?(py) }
Expand All @@ -190,7 +193,8 @@
python = wanted.first
python = "python3" if python == "python"
end
venv = virtualenv_create(libexec, python.delete("@"), system_site_packages: system_site_packages)
venv = virtualenv_create(libexec, python.delete("@"), system_site_packages: system_site_packages,

Check warning on line 196 in Library/Homebrew/language/python.rb

View check run for this annotation

Codecov / codecov/patch

Library/Homebrew/language/python.rb#L196 

Added line #L196 was not covered by tests
without_pip: without_pip)
venv.pip_install resources
venv.pip_install_and_link(buildpath, link_manpages: link_manpages)
venv
Expand Down Expand Up @@ -221,11 +225,12 @@
# Obtains a copy of the virtualenv library and creates a new virtualenv on disk.
#
# @return [void]
def create(system_site_packages: true)
def create(system_site_packages: true, without_pip: true)
return if (@venv_root/"bin/python").exist?

args = ["-m", "venv"]
args << "--system-site-packages" if system_site_packages
args << "--without-pip" if without_pip
@formula.system @python, *args, @venv_root

# Robustify symlinks to survive python patch upgrades
Expand All @@ -250,6 +255,9 @@
prefix_path.sub! %r{^#{HOMEBREW_CELLAR}/python#{version}/[^/]+}, Formula["python#{version}"].opt_prefix
prefix_file.atomic_write prefix_path
end

# Remove unnecessary activate scripts
(@venv_root/"bin").glob("[Aa]ctivate*").map(&:unlink)
end

# Installs packages represented by `targets` into the virtualenv.
Expand Down Expand Up @@ -302,7 +310,7 @@
def do_install(targets, build_isolation: true)
targets = Array(targets)
args = @formula.std_pip_args(prefix: false, build_isolation: build_isolation)
@formula.system @venv_root/"bin/pip", "install", *args, *targets
@formula.system @python, "-m", "pip", "--python=#{@venv_root}/bin/python", "install", *args, *targets
end
end
end
Expand Down
19 changes: 12 additions & 7 deletions Library/Homebrew/test/language/python/virtualenv_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,17 +15,22 @@

describe "#create" do
it "creates a venv" do
expect(formula).to receive(:system).with("python", "-m", "venv", "--system-site-packages", dir)
expect(formula).to receive(:system).with("python", "-m", "venv", "--system-site-packages", "--without-pip", dir)
virtualenv.create
end

it "creates a venv with pip" do
expect(formula).to receive(:system).with("python", "-m", "venv", "--system-site-packages", dir)
virtualenv.create(without_pip: false)
end
end

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", "--std-pip-args", "foo")
.with("python", "-m", "pip", "--python=#{dir}/bin/python", "install", "--std-pip-args", "foo")
.and_return(true)
virtualenv.pip_install "foo"
end
Expand All @@ -34,7 +39,7 @@
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", "--std-pip-args", "foo", "bar")
.with("python", "-m", "pip", "--python=#{dir}/bin/python", "install", "--std-pip-args", "foo", "bar")
.and_return(true)

virtualenv.pip_install <<~EOS
Expand All @@ -47,13 +52,13 @@
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", "--std-pip-args", "foo")
.with("python", "-m", "pip", "--python=#{dir}/bin/python", "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", "--std-pip-args", "bar")
.with("python", "-m", "pip", "--python=#{dir}/bin/python", "install", "--std-pip-args", "bar")
.and_return(true)

virtualenv.pip_install ["foo", "bar"]
Expand All @@ -66,7 +71,7 @@
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", "--std-pip-args", Pathname.pwd)
.with("python", "-m", "pip", "--python=#{dir}/bin/python", "install", "--std-pip-args", Pathname.pwd)
.and_return(true)

virtualenv.pip_install res
Expand All @@ -76,7 +81,7 @@
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", "--std-pip-args", "foo")
.with("python", "-m", "pip", "--python=#{dir}/bin/python", "install", "--std-pip-args", "foo")
.and_return(true)
virtualenv.pip_install("foo", build_isolation: false)
end
Expand Down
Loading