Skip to content

Commit a06128f

Browse files
authored
Merge branch 'main' into vtf-support
2 parents 6d15142 + f78663b commit a06128f

File tree

189 files changed

+1460
-1571
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

189 files changed

+1460
-1571
lines changed

.ci/install.sh

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,14 +27,13 @@ python3 -m pip install --upgrade wheel
2727
python3 -m pip install coverage
2828
python3 -m pip install defusedxml
2929
python3 -m pip install ipython
30-
python3 -m pip install numpy
3130
python3 -m pip install olefile
3231
python3 -m pip install -U pytest
3332
python3 -m pip install -U pytest-cov
3433
python3 -m pip install -U pytest-timeout
3534
python3 -m pip install pyroma
36-
# optional test dependency, only install if there's a binary package.
37-
# fails on beta 3.14 and PyPy
35+
# optional test dependencies, only install if there's a binary package.
36+
python3 -m pip install --only-binary=:all: numpy || true
3837
python3 -m pip install --only-binary=:all: pyarrow || true
3938

4039
# PyQt6 doesn't support PyPy3

.ci/requirements-cibw.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
cibuildwheel==3.2.1
1+
cibuildwheel==3.3.1

.ci/requirements-mypy.txt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
mypy==1.18.2
1+
mypy==1.19.1
22
arro3-compute
33
arro3-core
44
IceSpringPySideStubs-PyQt6
@@ -9,7 +9,6 @@ packaging
99
pyarrow-stubs
1010
pybind11
1111
pytest
12-
sphinx
1312
types-atheris
1413
types-defusedxml
1514
types-olefile

.github/renovate.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
"labels": [
77
"Dependency"
88
],
9+
"minimumReleaseAge": "7 days",
910
"packageRules": [
1011
{
1112
"groupName": "github-actions",

.github/workflows/cifuzz.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,13 +44,13 @@ jobs:
4444
language: python
4545
dry-run: false
4646
- name: Upload New Crash
47-
uses: actions/upload-artifact@v4
47+
uses: actions/upload-artifact@v6
4848
if: failure() && steps.build.outcome == 'success'
4949
with:
5050
name: artifacts
5151
path: ./out/artifacts
5252
- name: Upload Legacy Crash
53-
uses: actions/upload-artifact@v4
53+
uses: actions/upload-artifact@v6
5454
if: steps.run.outcome == 'success'
5555
with:
5656
name: crash

.github/workflows/docs.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ jobs:
3232
name: Docs
3333

3434
steps:
35-
- uses: actions/checkout@v5
35+
- uses: actions/checkout@v6
3636
with:
3737
persist-credentials: false
3838

@@ -49,7 +49,7 @@ jobs:
4949
run: python3 .github/workflows/system-info.py
5050

5151
- name: Cache libimagequant
52-
uses: actions/cache@v4
52+
uses: actions/cache@v5
5353
id: cache-libimagequant
5454
with:
5555
path: ~/cache-libimagequant

.github/workflows/lint.yml

Lines changed: 17 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -2,55 +2,31 @@ name: Lint
22

33
on: [push, pull_request, workflow_dispatch]
44

5+
permissions: {}
6+
57
env:
68
FORCE_COLOR: 1
7-
8-
permissions:
9-
contents: read
9+
PREK_COLOR: always
10+
RUFF_OUTPUT_FORMAT: github
1011

1112
concurrency:
1213
group: ${{ github.workflow }}-${{ github.ref }}
1314
cancel-in-progress: true
1415

1516
jobs:
16-
build:
17-
17+
lint:
1818
runs-on: ubuntu-latest
19-
2019
name: Lint
21-
2220
steps:
23-
- uses: actions/checkout@v5
24-
with:
25-
persist-credentials: false
26-
27-
- name: pre-commit cache
28-
uses: actions/cache@v4
29-
with:
30-
path: ~/.cache/pre-commit
31-
key: lint-pre-commit-${{ hashFiles('**/.pre-commit-config.yaml') }}
32-
restore-keys: |
33-
lint-pre-commit-
34-
35-
- name: Set up Python
36-
uses: actions/setup-python@v6
37-
with:
38-
python-version: "3.x"
39-
cache: pip
40-
cache-dependency-path: "setup.py"
41-
42-
- name: Build system information
43-
run: python3 .github/workflows/system-info.py
44-
45-
- name: Install dependencies
46-
run: |
47-
python3 -m pip install -U pip
48-
python3 -m pip install -U tox
49-
50-
- name: Lint
51-
run: tox -e lint
52-
env:
53-
PRE_COMMIT_COLOR: always
54-
55-
- name: Mypy
56-
run: tox -e mypy
21+
- uses: actions/checkout@v6
22+
with:
23+
persist-credentials: false
24+
- uses: actions/setup-python@v6
25+
with:
26+
python-version: "3.x"
27+
- name: Install uv
28+
uses: astral-sh/setup-uv@v7
29+
- name: Lint
30+
run: uvx --with tox-uv tox -e lint
31+
- name: Mypy
32+
run: uvx --with tox-uv tox -e mypy

.github/workflows/macos-install.sh

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,8 @@ python3 -m pip install -U pytest
2626
python3 -m pip install -U pytest-cov
2727
python3 -m pip install -U pytest-timeout
2828
python3 -m pip install pyroma
29-
python3 -m pip install numpy
30-
# optional test dependency, only install if there's a binary package.
31-
# fails on beta 3.14 and PyPy
29+
# optional test dependencies, only install if there's a binary package.
30+
python3 -m pip install --only-binary=:all: numpy || true
3231
python3 -m pip install --only-binary=:all: pyarrow || true
3332

3433
# libavif

.github/workflows/test-docker.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@ jobs:
5050
debian-13-trixie-x86,
5151
debian-13-trixie-amd64,
5252
fedora-42-amd64,
53+
fedora-43-amd64,
5354
gentoo,
5455
ubuntu-22.04-jammy-amd64,
5556
ubuntu-24.04-noble-amd64,
@@ -67,7 +68,7 @@ jobs:
6768
name: ${{ matrix.docker }}
6869

6970
steps:
70-
- uses: actions/checkout@v5
71+
- uses: actions/checkout@v6
7172
with:
7273
persist-credentials: false
7374

.github/workflows/test-mingw.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ jobs:
4545

4646
steps:
4747
- name: Checkout Pillow
48-
uses: actions/checkout@v5
48+
uses: actions/checkout@v6
4949
with:
5050
persist-credentials: false
5151

0 commit comments

Comments
 (0)