From 30503b2f1f973c72765889dd07cdc171d35234ba Mon Sep 17 00:00:00 2001 From: N Date: Mon, 18 Feb 2019 14:16:44 +0000 Subject: [PATCH 1/3] Add Suse pips support --- packages/osfamilymap.yaml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/packages/osfamilymap.yaml b/packages/osfamilymap.yaml index 4873717..2346a7e 100644 --- a/packages/osfamilymap.yaml +++ b/packages/osfamilymap.yaml @@ -1,5 +1,11 @@ # -*- coding: utf-8 -*- # vim: ft=yaml +Suse: + pips: + required: + pkgs: + - python-pip + Debian: pips: required: From 7f76f4b179b4c8c056067cb24fd964e097222195 Mon Sep 17 00:00:00 2001 From: N Date: Thu, 21 Feb 2019 15:16:54 +0000 Subject: [PATCH 2/3] pip state is not working with Python3/OpenSUSE 15 --- packages/pips.sls | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/packages/pips.sls b/packages/pips.sls index 4c3514d..4727858 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',) %} + 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 ba196a5b0d4867da3796da13663d7bd967d16d8f Mon Sep 17 00:00:00 2001 From: N Date: Sat, 2 Mar 2019 13:57:16 +0000 Subject: [PATCH 3/3] Add default 'pips.config' dict --- packages/defaults.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/defaults.yaml b/packages/defaults.yaml index 2644134..429781c 100644 --- a/packages/defaults.yaml +++ b/packages/defaults.yaml @@ -13,6 +13,7 @@ packages: pips: wanted: [] unwanted: [] + config: [] required: states: [] pkgs: []