From 0cc4c82f4aaacc6d9d9b1bde94de7869340ee734 Mon Sep 17 00:00:00 2001 From: github-actions Date: Wed, 16 Oct 2024 23:02:30 -0400 Subject: [PATCH 1/5] test python 3.13 --- .github/workflows/tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index dbd9d53e33..aec8b2476c 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -35,7 +35,7 @@ jobs: # if one python version fails, let the others finish fail-fast: false matrix: - python-version: ["3.9", "3.10", "3.11", "3.12"] + python-version: ["3.9", "3.10", "3.11", "3.12", "3.13"] steps: - uses: actions/checkout@v4 - name: Set up Python From ede623038112e2eb372c2051d2ca5588ec3cd01c Mon Sep 17 00:00:00 2001 From: github-actions Date: Tue, 19 Nov 2024 10:51:37 -0500 Subject: [PATCH 2/5] resolve conflict --- poetry.lock | 2 +- pyproject.toml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/poetry.lock b/poetry.lock index 2c880c15d8..a822562873 100644 --- a/poetry.lock +++ b/poetry.lock @@ -3136,4 +3136,4 @@ type = ["pytest-mypy"] [metadata] lock-version = "2.0" python-versions = "^3.9" -content-hash = "2a8751a5918309b0eb2fda2de92b363ae31cbf4ee97317999636d12ae04a06c9" +content-hash = "ee3b0a611172a5e14415a1fff81bbb25f58863d182bd59b1dc4387503ffa064f" diff --git a/pyproject.toml b/pyproject.toml index 92eb50e9c3..8868264248 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -41,7 +41,6 @@ pyjwt = "^2.7.0" beautifulsoup4 = "^4.12.2" lxml = ">=4.9.2,<6.0.0" dnspython = "^2.4.2" -pydantic = "^2.4.2" tldextract = "^5.1.1" cachetools = "^5.3.2" socksio = "^1.0.0" @@ -56,6 +55,7 @@ httpx = "^0.27.0" puremagic = "^1.28" cloudcheck = "^6.0.0.602" radixtarget = "^2.0.0.50" +pydantic = "^2.9.2" [tool.poetry.group.dev.dependencies] flake8 = ">=6,<8" From e414b55b1d5f44d7dd73ff5f2f7c5d212649f8e4 Mon Sep 17 00:00:00 2001 From: github-actions Date: Fri, 18 Oct 2024 15:14:01 -0400 Subject: [PATCH 3/5] cli tests --- bbot/test/test_step_1/test_cli.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bbot/test/test_step_1/test_cli.py b/bbot/test/test_step_1/test_cli.py index acdd4011b6..a2887c6fd3 100644 --- a/bbot/test/test_step_1/test_cli.py +++ b/bbot/test/test_step_1/test_cli.py @@ -243,7 +243,7 @@ async def test_cli_args(monkeypatch, caplog, capsys, clean_default_config): result = await cli._main() out, err = capsys.readouterr() assert result == None - assert "Target:\n -t TARGET [TARGET ...]" in out + assert "-t TARGET [TARGET ...]" in out # list modules monkeypatch.setattr("sys.argv", ["bbot", "-l"]) From 23b651f9afcfc6a051529e88582072268a930e4a Mon Sep 17 00:00:00 2001 From: github-actions Date: Fri, 27 Dec 2024 21:14:15 -0500 Subject: [PATCH 4/5] bump extractous --- bbot/modules/extractous.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bbot/modules/extractous.py b/bbot/modules/extractous.py index 63f4ecd6d1..c37be08008 100644 --- a/bbot/modules/extractous.py +++ b/bbot/modules/extractous.py @@ -65,7 +65,7 @@ class extractous(BaseModule): "extensions": "File extensions to parse", } - deps_pip = ["extractous"] + deps_pip = ["extractous~=0.3.0"] scope_distance_modifier = 1 async def setup(self): From 00cf08cb7dd904e6045ce0fa8e644bdd12ce7dee Mon Sep 17 00:00:00 2001 From: github-actions Date: Fri, 27 Dec 2024 21:40:39 -0500 Subject: [PATCH 5/5] fix tests? --- bbot/test/test_step_1/test_cli.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bbot/test/test_step_1/test_cli.py b/bbot/test/test_step_1/test_cli.py index c700cfaad8..77f2ba4d6a 100644 --- a/bbot/test/test_step_1/test_cli.py +++ b/bbot/test/test_step_1/test_cli.py @@ -271,7 +271,7 @@ async def test_cli_args(monkeypatch, caplog, capsys, clean_default_config): result = await cli._main() out, err = capsys.readouterr() assert result is None - assert "Target:\n -t TARGET [TARGET ...]" in out + assert "-t TARGET [TARGET ...]" in out # list modules monkeypatch.setattr("sys.argv", ["bbot", "-l"])