From ab68df2178994a4351c38245f33a14de58d838f7 Mon Sep 17 00:00:00 2001 From: benoit74 Date: Fri, 9 Aug 2024 07:04:28 +0000 Subject: [PATCH] Upgrade dependencies before release --- .pre-commit-config.yaml | 6 +++--- CHANGELOG.md | 1 + build_js.sh | 2 +- openzim.toml | 2 +- pyproject.toml | 18 +++++++++--------- 5 files changed, 15 insertions(+), 14 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index e067b8b1..cb554c46 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -7,15 +7,15 @@ repos: - id: trailing-whitespace - id: end-of-file-fixer - repo: https://github.com/psf/black - rev: "24.4.2" + rev: "24.8.0" hooks: - id: black - repo: https://github.com/astral-sh/ruff-pre-commit - rev: v0.4.9 + rev: v0.5.7 hooks: - id: ruff - repo: https://github.com/RobertCraigie/pyright-python - rev: v1.1.367 + rev: v1.1.375 hooks: - id: pyright name: pyright (system) diff --git a/CHANGELOG.md b/CHANGELOG.md index 49de2ce5..b25ba539 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -25,6 +25,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Store `ContentDate` as metadata, based on `WARC-Date` (#358) - Remove domain specific rules (#328) - Revisit retrieve_illustration logic to prefer best favicons (#352 and #369) +- Upgrade dependencies (zimscraperlib 4.0.0, wombat.js 3.7.12 and others) (#376) ### Fixed diff --git a/build_js.sh b/build_js.sh index 0e305b0c..16d1ec1e 100755 --- a/build_js.sh +++ b/build_js.sh @@ -15,7 +15,7 @@ python3 -m venv /local /local/bin/python -m pip install --no-cache-dir -U \ pip \ jinja2==3.1.4 \ - PyYAML==6.0.1 + PyYAML==6.0.2 /local/bin/python /src/rules/generate_rules.py diff --git a/openzim.toml b/openzim.toml index b7bf52f0..a5c1a9d7 100644 --- a/openzim.toml +++ b/openzim.toml @@ -6,7 +6,7 @@ execute_after=[ [files.assets.actions."wombat.js"] action="get_file" -source="https://cdn.jsdelivr.net/npm/@webrecorder/wombat@3.7.11/dist/wombat.js" +source="https://cdn.jsdelivr.net/npm/@webrecorder/wombat@3.7.12/dist/wombat.js" target_file="wombat.js" [files.assets.actions."wombatSetup.js"] # fallback if this script has not been properly build (should happen only in dev) diff --git a/pyproject.toml b/pyproject.toml index b38f4799..3cec5794 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,7 +1,7 @@ [build-system] # jinja2 is required to generate JS and Python rules at build time # PyYAML is used to parse fuzzy rules and generate Python/JS code -requires = ["hatchling", "hatch-openzim==0.2.1", "jinja2==3.1.4", "PyYAML==6.0.1"] +requires = ["hatchling", "hatch-openzim==0.2.1", "jinja2==3.1.4", "PyYAML==6.0.2"] build-backend = "hatchling.build" [project] @@ -37,22 +37,22 @@ email="info@webrecorder.net" [project.optional-dependencies] scripts = [ "invoke==2.2.0", - "PyYAML==6.0.1", # used to parse fuzzy rules and generate Python/JS code ; also update version in build-system above and in build_js.sh + "PyYAML==6.0.2", # used to parse fuzzy rules and generate Python/JS code ; also update version in build-system above and in build_js.sh ] lint = [ - "black==24.4.2", - "ruff==0.4.9", + "black==24.8.0", + "ruff==0.5.7", ] check = [ - "pyright==1.1.367", + "pyright==1.1.375", ] test = [ - "pytest==8.2.2", - "coverage==7.5.3", + "pytest==8.3.2", + "coverage==7.6.1", ] dev = [ - "pre-commit==3.7.1", - "debugpy==1.8.1", + "pre-commit==3.8.0", + "debugpy==1.8.5", "warc2zim[scripts]", "warc2zim[lint]", "warc2zim[test]",