Skip to content
Open
Changes from all commits
Commits
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
12 changes: 2 additions & 10 deletions catkin_virtualenv/src/catkin_virtualenv/venv.py
Original file line number Diff line number Diff line change
Expand Up @@ -66,8 +66,8 @@ def initialize(self, python, use_system_packages, extra_pip_args, clean=True):
raise RuntimeError(error_msg)

preinstall = [
"pip==22.2.2",
"pip-tools==6.10.0",
"pip==23.3.2",
"pip-tools==7.4.1",
]

builtin_venv = self._check_module(system_python, "venv")
Expand All @@ -90,14 +90,6 @@ def initialize(self, python, use_system_packages, extra_pip_args, clean=True):
run_command(virtualenv, check=True)

if without_pip:
# install pip via get-pip.py
version_proc = run_command(
["python", "-cimport sys; print('{}.{}'.format(*sys.version_info))"], capture_output=True
)
version = version_proc.stdout
if isinstance(version, bytes):
version = version.decode("utf-8")
version = version.strip()
# download pip from https://bootstrap.pypa.io/pip/
get_pip_path, _ = urlretrieve("https://bootstrap.pypa.io/pip/get-pip.py")
run_command([self._venv_bin("python"), get_pip_path], check=True)
Expand Down