WIP

.github/workflows/release-package.yml

@@ -18,14 +18,14 @@ jobs:
       - name: Install packages
         run: sudo apt-get install libpoppler-cpp-dev libzbar0 tesseract-ocr yara
 
-      - name: Install poetry
-        run: pipx install poetry
-
       - name: Set up Python 3.12
         uses: actions/setup-python@v5
         with:
           python-version: 3.12
 
+      - name: Install poetry
+        run: python -m pip install poetry
+
       - name: Install dependencies
         run: poetry install --with docs
 
@@ -49,37 +49,42 @@ jobs:
           name: python-package-distributions
           path: dist/
 
+  publish-to-pypi:
+    runs-on: ubuntu-latest
+    needs: build
+
+    permissions:
+      id-token: write
+
+    steps:
+    - name: Download dist files
+      uses: actions/download-artifact@v3
+      with:
+        name: python-package-distributions
+        path: dist/
+
+    - name: Publish to PyPI
+      uses: pypa/gh-action-pypi-publish@release/v1
+      with:
+         skip-existing: true
+         verbose: true
+         repository-url: https://test.pypi.org/legacy/
+
+  deploy-gh-pages:
+      runs-on: ubuntu-latest
+      needs: build
+
+      permissions:
+        pages: write
+        id-token: write
+
+      environment:
+        name: github-pages
+        url: ${{ steps.deployment.outputs.page_url }}
+
+      steps:
+        - name: Deploy to GitHub Pages
+          id: deployment
+          uses: actions/deploy-pages@v2
+
 
-#   publish-to-pypi:
-#     runs-on: ubuntu-latest
-#     needs: build
-# 
-#     steps:
-#       - name: Download dist files
-#         uses: actions/download-artifact@v3
-#         with:
-#           name: python-package-distributions
-#           path: dist/
-# 
-#       - name: Publish to PyPI
-#         uses: pypa/gh-action-pypi-publish@release/v1
-#         # with:
-#         #   repository-url: https://test.pypi.org/legacy/
-# 
-# 
-#   deploy-gh-pages:
-#     runs-on: ubuntu-latest
-#     needs: build
-# 
-#     permissions:
-#       pages: write
-#       id-token: write
-# 
-#     environment:
-#       name: github-pages
-#       url: ${{ steps.deployment.outputs.page_url }}
-# 
-#     steps:
-#       - name: Deploy to GitHub Pages
-#         id: deployment
-#         uses: actions/deploy-pages@v2

.github/workflows/test-package.yml

@@ -21,15 +21,15 @@ jobs:
       - name: Install packages
         run: sudo apt-get install libpoppler-cpp-dev libzbar0 tesseract-ocr yara
 
-      - name: Install poetry
-        run: pipx install poetry
-
       - name: Set up Python 3.12
         uses: actions/setup-python@v5
         with:
           python-version: 3.12
           cache: 'poetry'
 
+      - name: Install poetry
+        run: python -m pip install poetry
+
       - name: Install dependencies
         run: poetry install --with docs
 
@@ -51,16 +51,16 @@ jobs:
 
       - name: Install packages
         run: sudo apt-get install libpoppler-cpp-dev libzbar0 tesseract-ocr yara
-
-      - name: Install poetry
-        run: pipx install poetry
 
       - name: Set up Python ${{ matrix.python-version }}
         uses: actions/setup-python@v5
         with:
           python-version: ${{ matrix.python-version }}
           cache: 'poetry'
 
+      - name: Install poetry
+        run: python -m pip install poetry
+
       - name: Install dependencies
         run: poetry install --with test
 

README.md

@@ -1,6 +1,6 @@
 # MISP modules
 
-[![Build status](https://github.com/MISP/misp-modules/actions/workflows/python-package.yml/badge.svg)](https://github.com/MISP/misp-modules/actions/workflows/python-package.yml)[![Coverage Status](https://coveralls.io/repos/github/MISP/misp-modules/badge.svg?branch=main)](https://coveralls.io/github/MISP/misp-modules?branch=main)
+[![Build status](https://github.com/MISP/misp-modules/actions/workflows/python-package.yml/badge.svg)](https://github.com/MISP/misp-modules/actions/workflows/test-package.yml)[![Coverage Status](https://coveralls.io/repos/github/MISP/misp-modules/badge.svg?branch=main)](https://coveralls.io/github/MISP/misp-modules?branch=main)
 [![codecov](https://codecov.io/gh/MISP/misp-modules/branch/main/graph/badge.svg)](https://codecov.io/gh/MISP/misp-modules)
 
 MISP modules are autonomous modules that can be used to extend [MISP](https://github.com/MISP/MISP) for new services such as expansion, import, export and workflow action.

pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "poetry.core.masonry.api"
 
 [tool.poetry]
 name = "misp-modules"
-version = "2.4.195"
+version = "2.4.196"
 description = "MISP modules are autonomous modules that can be used for expansion and other services in MISP"
 authors = ["Alexandre Dulaunoy <[email protected]>"]
 license = "AGPL-3.0-only"
@@ -54,7 +54,7 @@ crowdstrike-falconpy = "*"
 dnsdb2 = "*"
 domaintools_api = "*"
 geoip2 = "*"
-google-search-api = { git = "https://github.com/abenassi/Google-Search-API" }
+
 greynoise = "*"
 jbxapi = "*"
 maclookup = "*"
@@ -65,21 +65,19 @@ mwdblib = "*"
 ndjson = "*"
 np = "*"
 oauth2 = "*"
-odtreader = { git = "https://github.com/cartertemm/ODTReader.git" }
+odtreader = "*"
 opencv-python = "*"
 openpyxl = "*"
 passivetotal = "*"
 pdftotext = "*"
 pycountry = "*"
-pydnstrails = { git = "https://github.com/sebdraven/pydnstrails.git" }
 pyeti-python3 = "*"
 pyeupi = "*"
 pyfaup = "*"
 pygeoip = "*"
-pyintel471 = { git = "https://github.com/MISP/PyIntel471.git" }
+pyintel471 = "*"
 pyipasnhistory = "*"
 pymisp = { version = "*", extras = ["fileobjects", "openioc", "pdfexport", "email", "url"] }
-pyonyphe = { git = "https://github.com/sebdraven/pyonyphe.git" }
 pypdns = "*"
 pypssl = "*"
 pysafebrowsing = "*"
@@ -96,7 +94,6 @@ sparqlwrapper = "*"
 stix2 = "*"
 tau-clients = "*"
 taxii2-client = "*"
-trustar = { git = "https://github.com/SteveClement/trustar-python.git" }
 urlarchiver = "*"
 vt-graph-api = "*"
 vt-py = "*"
@@ -121,3 +118,12 @@ optional = true
 mkdocs = "*"
 mkdocs-material = "*"
 markdown_include = "*"
+
+[tool.poetry.group.extra]
+optional = true
+
+[tool.poetry.group.extra.dependencies]
+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" }