Skip to content

Commit db02af6

Browse files
committed
Optimize build
1 parent f287ede commit db02af6

10 files changed

Lines changed: 174 additions & 171 deletions

File tree

.github/workflows/test-package.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ jobs:
5858
python-version: ${{ matrix.python-version }}
5959

6060
- name: Install poetry
61-
run: python -m pip install poetry
61+
run: python -m pip install poetry poetry-plugin-bundle poetry-plugin-export
6262

6363
- name: Install dependencies
6464
run: poetry install --with test -E all

misp_modules/modules/expansion/docx_enrich.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
import json
44

55
import docx
6-
import np
6+
import numpy as np
77

88
misperrors = {"error": "Error"}
99
mispattributes = {"input": ["attachment"], "output": ["freetext", "text"]}

misp_modules/modules/expansion/ocr_enrich.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
import json
33

44
import cv2
5-
import np
5+
import numpy as np
66
import pytesseract
77

88
misperrors = {"error": "Error"}

misp_modules/modules/expansion/ods_enrich.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
import logging
55

66
import ezodf
7-
import np
7+
import numpy as np
88
import pandas_ods_reader
99

1010
misperrors = {"error": "Error"}

misp_modules/modules/expansion/odt_enrich.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
import io
33
import json
44

5-
import np
5+
import numpy as np
66
from ODTReader.odtreader import odtToText
77

88
misperrors = {"error": "Error"}

misp_modules/modules/expansion/pdf_enrich.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
import io
33
import json
44

5-
import np
5+
import numpy as np
66
import pdftotext
77

88
misperrors = {"error": "Error"}

misp_modules/modules/expansion/pptx_enrich.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
import io
33
import json
44

5-
import np
5+
import numpy as np
66
from pptx import Presentation
77

88
misperrors = {"error": "Error"}

misp_modules/modules/expansion/xlsx_enrich.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
import io
33
import json
44

5-
import np
5+
import numpy as np
66
import pandas
77

88
misperrors = {"error": "Error"}

poetry.lock

Lines changed: 159 additions & 158 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pyproject.toml

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ classifiers = [
1515
"Programming Language :: Python :: 3",
1616
"Topic :: Security",
1717
]
18-
requires-python = ">=3.10,<3.15"
18+
requires-python = ">=3.10"
1919
dependencies = [
2020
## core dependencies
2121
"orjson>=3.11.9",
@@ -75,8 +75,8 @@ all = [
7575
"censys==2.0.9", ## in minimal
7676
"socialscan<2.0.0", ## in minimal
7777
"yara-python==4.5.0", ## in minimal
78-
"numpy>=1.26.4,<2.0.0",
79-
"pandas>=2.0.0",
78+
"numpy>=2.0.0",
79+
"pandas>=2.0.0,<3.0.0",
8080
"pandas_ods_reader>=1.0.0",
8181
"lief>=0.17.6", # required for python >3.13
8282
"lxml>=6.1.1", # required for python >3.13
@@ -99,7 +99,6 @@ all = [
9999
"misp-stix>=2026.6.1",
100100
"mwdblib",
101101
"ndjson", ## in minimal
102-
"np",
103102
"oauth2", ## in minimal
104103
"opencv-python",
105104
"openpyxl",
@@ -151,8 +150,11 @@ misp-modules = "misp_modules.__main__:main"
151150
[tool.poetry]
152151
packages = [{include = "misp_modules"}]
153152

153+
[tool.poetry.dependencies]
154+
python = ">=3.10,<4.0"
155+
154156
[build-system]
155-
requires = ["poetry-core>=2.0"]
157+
requires = ["poetry-core>=2.0.0,<3.0.0"]
156158
build-backend = "poetry.core.masonry.api"
157159

158160
[tool.poetry.group.test]

0 commit comments

Comments
 (0)