From 02e2cbe2d716f130c5360e6b9d4a68bbfa66eff6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20Vinot?= Date: Mon, 3 Feb 2025 17:16:48 +0100 Subject: [PATCH] chg: Bump bs4 --- har2tree/nodes.py | 2 +- poetry.lock | 41 +++++++++++++++++++++-------------------- pyproject.toml | 12 +++++++----- 3 files changed, 29 insertions(+), 26 deletions(-) diff --git a/har2tree/nodes.py b/har2tree/nodes.py index 5a747f1..4df313a 100644 --- a/har2tree/nodes.py +++ b/har2tree/nodes.py @@ -84,7 +84,7 @@ def __init__(self, capture_uuid: str, **kwargs: Any): self.features_to_skip.add('ip_address') def _compute_domhash(self) -> str: - to_hash = "|".join(t.name for t in self.rendered_soup.findAll()).encode() + to_hash = "|".join(t.name for t in self.rendered_soup.find_all()).encode() return sha256(to_hash).hexdigest()[:32] def add_rendered_features(self, all_requests: list[str], rendered_html: BytesIO | None=None, downloaded_file: tuple[str, BytesIO | None] | None=None) -> None: diff --git a/poetry.lock b/poetry.lock index 3506938..5a9b663 100644 --- a/poetry.lock +++ b/poetry.lock @@ -15,37 +15,38 @@ files = [ [[package]] name = "babel" -version = "2.16.0" +version = "2.17.0" description = "Internationalization utilities" optional = true python-versions = ">=3.8" groups = ["main"] markers = "python_version >= \"3.10\" and extra == \"docs\"" files = [ - {file = "babel-2.16.0-py3-none-any.whl", hash = "sha256:368b5b98b37c06b7daf6696391c3240c938b37767d4584413e8438c5c435fa8b"}, - {file = "babel-2.16.0.tar.gz", hash = "sha256:d1f3554ca26605fe173f3de0c65f750f5a42f924499bf134de6423582298e316"}, + {file = "babel-2.17.0-py3-none-any.whl", hash = "sha256:4d0b53093fdfb4b21c92b5213dba5a1b23885afa8383709427046b21c366e5f2"}, + {file = "babel-2.17.0.tar.gz", hash = "sha256:0c54cffb19f690cdcc52a3b50bcbf71e07a808d1c80d549f2459b9d2cf0afb9d"}, ] [package.extras] -dev = ["freezegun (>=1.0,<2.0)", "pytest (>=6.0)", "pytest-cov"] +dev = ["backports.zoneinfo", "freezegun (>=1.0,<2.0)", "jinja2 (>=3.0)", "pytest (>=6.0)", "pytest-cov", "pytz", "setuptools", "tzdata"] [[package]] name = "beautifulsoup4" -version = "4.12.3" +version = "4.13.1" description = "Screen-scraping library" optional = false -python-versions = ">=3.6.0" +python-versions = ">=3.7.0" groups = ["main"] markers = "python_version == \"3.9\" or python_version >= \"3.10\"" files = [ - {file = "beautifulsoup4-4.12.3-py3-none-any.whl", hash = "sha256:b80878c9f40111313e55da8ba20bdba06d8fa3969fc68304167741bbf9e082ed"}, - {file = "beautifulsoup4-4.12.3.tar.gz", hash = "sha256:74e3d1928edc070d21748185c46e3fb33490f22f52a3addee9aee0f4f7781051"}, + {file = "beautifulsoup4-4.13.1-py3-none-any.whl", hash = "sha256:72465267014897bb10ca749bb632bde6c2d20f3254afd5458544bd74e6c2e6d8"}, + {file = "beautifulsoup4-4.13.1.tar.gz", hash = "sha256:741c8b6903a1e4ae8ba32b9c9ae7510dab7a197fdbadcf9fcdeb0891ef5ec66a"}, ] [package.dependencies] charset-normalizer = {version = "*", optional = true, markers = "extra == \"charset-normalizer\""} lxml = {version = "*", optional = true, markers = "extra == \"lxml\""} soupsieve = ">1.2" +typing-extensions = ">=4.0.0" [package.extras] cchardet = ["cchardet"] @@ -56,15 +57,15 @@ lxml = ["lxml"] [[package]] name = "certifi" -version = "2024.12.14" +version = "2025.1.31" description = "Python package for providing Mozilla's CA Bundle." optional = true python-versions = ">=3.6" groups = ["main"] markers = "python_version >= \"3.10\" and extra == \"docs\"" files = [ - {file = "certifi-2024.12.14-py3-none-any.whl", hash = "sha256:1275f7a45be9464efc1173084eaa30f866fe2e47d389406136d332ed4967ec56"}, - {file = "certifi-2024.12.14.tar.gz", hash = "sha256:b650d30f370c2b724812bee08008be0c4163b163ddaec3f2546c1caf65f191db"}, + {file = "certifi-2025.1.31-py3-none-any.whl", hash = "sha256:ca78db4565a652026a4db2bcdf68f2fb589ea80d0be70e03929ed730746b84fe"}, + {file = "certifi-2025.1.31.tar.gz", hash = "sha256:3d5da6925056f6f18f119200434a4780a94263f10d1c21d032a6f6b2baa20651"}, ] [[package]] @@ -846,15 +847,15 @@ testing = ["pytest", "pytest-benchmark"] [[package]] name = "publicsuffixlist" -version = "1.0.2.20250127" +version = "1.0.2.20250202" description = "publicsuffixlist implement" optional = false python-versions = ">=3.5" groups = ["main"] markers = "python_version == \"3.9\" or python_version >= \"3.10\"" files = [ - {file = "publicsuffixlist-1.0.2.20250127-py2.py3-none-any.whl", hash = "sha256:bccf7109a84379d2d06a019ae2bb7eb3636ff7025c5d9f52d4578388edeb04de"}, - {file = "publicsuffixlist-1.0.2.20250127.tar.gz", hash = "sha256:6b61bae2bef9dab94b8948c942c74bbadd82a9a2d9641e00e47265029ea08b98"}, + {file = "publicsuffixlist-1.0.2.20250202-py2.py3-none-any.whl", hash = "sha256:ca21f27fda152fb904d59527db704659b951389a65ba7e46d0f493ecbce8fe2a"}, + {file = "publicsuffixlist-1.0.2.20250202.tar.gz", hash = "sha256:cd83a563247fb49bd8f44a2e2c7c958da2bc10bc1105ff1ca3086c7ddea98a52"}, ] [package.extras] @@ -1224,7 +1225,7 @@ version = "4.12.2" description = "Backported and Experimental Type Hints for Python 3.8+" optional = false python-versions = ">=3.8" -groups = ["dev"] +groups = ["main", "dev"] markers = "python_version == \"3.9\" or python_version >= \"3.10\"" files = [ {file = "typing_extensions-4.12.2-py3-none-any.whl", hash = "sha256:04e5ca0351e0f3f85c6853954072df659d0d13fac324d0072316b67d7794700d"}, @@ -1252,15 +1253,15 @@ zstd = ["zstandard (>=0.18.0)"] [[package]] name = "w3lib" -version = "2.2.1" +version = "2.3.1" description = "Library of web-related functions" optional = false -python-versions = ">=3.8" +python-versions = ">=3.9" groups = ["main"] markers = "python_version == \"3.9\" or python_version >= \"3.10\"" files = [ - {file = "w3lib-2.2.1-py3-none-any.whl", hash = "sha256:e56d81c6a6bf507d7039e0c95745ab80abd24b465eb0f248af81e3eaa46eb510"}, - {file = "w3lib-2.2.1.tar.gz", hash = "sha256:756ff2d94c64e41c8d7c0c59fea12a5d0bc55e33a531c7988b4a163deb9b07dd"}, + {file = "w3lib-2.3.1-py3-none-any.whl", hash = "sha256:9ccd2ae10c8c41c7279cd8ad4fe65f834be894fe7bfdd7304b991fd69325847b"}, + {file = "w3lib-2.3.1.tar.gz", hash = "sha256:5c8ac02a3027576174c2b61eb9a2170ba1b197cae767080771b6f1febda249a4"}, ] [[package]] @@ -1282,4 +1283,4 @@ docs = ["Sphinx", "six"] [metadata] lock-version = "2.1" python-versions = ">=3.9" -content-hash = "f7128b48b32c6e73d9ae6bafafbc010fda2e66744e1ce878dfeb3f8f337477a6" +content-hash = "5f97218c9dbf73238c8e01959712d2b9601b22354c91f23df2c45bc32ab740be" diff --git a/pyproject.toml b/pyproject.toml index 64a7966..7d32e62 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [project] name = "har2tree" -version = "1.27.7" +version = "1.27.8" description = "HTTP Archive (HAR) to ETE Toolkit generator" authors = [ {name="Raphaël Vinot", email="raphael.vinot@circl.lu"} @@ -13,12 +13,14 @@ dynamic = [ "classifiers" ] dependencies = [ "ete3 (>=3.1.3)", - "beautifulsoup4 [lxml,charset_normalizer] (>=4.12.3)", - "publicsuffixlist (>=1.0.2.20250127)", + "beautifulsoup4[charset-normalizer,lxml] (>=4.13.1)", + "publicsuffixlist (>=1.0.2.20250202)", "filetype (>=1.2.0)", - "numpy (<2.1) ; python_version == \"3.9\"", + # poetry up fails with the version of numpy forced for python < 3.10. + # The work around is to comment it, run poetry up, uncomment it. and run poetry update. + "numpy (<=2.1) ; python_version == \"3.9\"", "numpy (>=2.2.2) ; python_version >= \"3.10\"", - "w3lib (>=2.2.1)", + "w3lib (>=2.3.1)", "tinycss2 (>=1.4.0)", "legacy-cgi (>=2.6.2) ; python_version >= \"3.13,<4.0\"", ]