Lock down pip version

locusrobotics · May 1, 2018 · 911df87 · 911df87
1 parent 0326643
commit 911df87
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/catkin_virtualenv/cmake/build_venv.py b/catkin_virtualenv/cmake/build_venv.py
@@ -59,6 +59,7 @@ def delete_bytecode(directory):
         package=os.path.basename(root_dir),
         requirements_filename=args.requirements,
         upgrade_pip=True,
+        pip_version=9.0.3,
         use_system_packages=True,
         python=find_executable('python3') if args.python3 else find_executable('python2'),
         extra_pip_arg=['-qqq'],

diff --git a/catkin_virtualenv/src/dh_virtualenv/deployment.py b/catkin_virtualenv/src/dh_virtualenv/deployment.py
@@ -38,6 +38,7 @@ def __init__(self,
                  preinstall=[],
                  pip_tool='pip',
                  upgrade_pip=False,
+                 pip_version=None,
                  index_url=None,
                  setuptools=False,
                  python=None,
@@ -74,6 +75,7 @@ def __init__(self,
 
         self.preinstall = preinstall
         self.upgrade_pip = upgrade_pip
+        self.pip_version = pip_version
         self.extra_virtualenv_arg = extra_virtualenv_arg
         self.verbose = verbose
         self.setuptools = setuptools
@@ -182,8 +184,9 @@ def install_dependencies(self):
         # by default virtualenv.
         if self.upgrade_pip:
             # First, bootstrap pip with a reduced option set (well-supported options)
-            print(self.pip_preinstall_prefix + self.pip_upgrade_args + ['-U', 'pip'])
-            subprocess.check_call(self.pip_preinstall_prefix + self.pip_upgrade_args + ['-U', 'pip'])
+            pip_package = 'pip=='.format(self.pip_version) if self.pip_version else 'pip'
+            print(self.pip_preinstall_prefix + self.pip_upgrade_args + ['-U', pip_package])
+            subprocess.check_call(self.pip_preinstall_prefix + self.pip_upgrade_args + ['-U', pip_package])
         if self.preinstall:
             subprocess.check_call(self.pip_preinstall(*self.preinstall))