From a6fbe8021bf5bc2906ae85792578055ed8c42395 Mon Sep 17 00:00:00 2001 From: Josh Matthews Date: Fri, 11 May 2018 16:55:30 -0700 Subject: [PATCH 1/3] Gate pip package settings on OS. --- python/init.sls | 2 ++ 1 file changed, 2 insertions(+) diff --git a/python/init.sls b/python/init.sls index 11291dec..fbcb6298 100644 --- a/python/init.sls +++ b/python/init.sls @@ -55,6 +55,8 @@ virtualenv: pip.installed: - pkgs: - virtualenv == 14.0.6 + {% if grains['os'] == 'MacOS' %} - ignore_installed: True + {% endif %} - require: - pkg: pip From fbc5b5d395f34c6b1e8b493d0056b255108ea716 Mon Sep 17 00:00:00 2001 From: Josh Matthews Date: Fri, 11 May 2018 16:56:37 -0700 Subject: [PATCH 2/3] Gate ignoring buildbot pip package on OS. --- buildbot/slave/init.sls | 2 ++ 1 file changed, 2 insertions(+) diff --git a/buildbot/slave/init.sls b/buildbot/slave/init.sls index 9f012889..338d5177 100644 --- a/buildbot/slave/init.sls +++ b/buildbot/slave/init.sls @@ -9,7 +9,9 @@ buildbot-slave-dependencies: - pkgs: - buildbot-slave == 0.8.12 - twisted == 16.6.0 # NOTE: keep in sync with buildbot-master sls + {% if grains['os'] == 'MacOS' %} - ignore_installed: True + {% endif %} - require: - pkg: pip From 4747065ba220d90350a63b678c11e9ad6e54baa7 Mon Sep 17 00:00:00 2001 From: Josh Matthews Date: Fri, 11 May 2018 16:57:37 -0700 Subject: [PATCH 3/3] Gate ignoring existing ghp-import on OS. --- servo-build-dependencies/init.sls | 2 ++ 1 file changed, 2 insertions(+) diff --git a/servo-build-dependencies/init.sls b/servo-build-dependencies/init.sls index c0522949..4907e4d0 100644 --- a/servo-build-dependencies/init.sls +++ b/servo-build-dependencies/init.sls @@ -101,7 +101,9 @@ servo-dependencies: - require: - pkg: pip - pip: virtualenv + {% if grains['os'] == 'MacOS' %} - ignore_installed: True + {% endif %} {% endif %} {% if grains['os'] == 'Ubuntu' %}