diff --git a/sift/python-packages/appcompatprocessor.sls b/sift/python-packages/appcompatprocessor.sls index acc70d9..bc8d246 100644 --- a/sift/python-packages/appcompatprocessor.sls +++ b/sift/python-packages/appcompatprocessor.sls @@ -2,7 +2,6 @@ include: - sift.packages.git - - sift.packages.python3-pip - sift.packages.python2-pip - sift.packages.libregf - sift.packages.python2-dev diff --git a/sift/python-packages/argparse.sls b/sift/python-packages/argparse.sls index de87f59..099631f 100644 --- a/sift/python-packages/argparse.sls +++ b/sift/python-packages/argparse.sls @@ -1,5 +1,4 @@ include: - - sift.packages.python3-pip - sift.packages.python2-pip - sift.python-packages.setuptools diff --git a/sift/python-packages/indxparse.sls b/sift/python-packages/indxparse.sls index 34cbcef..be4535a 100644 --- a/sift/python-packages/indxparse.sls +++ b/sift/python-packages/indxparse.sls @@ -11,6 +11,7 @@ include: - sift.packages.python2-pip - sift.packages.python2-dev - sift.packages.python-wxgtk3 + - sift.python-packages.setuptools sift-python-packages-indxparse: pip.installed: @@ -25,6 +26,7 @@ sift-python-packages-indxparse: - sls: sift.packages.python2-dev - sls: sift.packages.libfuse-dev - sls: sift.packages.python-wxgtk3 + - sls: sift.python-packages.setuptools sift-python-packages-indxparse-shebang: file.prepend: diff --git a/sift/python-packages/lxml.sls b/sift/python-packages/lxml.sls index 2d9c441..c47b944 100644 --- a/sift/python-packages/lxml.sls +++ b/sift/python-packages/lxml.sls @@ -2,6 +2,7 @@ include: - sift.packages.python2-pip - sift.packages.libxml2-dev - sift.packages.libxslt-dev + - sift.python-packages.setuptools sift-python-packages-lxml: pip.installed: @@ -11,3 +12,4 @@ sift-python-packages-lxml: - sls: sift.packages.python2-pip - sls: sift.packages.libxml2-dev - sls: sift.packages.libxslt-dev + - sls: sift.python-packages.setuptools diff --git a/sift/python-packages/m2crypto.sls b/sift/python-packages/m2crypto.sls index 3aa02b7..2bab211 100644 --- a/sift/python-packages/m2crypto.sls +++ b/sift/python-packages/m2crypto.sls @@ -3,6 +3,7 @@ include: - sift.packages.swig - sift.packages.python2-dev - sift.packages.libssl-dev + - sift.python-packages.setuptools sift-python-packages-m2crypto: pip.installed: @@ -14,3 +15,4 @@ sift-python-packages-m2crypto: - sls: sift.packages.swig - sls: sift.packages.python2-dev - sls: sift.packages.libssl-dev + - sls: sift.python-packages.setuptools diff --git a/sift/python-packages/setuptools.sls b/sift/python-packages/setuptools.sls index c94b072..87d0fcc 100644 --- a/sift/python-packages/setuptools.sls +++ b/sift/python-packages/setuptools.sls @@ -3,7 +3,7 @@ include: sift-python-packages-setuptools: pip.installed: - - name: setuptools + - name: 'setuptools<66.0.0' - bin_env: /usr/bin/python2 - upgrade: True - require: