Upgrade dependencies - Python 3.13

This commit is contained in:
benoit74 2025-02-03 14:40:20 +00:00
parent eeeb554346
commit 4c584cab75
No known key found for this signature in database
GPG key ID: B89606434FC7B530
4 changed files with 23 additions and 33 deletions

View file

@ -2,20 +2,20 @@
# See https://pre-commit.com/hooks.html for more hooks # See https://pre-commit.com/hooks.html for more hooks
repos: repos:
- repo: https://github.com/pre-commit/pre-commit-hooks - repo: https://github.com/pre-commit/pre-commit-hooks
rev: v4.4.0 rev: v5.0.0
hooks: hooks:
- id: trailing-whitespace - id: trailing-whitespace
- id: end-of-file-fixer - id: end-of-file-fixer
- repo: https://github.com/psf/black - repo: https://github.com/psf/black
rev: "24.10.0" rev: "25.1.0"
hooks: hooks:
- id: black - id: black
- repo: https://github.com/astral-sh/ruff-pre-commit - repo: https://github.com/astral-sh/ruff-pre-commit
rev: v0.8.4 rev: v0.9.4
hooks: hooks:
- id: ruff - id: ruff
- repo: https://github.com/RobertCraigie/pyright-python - repo: https://github.com/RobertCraigie/pyright-python
rev: v1.1.391 rev: v1.1.393
hooks: hooks:
- id: pyright - id: pyright
name: pyright (system) name: pyright (system)
@ -25,17 +25,3 @@ repos:
'types_or': [python, pyi] 'types_or': [python, pyi]
require_serial: true require_serial: true
minimum_pre_commit_version: '2.9.2' minimum_pre_commit_version: '2.9.2'
- repo: https://github.com/pre-commit/mirrors-prettier
rev: v3.1.0
hooks:
- id: prettier
files: javascript\/.*$ # files in javascript folder
args:
- --config
- javascript/.prettierrc.json
- repo: https://github.com/pre-commit/mirrors-eslint
rev: v8.51.0
hooks:
- id: eslint
types: [file]
files: javascript\/src\/.*(?:\.[jt]sx?|\.vue)$ # *.js, *.jsx, *.ts, *.tsx, *.vue in javascript/src folder

View file

@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
## [Unreleased] ## [Unreleased]
### Changed
- Upgrade dependencies: Python 3.13, zimscraperlib 5.1.0 and others (#434)
## [2.2.0] - 2024-01-10 ## [2.2.0] - 2024-01-10
### Changed ### Changed

View file

@ -1,4 +1,4 @@
FROM python:3.12-slim-bookworm FROM python:3.13-slim-bookworm
LABEL org.opencontainers.image.source=https://github.com/openzim/warc2zim LABEL org.opencontainers.image.source=https://github.com/openzim/warc2zim
RUN apt-get update -y \ RUN apt-get update -y \

View file

@ -1,22 +1,22 @@
[build-system] [build-system]
requires = ["hatchling", "hatch-openzim==0.2.1"] requires = ["hatchling", "hatch-openzim"]
build-backend = "hatchling.build" build-backend = "hatchling.build"
[project] [project]
name = "warc2zim" name = "warc2zim"
requires-python = ">=3.12,<3.13" requires-python = ">=3.13,<3.14"
description = "Convert WARC to ZIM" description = "Convert WARC to ZIM"
readme = "README.md" readme = "README.md"
dependencies = [ dependencies = [
"warcio==1.7.5", "warcio==1.7.5",
"requests==2.32.3", "requests==2.32.3",
"zimscraperlib==5.0.0rc3", "zimscraperlib==5.1.0",
"jinja2==3.1.4", # also update version in build-system above and in build_js.sh "jinja2==3.1.5",
# to support possible brotli content in warcs, must be added separately # to support possible brotli content in warcs, must be added separately
"brotlipy==0.7.0", "brotlipy==0.7.0",
"cdxj_indexer==1.4.6", "cdxj_indexer==1.4.6",
"tinycss2==1.4.0", "tinycss2==1.4.0",
"beautifulsoup4==4.12.3", # used to parse base href "beautifulsoup4==4.13.1", # used to parse base href
"lxml==5.3.0", # used by beautifulsoup4 for parsing html "lxml==5.3.0", # used by beautifulsoup4 for parsing html
"python-dateutil==2.9.0.post0", "python-dateutil==2.9.0.post0",
] ]
@ -35,19 +35,19 @@ scripts = [
"invoke==2.2.0", "invoke==2.2.0",
] ]
lint = [ lint = [
"black==24.10.0", "black==25.1.0",
"ruff==0.8.4", "ruff==0.9.4",
] ]
check = [ check = [
"pyright==1.1.391", "pyright==1.1.393",
] ]
test = [ test = [
"pytest==8.3.4", "pytest==8.3.4",
"coverage==7.6.9", "coverage==7.6.10",
] ]
dev = [ dev = [
"pre-commit==4.0.1", "pre-commit==4.1.0",
"debugpy==1.8.11", "debugpy==1.8.12",
"warc2zim[scripts]", "warc2zim[scripts]",
"warc2zim[lint]", "warc2zim[lint]",
"warc2zim[test]", "warc2zim[test]",
@ -103,10 +103,10 @@ all = "inv checkall --args '{args}'"
[tool.black] [tool.black]
line-length = 88 line-length = 88
target-version = ['py312'] target-version = ['py313']
[tool.ruff] [tool.ruff]
target-version = "py312" target-version = "py313"
line-length = 88 line-length = 88
src = ["src"] src = ["src"]
@ -229,6 +229,6 @@ exclude_lines = [
include = ["src", "tests", "tasks.py"] include = ["src", "tests", "tasks.py"]
exclude = [".env/**", ".venv/**"] exclude = [".env/**", ".venv/**"]
extraPaths = ["src"] extraPaths = ["src"]
pythonVersion = "3.12" pythonVersion = "3.13"
typeCheckingMode = "basic" typeCheckingMode = "basic"
disableBytesTypePromotions = true disableBytesTypePromotions = true