diff --git a/flake.lock b/flake.lock index c89bc215b..f22944871 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1756770412, - "narHash": "sha256-+uWLQZccFHwqpGqr2Yt5VsW/PbeJVTn9Dk6SHWhNRPw=", + "lastModified": 1763759067, + "narHash": "sha256-LlLt2Jo/gMNYAwOgdRQBrsRoOz7BPRkzvNaI/fzXi2Q=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "4524271976b625a4a605beefd893f270620fd751", + "rev": "2cccadc7357c0ba201788ae99c4dfa90728ef5e0", "type": "github" }, "original": { @@ -22,11 +22,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1757487488, - "narHash": "sha256-zwE/e7CuPJUWKdvvTCB7iunV4E/+G0lKfv4kk/5Izdg=", + "lastModified": 1763835633, + "narHash": "sha256-HzxeGVID5MChuCPESuC0dlQL1/scDKu+MmzoVBJxulM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "ab0f3607a6c7486ea22229b92ed2d355f1482ee0", + "rev": "050e09e091117c3d7328c7b2b7b577492c43c134", "type": "github" }, "original": { diff --git a/nix/package/default.nix b/nix/package/default.nix index 5127d70c1..52438b426 100644 --- a/nix/package/default.nix +++ b/nix/package/default.nix @@ -70,7 +70,7 @@ python3Packages.buildPythonApplication { "\${qtWrapperArgs[@]}" ]; - pythonRemoveDeps = lib.optional (!withJXLSupport) [ "pillow_jxl" ]; + pythonRemoveDeps = lib.optional (!withJXLSupport) "pillow_jxl"; pythonRelaxDeps = [ "numpy" "pillow" @@ -96,7 +96,6 @@ python3Packages.buildPythonApplication { numpy opencv-python pillow - pillow-avif-plugin pillow-heif py7zr pydantic diff --git a/nix/shell.nix b/nix/shell.nix index e342f56c4..81965fc80 100644 --- a/nix/shell.nix +++ b/nix/shell.nix @@ -87,7 +87,7 @@ pkgs.mkShellNoCC { env = { QT_QPA_PLATFORM = "wayland;xcb"; - UV_NO_SYNC = "1"; + UV_NO_SYNC = 1; UV_PYTHON_DOWNLOADS = "never"; }; @@ -111,7 +111,8 @@ pkgs.mkShellNoCC { fi source "''${venv}"/bin/activate - PYTHONPATH=${pythonPath}''${PYTHONPATH:+:}''${PYTHONPATH:-} + PYTHONPATH=${pythonPath}''${PYTHONPATH:+:''${PYTHONPATH}} + export PYTHONPATH if [ ! -f "''${venv}"/pyproject.toml ] || ! diff --brief pyproject.toml "''${venv}"/pyproject.toml >/dev/null; then printf '%s\n' 'Installing dependencies, pyproject.toml changed...' >&2 diff --git a/pyproject.toml b/pyproject.toml index 4f06cf884..cb095d849 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -16,8 +16,7 @@ dependencies = [ "mutagen~=1.47", "numpy~=2.2", "opencv_python~=4.11", - "Pillow>=10.2,<=11", - "pillow-avif-plugin~=1.5", + "Pillow>=10.2,<12", "pillow-heif~=0.22", "pillow-jxl-plugin~=1.3", "py7zr==1.0.0", diff --git a/src/tagstudio/qt/previews/renderer.py b/src/tagstudio/qt/previews/renderer.py index f47d534ac..566ab7aed 100644 --- a/src/tagstudio/qt/previews/renderer.py +++ b/src/tagstudio/qt/previews/renderer.py @@ -19,7 +19,6 @@ import cv2 import numpy as np -import pillow_avif # noqa: F401 # pyright: ignore[reportUnusedImport] import py7zr import py7zr.io import rarfile