fix: working on order of ops

sift/python3-packages/analyzemft.sls

@@ -1,10 +1,10 @@
 include:
-  - sift.packages.python3-pip
+  - sift.python3-packages.core
 
 analyzemft:
   pip.installed:
     - name: analyzeMFT
     - bin_env: /usr/bin/python3
     - upgrade: True
     - require:
-      - sls: sift.packages.python3-pip
+      - sls: sift.python3-packages.core

sift/python3-packages/argparse.sls

@@ -1,9 +1,9 @@
 include:
-  - sift.python3-packages.pip
+  - sift.python3-packages.core
 
 sift-python3-packages-argparse:
   pip.installed:
     - name: argparse
     - bin_env: /usr/bin/python3
     - require:
-      - sls: sift.python3-packages.pip
+      - sls: sift.python3-packages.core

sift/python3-packages/bitstring.sls

@@ -1,9 +1,9 @@
 include:
-  - sift.python3-packages.pip
+  - sift.python3-packages.core
 
 sift-python3-packages-bitstring:
   pip.installed:
     - name: bitstring
     - bin_env: /usr/bin/python3
     - require:
-      - sls: sift.python3-packages.pip
+      - sls: sift.python3-packages.core

sift/python3-packages/colorama.sls

@@ -1,9 +1,9 @@
 include:
-  - sift.python3-packages.pip
+  - sift.python3-packages.core
 
 sift-python3-packages-colorama:
   pip.installed:
     - name: colorama
     - bin_env: /usr/bin/python3
     - require:
-      - sls: sift.python3-packages.pip
+      - sls: sift.python3-packages.core

sift/python3-packages/core.sls

@@ -0,0 +1,12 @@
+include:
+  - sift.python3-packages.pip
+  - sift.python3-packages.wheel
+  - sift.python3-packages.setuptools
+
+sift-python3-packages-core:
+  test.nop:
+    - name: python3-packages-core
+    - require:
+        - sls: sift.python3-packages.pip
+        - sls: sift.python3-packages.wheel
+        - sls: sift.python3-packages.setuptools

sift/python3-packages/defang.sls

@@ -1,15 +1,11 @@
 # WEBSITE: https://github.com/HurricaneLabs/machinae
 # LICENSE: MIT
 include:
-  - sift.python3-packages.pip
-  - sift.python3-packages.wheel
-  - sift.python3-packages.setuptools
+  - sift.python3-packages.core
 
 sift-python3-packages-defang:
   pip.installed:
     - name: defang
     - bin_env: /usr/bin/python3
     - require:
-      - sls: sift.python3-packages.pip
-      - sls: sift.python3-packages.wheel
-      - sls: sift.python3-packages.setuptools
+      - sls: sift.python3-packages.core

sift/python3-packages/geoip2.sls

@@ -1,9 +1,9 @@
 include:
-  - sift.python3-packages.pip
+  - sift.python3-packages.core
 
 sift-python3-packages-geoip2:
   pip.installed:
     - name: geoip2
     - bin_env: /usr/bin/python3
     - require:
-      - sls: sift.python3-packages.pip
+      - sls: sift.python3-packages.core

sift/python3-packages/ijson.sls

@@ -1,9 +1,9 @@
 include:
-  - sift.python3-packages.pip
+  - sift.python3-packages.core
 
 sift-python3-packages-ijson:
   pip.installed:
     - name: ijson
     - bin_env: /usr/bin/python3
     - require:
-      - sls: sift.python3-packages.pip
+      - sls: sift.python3-packages.core

sift/python3-packages/imagemounter.sls

@@ -1,5 +1,5 @@
 include:
-  - sift.python3-packages.pip
+  - sift.python3-packages.core
   - sift.python3-packages.python-magic
   - sift.packages.afflib-tools
   - sift.packages.avfs
@@ -24,7 +24,7 @@ sift-python3-packages-imagemounter:
     - name: imagemounter
     - bin_env: /usr/bin/python3
     - require:
-      - sls: sift.python3-packages.pip
+      - sls: sift.python3-packages.core
       - sls: sift.python3-packages.python-magic
       - sls: sift.packages.afflib-tools
       - sls: sift.packages.avfs

sift/python3-packages/ioc_writer.sls

@@ -1,6 +1,5 @@
 include:
-  - sift.python3-packages.pip
-  - sift.python3-packages.setuptools
+  - sift.python3-packages.core
   - sift.python3-packages.lxml
   - sift.python3-packages.yara-python
 
@@ -9,7 +8,6 @@ sift-python3-packages-ioc-writer:
     - name: ioc_writer
     - bin_env: /usr/bin/python3
     - require:
-      - sls: sift.python3-packages.pip
-      - sls: sift.python3-packages.setuptools
+      - sls: sift.python3-packages.core
       - sls: sift.python3-packages.lxml
       - sls: sift.python3-packages.yara-python

sift/python3-packages/keyrings-alt.sls

@@ -1,9 +1,9 @@
 include:
-  - sift.python3-packages.pip
+  - sift.python3-packages.core
 
 sift-python3-packages-keyrings-alt:
   pip.installed:
     - name: keyrings.alt
     - bin_env: /usr/bin/python3
     - require:
-      - sls: sift.python3-packages.pip
+      - sls: sift.python3-packages.core

sift/python3-packages/lxml.sls

@@ -1,5 +1,5 @@
 include:
-  - sift.python3-packages.pip
+  - sift.python3-packages.core
   - sift.packages.libxml2-dev
   - sift.packages.libxslt-dev
 
@@ -8,6 +8,6 @@ sift-python3-packages-lxml:
     - name: lxml
     - bin_env: /usr/bin/python3
     - require:
-      - sls: sift.python3-packages.pip
+      - sls: sift.python3-packages.core
       - sls: sift.packages.libxml2-dev
       - sls: sift.packages.libxslt-dev

sift/python3-packages/machinae.sls

@@ -1,13 +1,13 @@
 # WEBSITE: https://github.com/HurricaneLabs/machinae
 # LICENSE: MIT
 include:
-  - sift.python3-packages.pip
+  - sift.python3-packages.core
   - sift.python3-packages.defang
 
 sift-python3-packages-machinae:
   pip.installed:
     - name: machinae
     - bin_env: /usr/bin/python3
     - require:
-      - sls: sift.python3-packages.pip
+      - sls: sift.python3-packages.core
       - sls: sift.python3-packages.defang

sift/python3-packages/pefile.sls

@@ -1,10 +1,10 @@
 include:
-  - sift.python3-packages.pip
+  - sift.python3-packages.core
 
 sift-python3-packages-pefile:
   pip.installed:
     - name: pefile
     - bin_env: /usr/bin/python3
     - require:
-      - sls: sift.python3-packages.pip
+      - sls: sift.python3-packages.core
 

sift/python3-packages/pillow.sls

@@ -1,9 +1,9 @@
 include:
-  - sift.python3-packages.pip
+  - sift.python3-packages.core
 
 sift-python3-packages-pillow:
   pip.installed:
     - name: pillow
     - bin_env: /usr/bin/python3
     - require:
-      - sls: sift.python3-packages.pip
+      - sls: sift.python3-packages.core

sift/python3-packages/pyhindsight.sls

@@ -1,6 +1,5 @@
 include:
-  - sift.python3-packages.pip
-  - sift.python3-packages.setuptools
+  - sift.python3-packages.core
   - sift.python3-packages.setuptools-rust
   - sift.python3-packages.keyrings-alt
 
@@ -9,8 +8,7 @@ sift-python3-packages-pyhindsight:
     - name: pyhindsight
     - bin_env: /usr/bin/python3
     - require:
-      - sls: sift.python3-packages.pip
-      - sls: sift.python3-packages.setuptools
+      - sls: sift.python3-packages.core
       - sls: sift.python3-packages.setuptools-rust
       - sls: sift.python3-packages.keyrings-alt
 

sift/python3-packages/python-dateutil.sls

@@ -1,9 +1,9 @@
 include:
-  - sift.python3-packages.pip
+  - sift.python3-packages.core
 
 sift-python3-packages-python-dateutil:
   pip.installed:
     - name: python-dateutil
     - bin_env: /usr/bin/python3
     - require:
-      - sls: sift.python3-packages.pip
+      - sls: sift.python3-packages.core

sift/python3-packages/python-evtx.sls

@@ -7,13 +7,13 @@
 # Notes: evtx_dates.py, evtx_dump.py, evtx_dump_chunk_slack.py, evtx_dump_json.py, evtx_info.py
 
 include:
-  - sift.python3-packages.pip
+  - sift.python3-packages.core
   - sift.packages.git
 
 sift-python3-packages-python-evtx:
   pip.installed:
     - name: git+https://github.com/williballenthin/python-evtx.git
     - bin_env: /usr/bin/python3
     - require:
-      - sls: sift.python3-packages.pip
+      - sls: sift.python3-packages.core
       - sls: sift.packages.git

sift/python3-packages/python-magic.sls

@@ -1,9 +1,9 @@
 include:
-  - sift.python3-packages.pip
+  - sift.python3-packages.core
 
 sift-python3-packages-python-magic:
   pip.installed:
     - name: python-magic
     - bin_env: /usr/bin/python3
     - require:
-      - sls: sift.python3-packages.pip
+      - sls: sift.python3-packages.core

sift/python3-packages/python-registry.sls

@@ -1,9 +1,9 @@
 include:
-  - sift.python3-packages.pip
+  - sift.python3-packages.core
 
 sift-python3-packages-python-registry:
   pip.installed:
     - name: python-registry
     - bin_env: /usr/bin/python3
     - require:
-      - sls: sift.python3-packages.pip
+      - sls: sift.python3-packages.core

sift/python3-packages/setuptools-rust.sls

@@ -1,9 +1,9 @@
 include:
-  - sift.python3-packages.pip
+  - sift.python3-packages.core
 
 sift-python3-packages-setuptools-rust:
   pip.installed:
     - name: setuptools_rust
     - bin_env: /usr/bin/python3
     - require:
-      - sls: sift.python3-packages.pip
+      - sls: sift.python3-packages.core

sift/python3-packages/six.sls

@@ -1,9 +1,10 @@
 include:
-  - sift.python3-packages.pip
+  - sift.python3-packages.core
 
 sift-python3-packages-six:
   pip.installed:
     - name: six
     - bin_env: /usr/bin/python3
     - require:
-      - sls: sift.python3-packages.pip
+      - sls: sift.python3-packages.core
+

sift/python3-packages/stix-validator.sls

@@ -1,11 +1,11 @@
 include:
-  - sift.python3-packages.pip
+  - sift.python3-packages.core
   - sift.python3-packages.stix
 
 sift-python3-packages-stix-validator:
   pip.installed:
     - name: stix-validator
     - bin_env: /usr/bin/python3
     - require:
-      - sls: sift.python3-packages.pip
+      - sls: sift.python3-packages.core
       - sls: sift.python3-packages.stix

sift/python3-packages/stix.sls

@@ -1,11 +1,11 @@
 include:
-  - sift.python3-packages.pip
+  - sift.python3-packages.core
   - sift.python3-packages.lxml
 
 sift-python3-packages-stix:
   pip.installed:
     - name: stix
     - bin_env: /usr/bin/python3
     - require:
-      - sls: sift.python3-packages.pip
+      - sls: sift.python3-packages.core
       - sls: sift.python3-packages.lxml

sift/python3-packages/upgrade.sls

@@ -1,26 +1,5 @@
-argparse.sls:    - upgrade: True
-bitstring.sls:    - upgrade: True
-colorama.sls:    - upgrade: True
-geoip2.sls:    - upgrade: True
-ioc_writer.sls:    - upgrade: True
-lxml.sls:    - upgrade: True
-pefile.sls:    - upgrade: True
-pillow.sls:    - upgrade: True
-pyhindsight.sls:    - upgrade: True
-python-dateutil.sls:    - upgrade: True
-python-evtx.sls:    - upgrade: True
-python-magic.sls:    - upgrade: True
-python-registry.sls:    - upgrade: True
-setuptools.sls:    - upgrade: True
-six.sls:    - upgrade: True
-stix-validator.sls:    - upgrade: True
-stix.sls:    - upgrade: True
-virustotal-api.sls:    - upgrade: True
-wheel.sls:    - upgrade: True
-yara-python.sls:    - upgrade: True
-
 include:
-  - sift.python3-packages.pip
+  - sift.python3-packages.core
   - sift.python3-packages.argparse
   - sift.python3-packages.bitstring
   - sift.python3-packages.colorama
@@ -47,7 +26,7 @@ sift-python3-packages-upgrade:
   cmd.run:
     - name: /usr/bin/python3 -m pip install --upgrade argparse bitstring colorama geoip2 ioc_writer lxml pefile pillow pyhindsight python-dateutil python-evtx python-magic python-registry setuptools setuptools_rust six stix-validator stix virustotal-api wheel yara-python pip
     - require:
-      - sls: sift.python3-packages.pip
+      - sls: sift.python3-packages.core
       - sls: sift.python3-packages.argparse
       - sls: sift.python3-packages.bitstring
       - sls: sift.python3-packages.colorama

sift/python3-packages/virustotal-api.sls

@@ -1,9 +1,9 @@
 include:
-  - sift.python3-packages.pip
+  - sift.python3-packages.core
 
 sift-python3-packages-virustotal-api:
   pip.installed:
     - name: virustotal-api
     - bin_env: /usr/bin/python3
     - require:
-      - sls: sift.python3-packages.pip
+      - sls: sift.python3-packages.core

sift/python3-packages/yara-python.sls

@@ -1,9 +1,9 @@
 include:
-  - sift.python3-packages.pip
+  - sift.python3-packages.core
 
 sift-python3-packages-yara-python:
   pip.installed:
     - name: yara-python
     - bin_env: /usr/bin/python3
     - require:
-      - sls: sift.python3-packages.pip
+      - sls: sift.python3-packages.core