Upgrade to poetry2

.github/workflows/release-package.yml

@@ -107,7 +107,7 @@ jobs:
         run: python -m pip install poetry
 
       - name: Install dependencies
-        run: poetry install --with unstable
+        run: poetry install --extras "unstable"
 
       - name: Build package
         run: poetry build

.github/workflows/test-package.yml

@@ -56,7 +56,7 @@ jobs:
         run: python -m pip install poetry
 
       - name: Install dependencies
-        run: poetry install --with test,unstable
+        run: poetry install --with test --extras "unstable"
 
       - name: Build package
         run: poetry build

.gitignore

@@ -24,3 +24,4 @@ venv*
 *.sqlite
 website/conf/config.cfg
 wheels
+requirements.txt

Makefile

@@ -17,7 +17,7 @@ USE_DOCKER ?=
 
 prepare_docs:
 	@echo "Preparing documentation."
-	poetry install --with docs,unstable
+	poetry install --with docs --extras "unstable"
 	poetry run python $(DOCS_SRC_DIR)/generate_documentation.py
 	mkdir -p $(DOCS_DIST_DIR)/logos
 	mkdir -p $(DOCS_DIST_DIR)/img

documentation/README.md

@@ -3788,6 +3788,10 @@ Import content from a TAXII 2.1 server
 - **config**:
 >stix_object_limit
 
+- **requirements**:
+> - misp-lib-stix2
+> - misp-stix
+
 -----
 
 #### [ThreadAnalyzer Sandbox Import](https://github.com/MISP/misp-modules/tree/main/misp_modules/modules/import_mod/threatanalyzer_import.py)

documentation/mkdocs/import_mod.md

@@ -245,6 +245,10 @@ Import content from a TAXII 2.1 server
 - **config**:
 >stix_object_limit
 
+- **requirements**:
+> - misp-lib-stix2
+> - misp-stix
+
 -----
 
 #### [ThreadAnalyzer Sandbox Import](https://github.com/MISP/misp-modules/tree/main/misp_modules/modules/import_mod/threatanalyzer_import.py)

pyproject.toml

@@ -1,107 +1,131 @@
-[build-system]
-requires = ["poetry-core>=1.0.0"]
-build-backend = "poetry.core.masonry.api"
-
-[tool.poetry]
+[project]
 name = "misp-modules"
-version = "2.4.199"
+version = "2.4.200"
 description = "MISP modules are autonomous modules that can be used for expansion and other services in MISP"
-authors = ["Alexandre Dulaunoy <[email protected]>"]
+authors = [
+    {name = "Alexandre Dulaunoy", email = "[email protected]"}
+]
 license = "AGPL-3.0-only"
-repository = "https://github.com/MISP/misp-modules"
-documentation = "https://misp.github.io/misp-modules"
 readme = "README.md"
-classifiers=[
-    'License :: OSI Approved :: GNU Affero General Public License v3',
-    'Development Status :: 5 - Production/Stable',
-    'Environment :: Console',
-    'Intended Audience :: Science/Research',
-    'Programming Language :: Python :: 3',
-    'Topic :: Security',
+classifiers = [
+    "License :: OSI Approved :: GNU Affero General Public License v3",
+    "Development Status :: 5 - Production/Stable",
+    "Environment :: Console",
+    "Intended Audience :: Science/Research",
+    "Programming Language :: Python :: 3",
+    "Topic :: Security",
+]
+requires-python = ">=3.9.*,<3.13"
+dependencies = [
+    "psutil",
+    "pyparsing",
+    "redis",
+    "tornado",
+    "urllib3>=1.26,<2",
+    ## module dependencies (if a dependency fails loading with '*', pin it here)
+    "censys==2.0.9",
+    "socialscan<2.0.0",
+    "yara-python==4.5.0",
+    "numpy>=1.26.4,<2.0.0",
+    "pandas>=2.0.0",
+    "pandas_ods_reader>=1.0.0",
+    ## module dependencies
+    "apiosintds",
+    "assemblyline_client",
+    "backscatter",
+    "blockchain",
+    "clamd",
+    "crowdstrike-falconpy",
+    "dnsdb2",
+    "domaintools_api",
+    "geoip2",
+    "greynoise",
+    "jbxapi",
+    "maclookup",
+    "markdownify",
+    "matplotlib",
+    "mattermostdriver",
+    "misp-lib-stix2>=3.0.1.2",
+    "misp-stix>=2025.1.10",
+    "mwdblib",
+    "ndjson",
+    "np",
+    "oauth2",
+    "opencv-python",
+    "openpyxl",
+    "pandoc",
+    "passivetotal",
+    "pdftotext",
+    "pycountry",
+    "pyeti-python3",
+    "pyeupi",
+    "pyfaup",
+    "pygeoip",
+    "pyintel471",
+    "pyipasnhistory",
+    "pymisp[fileobjects, openioc, pdfexport, email, url]",
+    "pypdns",
+    "pypssl",
+    "pysafebrowsing",
+    "pytesseract",
+    "python-docx",
+    "python-pptx",
+    "pyzbar",
+    "requests[security]",
+    "setuptools",
+    "shodan",
+    "sigmatools",
+    "sigmf",
+    "slack-sdk",
+    "sparqlwrapper",
+    "tau-clients",
+    "taxii2-client",
+    "urlarchiver",
+    "vt-graph-api",
+    "vt-py",
+    "vulners",
+    "vysion",
+    "wand",
+    "xlrd",
 ]
-packages = [{include = "misp_modules"}]
 
-[tool.poetry.urls]
-"Bug Tracker" = "https://github.com/MISP/misp-modules/issues"
-"Source" = "https://github.com/MISP/misp-modules"
+[project.urls]
+Issues = "https://github.com/MISP/misp-modules/issues"
+Homepage = "https://github.com/MISP/misp-modules"
+Documentation = "https://misp.github.io/misp-modules"
+Repository = "https://github.com/MISP/misp-modules"
 
-[tool.poetry.scripts]
+[project.scripts]
 misp-modules = "misp_modules:main"
 
-[tool.poetry.dependencies]
-## platform (pin this to your python version, for 'poetry export' to work)
-python = ">=3.9.*,<3.13"
-## core dependencies
-psutil = "*"
-pyparsing = "*"
-redis = "*"
-tornado = "*"
-urllib3 = ">=1.26,<2"
-## module dependencies (if a dependency fails loading with '*', pin it here)
-censys = "2.0.9"
-socialscan = "<2.0.0"
-yara-python = "4.5.0"
-numpy = ">=1.26.4,<2.0.0"
-pandas = ">=2.0.0"
-pandas_ods_reader = ">=1.0.0"
-## module dependencies
-apiosintds = "*"
-assemblyline_client = "*"
-backscatter = "*"
-blockchain = "*"
-clamd = "*"
-crowdstrike-falconpy = "*"
-dnsdb2 = "*"
-domaintools_api = "*"
-geoip2 = "*"
-greynoise = "*"
-jbxapi = "*"
-maclookup = "*"
-markdownify = "*"
-matplotlib = "*"
-mattermostdriver = "*"
-misp-lib-stix2 = "^3.0.1.2"
-misp-stix = "^2025.1.10"
-mwdblib = "*"
-ndjson = "*"
-np = "*"
-oauth2 = "*"
-opencv-python = "*"
-openpyxl = "*"
-pandoc = "*"
-passivetotal = "*"
-pdftotext = "*"
-pycountry = "*"
-pyeti-python3 = "*"
-pyeupi = "*"
-pyfaup = "*"
-pygeoip = "*"
-pyintel471 = "*"
-pyipasnhistory = "*"
-pymisp = { version = "*", extras = ["fileobjects", "openioc", "pdfexport", "email", "url"] }
-pypdns = "*"
-pypssl = "*"
-pysafebrowsing = "*"
-pytesseract = "*"
-python-docx = "*"
-python-pptx = "*"
-pyzbar = "*"
-requests = { version = "*", extras = ["security"] }
-setuptools = "*"
-shodan = "*"
-sigmatools = "*"
-sigmf = "*"
-slack-sdk = "*"
-sparqlwrapper = "*"
-tau-clients = "*"
-taxii2-client = "*"
-urlarchiver = "*"
-vt-graph-api = "*"
-vt-py = "*"
-vulners = "*"
-vysion = "*"
-wand = "*"
-xlrd = "*"
+[dependency-groups]
+test = [
+    "codecov",
+    "flake8",
+    "nose",
+    "pytest",
+]
+docs = [
+    "mkdocs",
+    "mkdocs-material",
+    "markdown_include",
+]
+
+[project.optional-dependencies]
+unstable = [
+    "odtreader@git+https://github.com/cartertemm/ODTReader.git",
+    "google-search-api@git+https://github.com/abenassi/Google-Search-API",
+    "trustar@git+https://github.com/SteveClement/trustar-python.git",
+    "pydnstrails@git+https://github.com/sebdraven/pydnstrails.git",
+    "pyonyphe@git+https://github.com/sebdraven/pyonyphe.git",
+]
+
+[tool.poetry]
+packages = [{include = "misp_modules"}]
+
+[build-system]
+requires = ["poetry-core>=2.0"]
+build-backend = "poetry.core.masonry.api"
 
 [tool.poetry.group.test]
 optional = true
@@ -120,12 +144,6 @@ mkdocs = "*"
 mkdocs-material = "*"
 markdown_include = "*"
 
-[tool.poetry.group.unstable]
-optional = true
-
-[tool.poetry.group.unstable.dependencies]
-odtreader = { git = "https://github.com/cartertemm/ODTReader.git" }
-google-search-api = { git = "https://github.com/abenassi/Google-Search-API" }
-trustar = { git = "https://github.com/SteveClement/trustar-python.git" }
-pydnstrails = { git = "https://github.com/sebdraven/pydnstrails.git" }
-pyonyphe = { git = "https://github.com/sebdraven/pyonyphe.git" }
+[tool.poetry.requires-plugins]
+poetry-plugin-bundle = ">=1.6"
+poetry-plugin-export = ">=1.9"