fix: shore up python packages install

teamdfir · Nov 4, 2024 · b6fb3d2 · b6fb3d2
1 parent ba7a295
commit b6fb3d2
Show file tree

Hide file tree

Showing 37 changed files with 19 additions and 36 deletions.
diff --git a/sift/python-packages/appcompatprocessor.sls b/sift/python-packages/appcompatprocessor.sls
@@ -6,6 +6,7 @@ include:
   - sift.packages.python2-pip
   - sift.packages.libregf
   - sift.packages.python2-dev
+  - sift.python-packages.setuptools
 
 appcompatprocessor:
   pip.installed:
@@ -17,3 +18,4 @@ appcompatprocessor:
       - sls: sift.packages.python2-pip
       - sls: sift.packages.libregf
       - sls: sift.packages.python2-dev
+      - sls: sift.python-packages.setuptools
diff --git a/sift/python-packages/argparse.sls b/sift/python-packages/argparse.sls
@@ -1,6 +1,7 @@
 include:
   - sift.packages.python3-pip
   - sift.packages.python2-pip
+  - sift.python-packages.setuptools
 
 sift-python-packages-argparse:
   pip.installed:
@@ -9,3 +10,4 @@ sift-python-packages-argparse:
     - upgrade: True
     - require:
       - sls: sift.packages.python2-pip
+      - sls: sift.python-packages.setuptools
diff --git a/sift/python-packages/bitstring.sls b/sift/python-packages/bitstring.sls
@@ -1,6 +1,6 @@
 include:
-  - sift.packages.python3-pip
   - sift.packages.python2-pip
+  - sift.python-packages.setuptools
 
 sift-python-packages-bitstring:
   pip.installed:
@@ -9,3 +9,4 @@ sift-python-packages-bitstring:
     - upgrade: True
     - require:
       - sls: sift.packages.python2-pip
+      - sls: sift.python-packages.setuptools
diff --git a/sift/python-packages/capstone.sls b/sift/python-packages/capstone.sls
@@ -1,5 +1,4 @@
 include:
-  - sift.packages.python3-pip
   - sift.packages.python2-pip
 
 sift-python-packages-pkg-remove:

diff --git a/sift/python-packages/colorama.sls b/sift/python-packages/colorama.sls
@@ -1,6 +1,6 @@
 include:
-  - sift.packages.python3-pip
   - sift.packages.python2-pip
+  - sift.python-packages.setuptools
 
 sift-python-packages-colorama:
   pip.installed:
@@ -9,3 +9,4 @@ sift-python-packages-colorama:
     - upgrade: True
     - require:
       - sls: sift.packages.python2-pip
+      - sls: sift.python-packages.setuptools
diff --git a/sift/python-packages/construct.sls b/sift/python-packages/construct.sls
@@ -1,11 +1,12 @@
 include:
-  - sift.packages.python3-pip
   - sift.packages.python2-pip
+  - sift.python-packages.setuptools
 
 sift-python-packages-construct:
   pip.installed:
-    - name: construct == 2.10.54
+    - name: construct == 2.10.54 # note: pinned due to volatility2
     - bin_env: /usr/bin/python2
     - upgrade: True
     - require:
       - sls: sift.packages.python2-pip
+      - sls: sift.python-packages.setuptools
diff --git a/sift/python-packages/distorm3.sls b/sift/python-packages/distorm3.sls
@@ -1,7 +1,7 @@
 include:
-  - sift.packages.python3-pip
   - sift.packages.python2-pip
   - sift.packages.python2-dev
+  - sift.python-packages.setuptools
 
 sift-python-packages-distorm3:
   pip.installed:
@@ -10,3 +10,4 @@ sift-python-packages-distorm3:
     - require:
       - sls: sift.packages.python2-pip
       - sls: sift.packages.python2-dev
+      - sls: sift.python-packages.setuptools
diff --git a/sift/python-packages/docopt.sls b/sift/python-packages/docopt.sls
@@ -1,6 +1,6 @@
 include:
-  - sift.packages.python3-pip
   - sift.packages.python2-pip
+  - sift.python-packages.setuptools
 
 sift-python-packages-docopt:
   pip.installed:
@@ -9,3 +9,4 @@ sift-python-packages-docopt:
     - upgrade: True
     - require:
       - sls: sift.packages.python2-pip
+      - sls: sift.python-packages.setuptools
diff --git a/sift/python-packages/dpapick.sls b/sift/python-packages/dpapick.sls
@@ -2,7 +2,6 @@
 
 include:
   - sift.packages.libssl-dev
-  - sift.packages.python3-pip
   - sift.packages.python2-pip
   - sift.python-packages.m2crypto
 

diff --git a/sift/python-packages/geoip2.sls b/sift/python-packages/geoip2.sls
@@ -1,6 +1,6 @@
 include:
-  - sift.packages.python3-pip
   - sift.packages.python2-pip
+  - sift.python-packages.setuptools
 
 sift-python-packages-geoip2:
   pip.installed:
@@ -9,3 +9,4 @@ sift-python-packages-geoip2:
     - upgrade: True
     - require:
       - sls: sift.packages.python2-pip
+      - sls: sift.python-packages.setuptools
diff --git a/sift/python-packages/indxparse.sls b/sift/python-packages/indxparse.sls
@@ -8,7 +8,6 @@ include:
   - sift.packages.g++
   - sift.packages.libfuse-dev
   - sift.packages.pkg-config
-  - sift.packages.python3-pip
   - sift.packages.python2-pip
   - sift.packages.python2-dev
   - sift.packages.python-wxgtk3

diff --git a/sift/python-packages/ioc_writer.sls b/sift/python-packages/ioc_writer.sls
@@ -1,7 +1,7 @@
 include:
-  - sift.packages.python3-pip
   - sift.packages.python2-pip
   - sift.python-packages.lxml
+  - sift.python-packages.setuptools
 
 sift-python-packages-ioc-writer:
   pip.installed:
@@ -11,4 +11,5 @@ sift-python-packages-ioc-writer:
     - require:
       - sls: sift.packages.python2-pip
       - sls: sift.python-packages.lxml
+      - sls: sift.python-packages.setuptools
 
diff --git a/sift/python-packages/lxml.sls b/sift/python-packages/lxml.sls
@@ -1,5 +1,4 @@
 include:
-  - sift.packages.python3-pip
   - sift.packages.python2-pip
   - sift.packages.libxml2-dev
   - sift.packages.libxslt-dev

diff --git a/sift/python-packages/m2crypto.sls b/sift/python-packages/m2crypto.sls
@@ -1,5 +1,4 @@
 include:
-  - sift.packages.python3-pip
   - sift.packages.python2-pip
   - sift.packages.swig
   - sift.packages.python2-dev

diff --git a/sift/python-packages/ntdsxtract.sls b/sift/python-packages/ntdsxtract.sls
@@ -1,6 +1,5 @@
 include:
   - sift.packages.git
-  - sift.packages.python3-pip
   - sift.packages.python2-pip
 
 sift-python-ntdsxtract:

diff --git a/sift/python-packages/openpyxl.sls b/sift/python-packages/openpyxl.sls
@@ -1,6 +1,5 @@
 include:
   - sift.packages.python2-pip
-  - sift.packages.python3-pip
 
 openpyxl==2.1.2:
   pip.installed:

diff --git a/sift/python-packages/pefile.sls b/sift/python-packages/pefile.sls
@@ -1,5 +1,4 @@
 include:
-  - sift.packages.python3-pip
   - sift.packages.python2-pip
 
 sift-python-packages-pefile:

diff --git a/sift/python-packages/pillow.sls b/sift/python-packages/pillow.sls
@@ -1,6 +1,5 @@
 include:
   - sift.packages.python2-pip
-  - sift.packages.python3-pip
 
 sift-python-packages-pillow:
   pip.installed:

diff --git a/sift/python-packages/poster.sls b/sift/python-packages/poster.sls
@@ -1,5 +1,4 @@
 include:
-  - sift.packages.python3-pip
   - sift.packages.python2-pip
 
 sift-python-packages-poster:

diff --git a/sift/python-packages/pycoin.sls b/sift/python-packages/pycoin.sls
@@ -1,7 +1,6 @@
 # Note: not included in init.sls, only required by python-volatility
 
 include:
-  - sift.packages.python3-pip
   - sift.packages.python2-pip
 
 sift-python-packages-pycoin:

diff --git a/sift/python-packages/pycrypto.sls b/sift/python-packages/pycrypto.sls
@@ -1,7 +1,6 @@
 # This package is only required for volatility, so it is not included in the init.sls
 
 include:
-  - sift.packages.python3-pip
   - sift.packages.python2-pip
 
 sift-python-packages-pycrypto:

diff --git a/sift/python-packages/pydasm.sls b/sift/python-packages/pydasm.sls
@@ -1,6 +1,5 @@
 include:
   - sift.packages.git
-  - sift.packages.python3-pip
   - sift.packages.python2-pip
 
 pydasm:

diff --git a/sift/python-packages/pysocks.sls b/sift/python-packages/pysocks.sls
@@ -1,5 +1,4 @@
 include:
-  - sift.packages.python3-pip
   - sift.packages.python2-pip
 
 sift-python-packages-pysocks:

diff --git a/sift/python-packages/python-dateutil.sls b/sift/python-packages/python-dateutil.sls
@@ -1,5 +1,4 @@
 include:
-  - sift.packages.python3-pip
   - sift.packages.python2-pip
 
 sift-python-packages-python-dateutil:

diff --git a/sift/python-packages/python-magic.sls b/sift/python-packages/python-magic.sls
@@ -1,5 +1,4 @@
 include:
-  - sift.packages.python3-pip
   - sift.packages.python2-pip
 
 sift-python-packages-python-magic:

diff --git a/sift/python-packages/python-registry.sls b/sift/python-packages/python-registry.sls
@@ -1,5 +1,4 @@
 include:
-  - sift.packages.python3-pip
   - sift.packages.python2-pip
 
 sift-python-packages-python-registry:

diff --git a/sift/python-packages/requests.sls b/sift/python-packages/requests.sls
@@ -1,5 +1,4 @@
 include:
-  - sift.packages.python3-pip
   - sift.packages.python2-pip
 
 sift-python-packages-requests:

diff --git a/sift/python-packages/s2sphere.sls b/sift/python-packages/s2sphere.sls
@@ -1,5 +1,4 @@
 include:
-  - sift.packages.python3-pip
   - sift.packages.python2-pip
 
 sift-python-packages-s2sphere:

diff --git a/sift/python-packages/shellbags.sls b/sift/python-packages/shellbags.sls
@@ -2,7 +2,6 @@
 
 include:
   - sift.packages.git
-  - sift.packages.python3-pip
   - sift.packages.python2-pip
 
 shellbags:

diff --git a/sift/python-packages/simplejson.sls b/sift/python-packages/simplejson.sls
@@ -1,7 +1,6 @@
 # Note: not included in init.sls, only required by python-volatility
 
 include:
-  - sift.packages.python3-pip
   - sift.packages.python2-pip
 
 sift-python-packages-simplejson:

diff --git a/sift/python-packages/six.sls b/sift/python-packages/six.sls
@@ -1,5 +1,4 @@
 include:
-  - sift.packages.python3-pip
   - sift.packages.python2-pip
 
 sift-python-packages-six:

diff --git a/sift/python-packages/unicodecsv.sls b/sift/python-packages/unicodecsv.sls
@@ -1,5 +1,4 @@
 include:
-  - sift.packages.python3-pip
   - sift.packages.python2-pip
 
 sift-python-packages-unicodecsv:

diff --git a/sift/python-packages/usnparser.sls b/sift/python-packages/usnparser.sls
@@ -1,5 +1,4 @@
 include:
-  - sift.packages.python3-pip
   - sift.packages.python2-pip
 
 sift-python-packages-usnparser:

diff --git a/sift/python-packages/volatility.sls b/sift/python-packages/volatility.sls
@@ -10,7 +10,6 @@
 
 include:
   - sift.packages.git
-  - sift.packages.python3-pip
   - sift.packages.python2-pip
   - sift.python-packages.colorama
   - sift.python-packages.construct

diff --git a/sift/python-packages/wheel.sls b/sift/python-packages/wheel.sls
@@ -1,5 +1,4 @@
 include:
-  - sift.packages.python3-pip
   - sift.packages.python2-pip
 
 sift-python-packages-wheel:

diff --git a/sift/python-packages/windowsprefetch.sls b/sift/python-packages/windowsprefetch.sls
@@ -1,5 +1,4 @@
 include:
-  - sift.packages.python3-pip
   - sift.packages.python2-pip
 
 sift-python-packages-windowsprefetch:

diff --git a/sift/python-packages/yara-python.sls b/sift/python-packages/yara-python.sls
@@ -1,7 +1,6 @@
 # Note: not included in init.sls, only required by python-volatility
 
 include:
-  - sift.packages.python3-pip
   - sift.packages.python2-pip
 
 sift-python-packages-yara-python: