From 58d5653d59c6e14b1518b5ae34818600dbf2c0c5 Mon Sep 17 00:00:00 2001 From: Josh Matthews Date: Thu, 3 May 2018 13:05:24 -0400 Subject: [PATCH] Ignore installed copies of pip dependencies. --- buildbot/slave/init.sls | 1 + python/init.sls | 1 + servo-build-dependencies/init.sls | 1 + 3 files changed, 3 insertions(+) diff --git a/buildbot/slave/init.sls b/buildbot/slave/init.sls index 23695539..9f012889 100644 --- a/buildbot/slave/init.sls +++ b/buildbot/slave/init.sls @@ -9,6 +9,7 @@ buildbot-slave-dependencies: - pkgs: - buildbot-slave == 0.8.12 - twisted == 16.6.0 # NOTE: keep in sync with buildbot-master sls + - ignore_installed: True - require: - pkg: pip diff --git a/python/init.sls b/python/init.sls index f66c6787..11291dec 100644 --- a/python/init.sls +++ b/python/init.sls @@ -55,5 +55,6 @@ virtualenv: pip.installed: - pkgs: - virtualenv == 14.0.6 + - ignore_installed: True - require: - pkg: pip diff --git a/servo-build-dependencies/init.sls b/servo-build-dependencies/init.sls index 9e2cefeb..c0522949 100644 --- a/servo-build-dependencies/init.sls +++ b/servo-build-dependencies/init.sls @@ -101,6 +101,7 @@ servo-dependencies: - require: - pkg: pip - pip: virtualenv + - ignore_installed: True {% endif %} {% if grains['os'] == 'Ubuntu' %}