Skip to content

Commit 725250e

Browse files
authored
Merge branch 'main' into opencv-python
2 parents 899b7f4 + d3cf3b5 commit 725250e

File tree

4 files changed

+3462
-2327
lines changed

4 files changed

+3462
-2327
lines changed

.github/workflows/test.yml

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,18 +12,17 @@ jobs:
1212
fail-fast: false
1313
matrix:
1414
python-version: [
15-
"pypy-3.9",
16-
"pypy-3.10",
17-
"3.10",
18-
"3.11",
15+
"pypy-3.11",
16+
"3.13",
17+
"3.14",
1918
]
2019
os: [ubuntu-latest]
2120

2221
steps:
2322
- uses: actions/checkout@v4
2423

2524
- name: Set up Python ${{ matrix.python-version }}
26-
uses: actions/setup-python@v4
25+
uses: actions/setup-python@v6
2726
with:
2827
python-version: ${{ matrix.python-version }}
2928

LICENSE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
MIT License
22

3-
Copyright (c) 2016-2023 Python Pillow team
3+
Copyright (c) 2016 Python Pillow team
44

55
Permission is hereby granted, free of charge, to any person obtaining a copy
66
of this software and associated documentation files (the "Software"), to deal

auto/run.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ fi
1111

1212
source ~/env/pillow-perf/bin/activate
1313
pip install -r ../testsuite/requirements.txt
14-
pip install opencv-python==4.10.0.84 pgmagick==0.7.6
14+
pip install opencv-python==4.10.0.84 pgmagick==0.8
1515

1616

1717
git clone https://github.com/uploadcare/pillow-simd.git Pillow || true

0 commit comments

Comments
 (0)