Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions .github/workflows/Publish.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@ jobs:

steps:
- name: Checkout repo
uses: actions/checkout@v6
uses: actions/checkout@v7

- name: Set up Python
uses: actions/setup-python@v6
uses: actions/setup-python@v7
with:
python-version-file: pyproject.toml
architecture: x64
Expand Down Expand Up @@ -44,15 +44,15 @@ jobs:

steps:
- name: Checkout repo
uses: actions/checkout@v6
uses: actions/checkout@v7

- name: Restore rules artifact
uses: actions/download-artifact@v8
with:
name: rules

- name: Setup Node.JS
uses: actions/setup-node@v6
uses: actions/setup-node@v7
with:
node-version-file: 'javascript/package.json'

Expand Down Expand Up @@ -84,7 +84,7 @@ jobs:

steps:
- name: Checkout repo
uses: actions/checkout@v6
uses: actions/checkout@v7

- name: Restore rules artifact
uses: actions/download-artifact@v8
Expand All @@ -98,7 +98,7 @@ jobs:
path: src/zimscraperlib/rewriting/statics

- name: Set up Python
uses: actions/setup-python@v6
uses: actions/setup-python@v7
with:
python-version-file: pyproject.toml
architecture: x64
Expand All @@ -119,15 +119,15 @@ jobs:

# steps:
# - name: Checkout repo
# uses: actions/checkout@v6
# uses: actions/checkout@v7

# - name: Restore rules artifact
# uses: actions/download-artifact@v8
# with:
# name: rules

# - name: Setup Node.JS
# uses: actions/setup-node@v6
# uses: actions/setup-node@v7
# with:
# node-version-file: 'javascript/package.json'
# registry-url: 'https://registry.npmjs.org' # Setup .npmrc file to publish to npm
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/PublishDev.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@ jobs:

steps:
- name: Checkout repo
uses: actions/checkout@v6
uses: actions/checkout@v7

- name: Set up Python
uses: actions/setup-python@v6
uses: actions/setup-python@v7
with:
python-version-file: pyproject.toml
architecture: x64
Expand All @@ -29,7 +29,7 @@ jobs:
python rules/generate_rules.py

- name: Setup Node.JS
uses: actions/setup-node@v6
uses: actions/setup-node@v7
with:
node-version-file: 'javascript/package.json'
registry-url: 'https://registry.npmjs.org'
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/QA.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@ jobs:

steps:
- name: Checkout repo
uses: actions/checkout@v6
uses: actions/checkout@v7

- name: Set up Python
uses: actions/setup-python@v6
uses: actions/setup-python@v7
with:
python-version-file: pyproject.toml
architecture: x64
Expand Down Expand Up @@ -46,15 +46,15 @@ jobs:

steps:
- name: Checkout repo
uses: actions/checkout@v6
uses: actions/checkout@v7

- name: Restore rules artifact
uses: actions/download-artifact@v8
with:
name: rules

- name: Set up Python
uses: actions/setup-python@v6
uses: actions/setup-python@v7
with:
python-version-file: pyproject.toml
architecture: x64
Expand All @@ -79,15 +79,15 @@ jobs:

steps:
- name: Checkout repo
uses: actions/checkout@v6
uses: actions/checkout@v7

- name: Restore rules artifact
uses: actions/download-artifact@v8
with:
name: rules

- name: Setup Node.JS
uses: actions/setup-node@v6
uses: actions/setup-node@v7
with:
node-version-file: 'javascript/package.json'

Expand Down
18 changes: 9 additions & 9 deletions .github/workflows/Tests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@ jobs:

steps:
- name: Checkout repo
uses: actions/checkout@v6
uses: actions/checkout@v7

- name: Set up Python
uses: actions/setup-python@v6
uses: actions/setup-python@v7
with:
python-version-file: pyproject.toml
architecture: x64
Expand Down Expand Up @@ -46,7 +46,7 @@ jobs:

steps:
- name: Checkout repo
uses: actions/checkout@v6
uses: actions/checkout@v7

- name: Restore rules artifact
uses: actions/download-artifact@v8
Expand All @@ -57,7 +57,7 @@ jobs:
run: sudo apt update && sudo apt install ffmpeg gifsicle

- name: Set up Python
uses: actions/setup-python@v6
uses: actions/setup-python@v7
with:
python-version-file: pyproject.toml
architecture: x64
Expand All @@ -71,7 +71,7 @@ jobs:
run: inv coverage --args "--runslow --runinstalled -vvv"

- name: Upload coverage report to codecov
uses: codecov/codecov-action@v6
uses: codecov/codecov-action@v7
with:
fail_ci_if_error: true
token: ${{ secrets.CODECOV_TOKEN }}
Expand All @@ -87,15 +87,15 @@ jobs:

steps:
- name: Checkout repo
uses: actions/checkout@v6
uses: actions/checkout@v7

- name: Restore rules artifact
uses: actions/download-artifact@v8
with:
name: rules

- name: Setup Node.JS
uses: actions/setup-node@v6
uses: actions/setup-node@v7
with:
node-version-file: 'javascript/package.json'

Expand Down Expand Up @@ -128,10 +128,10 @@ jobs:

steps:
- name: Checkout repo
uses: actions/checkout@v6
uses: actions/checkout@v7

- name: Set up Python
uses: actions/setup-python@v6
uses: actions/setup-python@v7
with:
python-version-file: pyproject.toml
architecture: x64
Expand Down
4 changes: 2 additions & 2 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,12 @@ repos:
- id: trailing-whitespace
- id: end-of-file-fixer
- repo: https://github.com/astral-sh/ruff-pre-commit
rev: v0.16.0
rev: v0.17.3
hooks:
- id: ruff-check
- id: ruff-format
- repo: https://github.com/RobertCraigie/pyright-python
rev: v1.1.411
rev: v1.1.414
hooks:
- id: pyright
name: pyright (system)
Expand Down
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
### Changed

- Upgrade to wombat 3.11.0 (#338)
- Upgrade Python dependencies, allowing pymupdf 2, pillow 13, beartype 0.23, urllib3 2.8 and xxhash 4, and Node.JS dependencies

### Fixed

Expand Down
14 changes: 6 additions & 8 deletions javascript/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,11 @@
"@rollup/plugin-commonjs": "29.0.3",
"@rollup/plugin-node-resolve": "16.0.3",
"@rollup/plugin-strip": "3.0.4",
"@rollup/plugin-terser": "1.0.0",
"ava": "8.0.1",
"babel-eslint": "10.1.0",
"eslint": "10.7.0",
"eslint-config-prettier": "10.1.8",
"prettier": "3.9.6",
"rollup": "4.62.2",
"@rollup/plugin-terser": "1.0.2",
"ava": "8.2.0",
"eslint": "10.13.0",
"prettier": "3.9.10",
"rollup": "4.65.1",
"rollup-plugin-version-injector": "1.3.3"
},
"scripts": {
Expand Down Expand Up @@ -43,5 +41,5 @@
"engines": {
"node": ">=26.0.0 <27.0.0"
},
"packageManager": "yarn@4.17.1"
"packageManager": "yarn@4.18.1"
}
Loading