diff --git a/sift/python3-packages/analyzemft.sls b/sift/python3-packages/analyzemft.sls index 2dba36c..0395982 100644 --- a/sift/python3-packages/analyzemft.sls +++ b/sift/python3-packages/analyzemft.sls @@ -1,5 +1,5 @@ include: - - sift.packages.python3-pip + - sift.python3-packages.core analyzemft: pip.installed: @@ -7,4 +7,4 @@ analyzemft: - bin_env: /usr/bin/python3 - upgrade: True - require: - - sls: sift.packages.python3-pip + - sls: sift.python3-packages.core diff --git a/sift/python3-packages/argparse.sls b/sift/python3-packages/argparse.sls index c322640..1921d08 100644 --- a/sift/python3-packages/argparse.sls +++ b/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 diff --git a/sift/python3-packages/bitstring.sls b/sift/python3-packages/bitstring.sls index 3f0eb9b..7d5ca3b 100644 --- a/sift/python3-packages/bitstring.sls +++ b/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 diff --git a/sift/python3-packages/colorama.sls b/sift/python3-packages/colorama.sls index 57033ee..2b985b2 100644 --- a/sift/python3-packages/colorama.sls +++ b/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 diff --git a/sift/python3-packages/core.sls b/sift/python3-packages/core.sls new file mode 100644 index 0000000..3b4cd89 --- /dev/null +++ b/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 diff --git a/sift/python3-packages/defang.sls b/sift/python3-packages/defang.sls index 484ffed..74e31cb 100644 --- a/sift/python3-packages/defang.sls +++ b/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 diff --git a/sift/python3-packages/geoip2.sls b/sift/python3-packages/geoip2.sls index cfb7349..0d4224a 100644 --- a/sift/python3-packages/geoip2.sls +++ b/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 diff --git a/sift/python3-packages/ijson.sls b/sift/python3-packages/ijson.sls index 75ad193..7558c4e 100644 --- a/sift/python3-packages/ijson.sls +++ b/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 diff --git a/sift/python3-packages/imagemounter.sls b/sift/python3-packages/imagemounter.sls index 107c965..478aab0 100644 --- a/sift/python3-packages/imagemounter.sls +++ b/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 diff --git a/sift/python3-packages/ioc_writer.sls b/sift/python3-packages/ioc_writer.sls index 443c3e0..0c27174 100644 --- a/sift/python3-packages/ioc_writer.sls +++ b/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 diff --git a/sift/python3-packages/keyrings-alt.sls b/sift/python3-packages/keyrings-alt.sls index 6761c66..6f96b9b 100644 --- a/sift/python3-packages/keyrings-alt.sls +++ b/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 diff --git a/sift/python3-packages/lxml.sls b/sift/python3-packages/lxml.sls index 98bd67f..af9c360 100644 --- a/sift/python3-packages/lxml.sls +++ b/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 diff --git a/sift/python3-packages/machinae.sls b/sift/python3-packages/machinae.sls index 5203d7d..8a43b89 100644 --- a/sift/python3-packages/machinae.sls +++ b/sift/python3-packages/machinae.sls @@ -1,7 +1,7 @@ # 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: @@ -9,5 +9,5 @@ sift-python3-packages-machinae: - name: machinae - bin_env: /usr/bin/python3 - require: - - sls: sift.python3-packages.pip + - sls: sift.python3-packages.core - sls: sift.python3-packages.defang diff --git a/sift/python3-packages/pefile.sls b/sift/python3-packages/pefile.sls index 2602c40..ef69bdb 100644 --- a/sift/python3-packages/pefile.sls +++ b/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 diff --git a/sift/python3-packages/pillow.sls b/sift/python3-packages/pillow.sls index 5c5cfbe..6bc3c3e 100644 --- a/sift/python3-packages/pillow.sls +++ b/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 diff --git a/sift/python3-packages/pyhindsight.sls b/sift/python3-packages/pyhindsight.sls index 1d6173a..9aab70f 100644 --- a/sift/python3-packages/pyhindsight.sls +++ b/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 diff --git a/sift/python3-packages/python-dateutil.sls b/sift/python3-packages/python-dateutil.sls index b347a7d..33f989a 100644 --- a/sift/python3-packages/python-dateutil.sls +++ b/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 diff --git a/sift/python3-packages/python-evtx.sls b/sift/python3-packages/python-evtx.sls index cde132c..23a8c23 100644 --- a/sift/python3-packages/python-evtx.sls +++ b/sift/python3-packages/python-evtx.sls @@ -7,7 +7,7 @@ # 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: @@ -15,5 +15,5 @@ sift-python3-packages-python-evtx: - 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 diff --git a/sift/python3-packages/python-magic.sls b/sift/python3-packages/python-magic.sls index 2c88fff..f83ab01 100644 --- a/sift/python3-packages/python-magic.sls +++ b/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 diff --git a/sift/python3-packages/python-registry.sls b/sift/python3-packages/python-registry.sls index e8c3ab7..5024633 100644 --- a/sift/python3-packages/python-registry.sls +++ b/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 diff --git a/sift/python3-packages/setuptools-rust.sls b/sift/python3-packages/setuptools-rust.sls index 439c162..97b31ab 100644 --- a/sift/python3-packages/setuptools-rust.sls +++ b/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 diff --git a/sift/python3-packages/six.sls b/sift/python3-packages/six.sls index 43f7c2a..45fdb73 100644 --- a/sift/python3-packages/six.sls +++ b/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 + diff --git a/sift/python3-packages/stix-validator.sls b/sift/python3-packages/stix-validator.sls index e9e8d55..f840a90 100644 --- a/sift/python3-packages/stix-validator.sls +++ b/sift/python3-packages/stix-validator.sls @@ -1,5 +1,5 @@ include: - - sift.python3-packages.pip + - sift.python3-packages.core - sift.python3-packages.stix sift-python3-packages-stix-validator: @@ -7,5 +7,5 @@ sift-python3-packages-stix-validator: - name: stix-validator - bin_env: /usr/bin/python3 - require: - - sls: sift.python3-packages.pip + - sls: sift.python3-packages.core - sls: sift.python3-packages.stix diff --git a/sift/python3-packages/stix.sls b/sift/python3-packages/stix.sls index fd1c2f0..eb94e49 100644 --- a/sift/python3-packages/stix.sls +++ b/sift/python3-packages/stix.sls @@ -1,5 +1,5 @@ include: - - sift.python3-packages.pip + - sift.python3-packages.core - sift.python3-packages.lxml sift-python3-packages-stix: @@ -7,5 +7,5 @@ sift-python3-packages-stix: - name: stix - bin_env: /usr/bin/python3 - require: - - sls: sift.python3-packages.pip + - sls: sift.python3-packages.core - sls: sift.python3-packages.lxml diff --git a/sift/python3-packages/upgrade.sls b/sift/python3-packages/upgrade.sls index ae8a445..2be4c2e 100644 --- a/sift/python3-packages/upgrade.sls +++ b/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 diff --git a/sift/python3-packages/virustotal-api.sls b/sift/python3-packages/virustotal-api.sls index 580cc85..952eeef 100644 --- a/sift/python3-packages/virustotal-api.sls +++ b/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 diff --git a/sift/python3-packages/yara-python.sls b/sift/python3-packages/yara-python.sls index 382cded..9e6affb 100644 --- a/sift/python3-packages/yara-python.sls +++ b/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