maco 1.2.12__py3-none-any.whl → 1.2.14__py3-none-any.whl

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (8) hide show
  1. maco/utils.py +4 -2
  2. {maco-1.2.12.dist-info → maco-1.2.14.dist-info}/METADATA +1 -2
  3. {maco-1.2.12.dist-info → maco-1.2.14.dist-info}/RECORD +8 -8
  4. model_setup/maco/utils.py +4 -2
  5. {maco-1.2.12.dist-info → maco-1.2.14.dist-info}/LICENSE.md +0 -0
  6. {maco-1.2.12.dist-info → maco-1.2.14.dist-info}/WHEEL +0 -0
  7. {maco-1.2.12.dist-info → maco-1.2.14.dist-info}/entry_points.txt +0 -0
  8. {maco-1.2.12.dist-info → maco-1.2.14.dist-info}/top_level.txt +0 -0
maco/utils.py CHANGED
@@ -70,9 +70,11 @@ import sys
70
70
  import logging
71
71
 
72
72
  try:
73
- from maco import yara
74
- except:
73
+ # Respect cases where the extractor is tied to certain version of yara-python for processing
75
74
  import yara
75
+ except:
76
+ # Otherwise fallback to MACO's interface for yara-python==4.5.x
77
+ from maco import yara
76
78
 
77
79
  from base64 import b64encode
78
80
 
{maco-1.2.12.dist-info → maco-1.2.14.dist-info}/METADATA RENAMED
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.2
2
2
  Name: maco
3
- Version: 1.2.12
3
+ Version: 1.2.14
4
4
  Author: sl-govau
5
5
  Maintainer: cccs-rs
6
6
  License: MIT License
@@ -33,7 +33,6 @@ Requires-Dist: cart
33
33
  Requires-Dist: pydantic>=2.0.0
34
34
  Requires-Dist: tomli>=1.1.0; python_version < "3.11"
35
35
  Requires-Dist: uv
36
- Requires-Dist: yara-python
37
36
  Requires-Dist: yara-x==0.11.0
38
37
  Requires-Dist: multiprocess>=0.70.17
39
38
 
{maco-1.2.12.dist-info → maco-1.2.14.dist-info}/RECORD RENAMED
@@ -14,7 +14,7 @@ maco/cli.py,sha256=K9gjsyGXcmSqBSkRkertVTH-Z4mwGFVk7TQxx8Y2mXo,8937
14
14
  maco/collector.py,sha256=T1tGibakx-yfgHzrHC4mqY-G2Y-VhDz8Qx1KoXa7l0g,7752
15
15
  maco/exceptions.py,sha256=aUbkX9CZfgp1aZFTEa98Uwge6MeQcQ3LbYkgNOwWaCg,214
16
16
  maco/extractor.py,sha256=uGSGiCQ4jd8jFmfw2T99BGcY5iQJzXHcG_RoTIxClTE,2802
17
- maco/utils.py,sha256=bD2z6xZeR-MNhM834w2vQi4IP-kpQSXL-l71vmGweAU,21726
17
+ maco/utils.py,sha256=nkR2thG8g9wRFEQ31qJyEd0-ccc2S3kWt9xXj_dX2io,21891
18
18
  maco/yara.py,sha256=8RVaGyeUWY5f8_wfQ25lDX1bcXsb_VoSja85ZC2SqGw,2913
19
19
  maco/model/__init__.py,sha256=ULdyHx8R5D2ICHZo3VoCk1YTlewTok36TYIpwx__pNY,45
20
20
  maco/model/model.py,sha256=4uY88WphbP3iu-L2WjuYwtgZCS_wNul_hr0bAVuTpvc,23740
@@ -24,7 +24,7 @@ model_setup/maco/cli.py,sha256=K9gjsyGXcmSqBSkRkertVTH-Z4mwGFVk7TQxx8Y2mXo,8937
24
24
  model_setup/maco/collector.py,sha256=T1tGibakx-yfgHzrHC4mqY-G2Y-VhDz8Qx1KoXa7l0g,7752
25
25
  model_setup/maco/exceptions.py,sha256=aUbkX9CZfgp1aZFTEa98Uwge6MeQcQ3LbYkgNOwWaCg,214
26
26
  model_setup/maco/extractor.py,sha256=uGSGiCQ4jd8jFmfw2T99BGcY5iQJzXHcG_RoTIxClTE,2802
27
- model_setup/maco/utils.py,sha256=bD2z6xZeR-MNhM834w2vQi4IP-kpQSXL-l71vmGweAU,21726
27
+ model_setup/maco/utils.py,sha256=nkR2thG8g9wRFEQ31qJyEd0-ccc2S3kWt9xXj_dX2io,21891
28
28
  model_setup/maco/yara.py,sha256=8RVaGyeUWY5f8_wfQ25lDX1bcXsb_VoSja85ZC2SqGw,2913
29
29
  model_setup/maco/model/__init__.py,sha256=ULdyHx8R5D2ICHZo3VoCk1YTlewTok36TYIpwx__pNY,45
30
30
  model_setup/maco/model/model.py,sha256=4uY88WphbP3iu-L2WjuYwtgZCS_wNul_hr0bAVuTpvc,23740
@@ -39,9 +39,9 @@ tests/extractors/basic_longer.py,sha256=1ClU2QD-Y0TOl_loNFvEqIEpTR5TSVJ6zg9ZmC-E
39
39
  tests/extractors/test_basic.py,sha256=FLKekfSGM69HaiF7Vu_7D7KDXHZko-9hZkMO8_DoyYA,697
40
40
  tests/extractors/bob/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
41
41
  tests/extractors/bob/bob.py,sha256=G5aOoz58J0ZQK2_lA7HRxAzeLzBxssWxBTZcv1pSbi8,176
42
- maco-1.2.12.dist-info/LICENSE.md,sha256=gMSjshPhXvV_F1qxmeNkKdBqGWkd__fEJf4glS504bM,1478
43
- maco-1.2.12.dist-info/METADATA,sha256=fQa29RHfFtLo3isR5emR5qEtpeTTTHwBk4EN1CWzyRs,15893
44
- maco-1.2.12.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
45
- maco-1.2.12.dist-info/entry_points.txt,sha256=TpcwG1gedIg8Y7a9ZOv8aQpuwEUftCefDrAjzeP-o6U,39
46
- maco-1.2.12.dist-info/top_level.txt,sha256=iMRwuzmrHA3zSwiSeMIl6FWhzRpn_st-I4fAv-kw5_o,49
47
- maco-1.2.12.dist-info/RECORD,,
42
+ maco-1.2.14.dist-info/LICENSE.md,sha256=gMSjshPhXvV_F1qxmeNkKdBqGWkd__fEJf4glS504bM,1478
43
+ maco-1.2.14.dist-info/METADATA,sha256=pefxFyOgEojoGC0J93SSimFDgw3oBlXDQQ0fcEiK6sU,15866
44
+ maco-1.2.14.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
45
+ maco-1.2.14.dist-info/entry_points.txt,sha256=TpcwG1gedIg8Y7a9ZOv8aQpuwEUftCefDrAjzeP-o6U,39
46
+ maco-1.2.14.dist-info/top_level.txt,sha256=iMRwuzmrHA3zSwiSeMIl6FWhzRpn_st-I4fAv-kw5_o,49
47
+ maco-1.2.14.dist-info/RECORD,,
model_setup/maco/utils.py CHANGED
@@ -70,9 +70,11 @@ import sys
70
70
  import logging
71
71
 
72
72
  try:
73
- from maco import yara
74
- except:
73
+ # Respect cases where the extractor is tied to certain version of yara-python for processing
75
74
  import yara
75
+ except:
76
+ # Otherwise fallback to MACO's interface for yara-python==4.5.x
77
+ from maco import yara
76
78
 
77
79
  from base64 import b64encode
78
80
 
{maco-1.2.12.dist-info → maco-1.2.14.dist-info}/WHEEL RENAMED
File without changes