Skip to content

Commit 23aab36

Browse files
ostefanoostefano
committed
Upgrade to poetry2
1 parent 93d8e35 commit 23aab36

8 files changed

Lines changed: 609 additions & 554 deletions

File tree

‎.github/workflows/release-package.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ jobs:
107107
run: python -m pip install poetry
108108

109109
- name: Install dependencies
110-
run: poetry install --with unstable
110+
run: poetry install --extras "unstable"
111111

112112
- name: Build package
113113
run: poetry build

‎.github/workflows/test-package.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ jobs:
5656
run: python -m pip install poetry
5757

5858
- name: Install dependencies
59-
run: poetry install --with test,unstable
59+
run: poetry install --with test --extras "unstable"
6060

6161
- name: Build package
6262
run: poetry build

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,3 +24,4 @@ venv*
2424
*.sqlite
2525
website/conf/config.cfg
2626
wheels
27+
requirements.txt

‎Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ USE_DOCKER ?=
1717

1818
prepare_docs:
1919
@echo "Preparing documentation."
20-
poetry install --with docs,unstable
20+
poetry install --with docs --extras "unstable"
2121
poetry run python $(DOCS_SRC_DIR)/generate_documentation.py
2222
mkdir -p $(DOCS_DIST_DIR)/logos
2323
mkdir -p $(DOCS_DIST_DIR)/img

‎documentation/README.md‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3788,6 +3788,10 @@ Import content from a TAXII 2.1 server
37883788
- **config**:
37893789
>stix_object_limit
37903790

3791+
- **requirements**:
3792+
> - misp-lib-stix2
3793+
> - misp-stix
3794+
37913795
-----
37923796

37933797
#### [ThreadAnalyzer Sandbox Import](https://github.com/MISP/misp-modules/tree/main/misp_modules/modules/import_mod/threatanalyzer_import.py)

‎documentation/mkdocs/import_mod.md‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -245,6 +245,10 @@ Import content from a TAXII 2.1 server
245245
- **config**:
246246
>stix_object_limit
247247
248+
- **requirements**:
249+
> - misp-lib-stix2
250+
> - misp-stix
251+
248252
-----
249253

250254
#### [ThreadAnalyzer Sandbox Import](https://github.com/MISP/misp-modules/tree/main/misp_modules/modules/import_mod/threatanalyzer_import.py)

‎poetry.lock‎

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

‎pyproject.toml‎

Lines changed: 122 additions & 104 deletions
Original file line numberDiff line numberDiff line change
@@ -1,107 +1,131 @@
1-
[build-system]
2-
requires = ["poetry-core>=1.0.0"]
3-
build-backend = "poetry.core.masonry.api"
4-
5-
[tool.poetry]
1+
[project]
62
name = "misp-modules"
7-
version = "2.4.199"
3+
version = "2.4.200"
84
description = "MISP modules are autonomous modules that can be used for expansion and other services in MISP"
9-
authors = ["Alexandre Dulaunoy <alexandre.dulaunoy@circl.lu>"]
5+
authors = [
6+
{name = "Alexandre Dulaunoy", email = "alexandre.dulaunoy@circl.lu"}
7+
]
108
license = "AGPL-3.0-only"
11-
repository = "https://github.com/MISP/misp-modules"
12-
documentation = "https://misp.github.io/misp-modules"
139
readme = "README.md"
14-
classifiers=[
15-
'License :: OSI Approved :: GNU Affero General Public License v3',
16-
'Development Status :: 5 - Production/Stable',
17-
'Environment :: Console',
18-
'Intended Audience :: Science/Research',
19-
'Programming Language :: Python :: 3',
20-
'Topic :: Security',
10+
classifiers = [
11+
"License :: OSI Approved :: GNU Affero General Public License v3",
12+
"Development Status :: 5 - Production/Stable",
13+
"Environment :: Console",
14+
"Intended Audience :: Science/Research",
15+
"Programming Language :: Python :: 3",
16+
"Topic :: Security",
17+
]
18+
requires-python = ">=3.9.*,<3.13"
19+
dependencies = [
20+
"psutil",
21+
"pyparsing",
22+
"redis",
23+
"tornado",
24+
"urllib3>=1.26,<2",
25+
## module dependencies (if a dependency fails loading with '*', pin it here)
26+
"censys==2.0.9",
27+
"socialscan<2.0.0",
28+
"yara-python==4.5.0",
29+
"numpy>=1.26.4,<2.0.0",
30+
"pandas>=2.0.0",
31+
"pandas_ods_reader>=1.0.0",
32+
## module dependencies
33+
"apiosintds",
34+
"assemblyline_client",
35+
"backscatter",
36+
"blockchain",
37+
"clamd",
38+
"crowdstrike-falconpy",
39+
"dnsdb2",
40+
"domaintools_api",
41+
"geoip2",
42+
"greynoise",
43+
"jbxapi",
44+
"maclookup",
45+
"markdownify",
46+
"matplotlib",
47+
"mattermostdriver",
48+
"misp-lib-stix2>=3.0.1.2",
49+
"misp-stix>=2025.1.10",
50+
"mwdblib",
51+
"ndjson",
52+
"np",
53+
"oauth2",
54+
"opencv-python",
55+
"openpyxl",
56+
"pandoc",
57+
"passivetotal",
58+
"pdftotext",
59+
"pycountry",
60+
"pyeti-python3",
61+
"pyeupi",
62+
"pyfaup",
63+
"pygeoip",
64+
"pyintel471",
65+
"pyipasnhistory",
66+
"pymisp[fileobjects, openioc, pdfexport, email, url]",
67+
"pypdns",
68+
"pypssl",
69+
"pysafebrowsing",
70+
"pytesseract",
71+
"python-docx",
72+
"python-pptx",
73+
"pyzbar",
74+
"requests[security]",
75+
"setuptools",
76+
"shodan",
77+
"sigmatools",
78+
"sigmf",
79+
"slack-sdk",
80+
"sparqlwrapper",
81+
"tau-clients",
82+
"taxii2-client",
83+
"urlarchiver",
84+
"vt-graph-api",
85+
"vt-py",
86+
"vulners",
87+
"vysion",
88+
"wand",
89+
"xlrd",
2190
]
22-
packages = [{include = "misp_modules"}]
2391

24-
[tool.poetry.urls]
25-
"Bug Tracker" = "https://github.com/MISP/misp-modules/issues"
26-
"Source" = "https://github.com/MISP/misp-modules"
92+
[project.urls]
93+
Issues = "https://github.com/MISP/misp-modules/issues"
94+
Homepage = "https://github.com/MISP/misp-modules"
95+
Documentation = "https://misp.github.io/misp-modules"
96+
Repository = "https://github.com/MISP/misp-modules"
2797

28-
[tool.poetry.scripts]
98+
[project.scripts]
2999
misp-modules = "misp_modules:main"
30100

31-
[tool.poetry.dependencies]
32-
## platform (pin this to your python version, for 'poetry export' to work)
33-
python = ">=3.9.*,<3.13"
34-
## core dependencies
35-
psutil = "*"
36-
pyparsing = "*"
37-
redis = "*"
38-
tornado = "*"
39-
urllib3 = ">=1.26,<2"
40-
## module dependencies (if a dependency fails loading with '*', pin it here)
41-
censys = "2.0.9"
42-
socialscan = "<2.0.0"
43-
yara-python = "4.5.0"
44-
numpy = ">=1.26.4,<2.0.0"
45-
pandas = ">=2.0.0"
46-
pandas_ods_reader = ">=1.0.0"
47-
## module dependencies
48-
apiosintds = "*"
49-
assemblyline_client = "*"
50-
backscatter = "*"
51-
blockchain = "*"
52-
clamd = "*"
53-
crowdstrike-falconpy = "*"
54-
dnsdb2 = "*"
55-
domaintools_api = "*"
56-
geoip2 = "*"
57-
greynoise = "*"
58-
jbxapi = "*"
59-
maclookup = "*"
60-
markdownify = "*"
61-
matplotlib = "*"
62-
mattermostdriver = "*"
63-
misp-lib-stix2 = "^3.0.1.2"
64-
misp-stix = "^2025.1.10"
65-
mwdblib = "*"
66-
ndjson = "*"
67-
np = "*"
68-
oauth2 = "*"
69-
opencv-python = "*"
70-
openpyxl = "*"
71-
pandoc = "*"
72-
passivetotal = "*"
73-
pdftotext = "*"
74-
pycountry = "*"
75-
pyeti-python3 = "*"
76-
pyeupi = "*"
77-
pyfaup = "*"
78-
pygeoip = "*"
79-
pyintel471 = "*"
80-
pyipasnhistory = "*"
81-
pymisp = { version = "*", extras = ["fileobjects", "openioc", "pdfexport", "email", "url"] }
82-
pypdns = "*"
83-
pypssl = "*"
84-
pysafebrowsing = "*"
85-
pytesseract = "*"
86-
python-docx = "*"
87-
python-pptx = "*"
88-
pyzbar = "*"
89-
requests = { version = "*", extras = ["security"] }
90-
setuptools = "*"
91-
shodan = "*"
92-
sigmatools = "*"
93-
sigmf = "*"
94-
slack-sdk = "*"
95-
sparqlwrapper = "*"
96-
tau-clients = "*"
97-
taxii2-client = "*"
98-
urlarchiver = "*"
99-
vt-graph-api = "*"
100-
vt-py = "*"
101-
vulners = "*"
102-
vysion = "*"
103-
wand = "*"
104-
xlrd = "*"
101+
[dependency-groups]
102+
test = [
103+
"codecov",
104+
"flake8",
105+
"nose",
106+
"pytest",
107+
]
108+
docs = [
109+
"mkdocs",
110+
"mkdocs-material",
111+
"markdown_include",
112+
]
113+
114+
[project.optional-dependencies]
115+
unstable = [
116+
"odtreader@git+https://github.com/cartertemm/ODTReader.git",
117+
"google-search-api@git+https://github.com/abenassi/Google-Search-API",
118+
"trustar@git+https://github.com/SteveClement/trustar-python.git",
119+
"pydnstrails@git+https://github.com/sebdraven/pydnstrails.git",
120+
"pyonyphe@git+https://github.com/sebdraven/pyonyphe.git",
121+
]
122+
123+
[tool.poetry]
124+
packages = [{include = "misp_modules"}]
125+
126+
[build-system]
127+
requires = ["poetry-core>=2.0"]
128+
build-backend = "poetry.core.masonry.api"
105129

106130
[tool.poetry.group.test]
107131
optional = true
@@ -120,12 +144,6 @@ mkdocs = "*"
120144
mkdocs-material = "*"
121145
markdown_include = "*"
122146

123-
[tool.poetry.group.unstable]
124-
optional = true
125-
126-
[tool.poetry.group.unstable.dependencies]
127-
odtreader = { git = "https://github.com/cartertemm/ODTReader.git" }
128-
google-search-api = { git = "https://github.com/abenassi/Google-Search-API" }
129-
trustar = { git = "https://github.com/SteveClement/trustar-python.git" }
130-
pydnstrails = { git = "https://github.com/sebdraven/pydnstrails.git" }
131-
pyonyphe = { git = "https://github.com/sebdraven/pyonyphe.git" }
147+
[tool.poetry.requires-plugins]
148+
poetry-plugin-bundle = ">=1.6"
149+
poetry-plugin-export = ">=1.9"

0 commit comments

Comments
 (0)