From a309d24569c1141a6c69c3719bdff41d0b146f73 Mon Sep 17 00:00:00 2001
From: N <noel.mcloughlin@gmail.com>
Date: Thu, 21 Feb 2019 15:20:42 +0000
Subject: [PATCH 1/2] salt pip states are broken on python3/Suse15.0

---
 packages/pips.sls | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/packages/pips.sls b/packages/pips.sls
index 4c3514d..18a3886 100644
--- a/packages/pips.sls
+++ b/packages/pips.sls
@@ -16,9 +16,14 @@ pip_req_pkgs:
 # (requires the python-pip deb/rpm installed, either by the system or listed in
 # the required packages
 {% for pn in wanted_pips %}
-{{ pn }}:
+packages pips install {{ pn }}:
+       {%- if grains.os_family in ('Suse',) %}  ##workaround https://github.com/saltstack-formulas/docker-formula/issues/198
+  cmd.run:
+    - name: /usr/bin/pip install {{ pn }}
+       {%- else %}
   pip.installed:
     - reload_modules: true
+       {%- endif %}
     - require:
       - pkg: pip_req_pkgs
       {% if req_states %}
@@ -29,6 +34,12 @@ pip_req_pkgs:
 {% endfor %}
 
 {% for upn in unwanted_pips %}
-{{ upn }}:
+packages pips remove {{ upn }}:
+       {%- if grains.os_family in ('Suse',) %}
+  cmd.run:
+    - name: /usr/bin/pip uninstall {{ pn }}
+       {%- else %}
   pip.removed
+    - name: {{ upn }}
+       {%- endif %}
 {% endfor %}

From 05666ce5a854fe82ade80c57542b82dbc3d9408c Mon Sep 17 00:00:00 2001
From: N <noel.mcloughlin@gmail.com>
Date: Thu, 21 Feb 2019 16:33:54 +0000
Subject: [PATCH 2/2] Fix regression

---
 packages/pips.sls | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/pips.sls b/packages/pips.sls
index 18a3886..2bc6f7e 100644
--- a/packages/pips.sls
+++ b/packages/pips.sls
@@ -22,6 +22,7 @@ packages pips install {{ pn }}:
     - name: /usr/bin/pip install {{ pn }}
        {%- else %}
   pip.installed:
+    - name: {{ pn }}
     - reload_modules: true
        {%- endif %}
     - require:
@@ -39,7 +40,7 @@ packages pips remove {{ upn }}:
   cmd.run:
     - name: /usr/bin/pip uninstall {{ pn }}
        {%- else %}
-  pip.removed
+  pip.removed:
     - name: {{ upn }}
        {%- endif %}
 {% endfor %}