Force reinstall dependencies if using venv (#234)

ros2 · Jan 3, 2019 · ec3050a · ec3050a
1 parent cd00968
commit ec3050a
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/ros2_batch_job/__main__.py b/ros2_batch_job/__main__.py
@@ -459,8 +459,13 @@ def run(args, build_function, blacklisted_package_names=None):
             job.run(
                 ['"%s"' % job.python, '-m', 'pip', 'uninstall', '-y'] +
                 colcon_packages, shell=True)
+
+        pip_cmd = ['"%s"' % job.python, '-m', 'pip', 'install', '-U']
+        if args.do_venv:
+            # Force reinstall so all dependencies are in virtual environment
+            pip_cmd.append('--force-reinstall')
         job.run(
-            ['"%s"' % job.python, '-m', 'pip', 'install', '-U'] + pip_packages,
+             pip_cmd + pip_packages,
             shell=True)
 
         # OS X can't invoke a file which has a space in the shebang line