From 68906a9e13ae68778e6cb5e58b9ba08b4994e3cb Mon Sep 17 00:00:00 2001 From: Paul Bovbel Date: Fri, 5 Apr 2024 10:05:24 -0400 Subject: [PATCH 1/2] BUmp pip version --- catkin_virtualenv/src/catkin_virtualenv/venv.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/catkin_virtualenv/src/catkin_virtualenv/venv.py b/catkin_virtualenv/src/catkin_virtualenv/venv.py index 2084b41..a1a778a 100644 --- a/catkin_virtualenv/src/catkin_virtualenv/venv.py +++ b/catkin_virtualenv/src/catkin_virtualenv/venv.py @@ -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") From 1c9da3362a1eaace453c477028bbcd9e0afe2300 Mon Sep 17 00:00:00 2001 From: Johannes Meyer Date: Wed, 17 Jan 2024 19:21:44 +0100 Subject: [PATCH 2/2] Remove old unused version check that depends on a binary named python (#109) --- catkin_virtualenv/src/catkin_virtualenv/venv.py | 8 -------- 1 file changed, 8 deletions(-) diff --git a/catkin_virtualenv/src/catkin_virtualenv/venv.py b/catkin_virtualenv/src/catkin_virtualenv/venv.py index a1a778a..9448d28 100644 --- a/catkin_virtualenv/src/catkin_virtualenv/venv.py +++ b/catkin_virtualenv/src/catkin_virtualenv/venv.py @@ -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)