Skip to content

Commit c38cc9d

Browse files
authored
chore(thumb_renderer): bump Pillow (#1227)
Builds upon #1065, mkdocs-material has now bumped the Pillow version being used, and now the built in AVIF support can be used
1 parent 6397b22 commit c38cc9d

File tree

5 files changed

+11
-13
lines changed

5 files changed

+11
-13
lines changed

flake.lock

Lines changed: 6 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

nix/package/default.nix

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ python3Packages.buildPythonApplication {
7070
"\${qtWrapperArgs[@]}"
7171
];
7272

73-
pythonRemoveDeps = lib.optional (!withJXLSupport) [ "pillow_jxl" ];
73+
pythonRemoveDeps = lib.optional (!withJXLSupport) "pillow_jxl";
7474
pythonRelaxDeps = [
7575
"numpy"
7676
"pillow"
@@ -96,7 +96,6 @@ python3Packages.buildPythonApplication {
9696
numpy
9797
opencv-python
9898
pillow
99-
pillow-avif-plugin
10099
pillow-heif
101100
py7zr
102101
pydantic

nix/shell.nix

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ pkgs.mkShellNoCC {
8787
env = {
8888
QT_QPA_PLATFORM = "wayland;xcb";
8989

90-
UV_NO_SYNC = "1";
90+
UV_NO_SYNC = 1;
9191
UV_PYTHON_DOWNLOADS = "never";
9292
};
9393

@@ -111,7 +111,8 @@ pkgs.mkShellNoCC {
111111
fi
112112
113113
source "''${venv}"/bin/activate
114-
PYTHONPATH=${pythonPath}''${PYTHONPATH:+:}''${PYTHONPATH:-}
114+
PYTHONPATH=${pythonPath}''${PYTHONPATH:+:''${PYTHONPATH}}
115+
export PYTHONPATH
115116
116117
if [ ! -f "''${venv}"/pyproject.toml ] || ! diff --brief pyproject.toml "''${venv}"/pyproject.toml >/dev/null; then
117118
printf '%s\n' 'Installing dependencies, pyproject.toml changed...' >&2

pyproject.toml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,7 @@ dependencies = [
1616
"mutagen~=1.47",
1717
"numpy~=2.2",
1818
"opencv_python~=4.11",
19-
"Pillow>=10.2,<=11",
20-
"pillow-avif-plugin~=1.5",
19+
"Pillow>=10.2,<12",
2120
"pillow-heif~=0.22",
2221
"pillow-jxl-plugin~=1.3",
2322
"py7zr==1.0.0",

src/tagstudio/qt/previews/renderer.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919

2020
import cv2
2121
import numpy as np
22-
import pillow_avif # noqa: F401 # pyright: ignore[reportUnusedImport]
2322
import py7zr
2423
import py7zr.io
2524
import rarfile

0 commit comments

Comments
 (0)