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
12 changes: 6 additions & 6 deletions flake.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 1 addition & 2 deletions nix/package/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ python3Packages.buildPythonApplication {
"\${qtWrapperArgs[@]}"
];

pythonRemoveDeps = lib.optional (!withJXLSupport) [ "pillow_jxl" ];
pythonRemoveDeps = lib.optional (!withJXLSupport) "pillow_jxl";
pythonRelaxDeps = [
"numpy"
"pillow"
Expand All @@ -96,7 +96,6 @@ python3Packages.buildPythonApplication {
numpy
opencv-python
pillow
pillow-avif-plugin
pillow-heif
py7zr
pydantic
Expand Down
5 changes: 3 additions & 2 deletions nix/shell.nix
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ pkgs.mkShellNoCC {
env = {
QT_QPA_PLATFORM = "wayland;xcb";

UV_NO_SYNC = "1";
UV_NO_SYNC = 1;
UV_PYTHON_DOWNLOADS = "never";
};

Expand All @@ -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
Expand Down
3 changes: 1 addition & 2 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
1 change: 0 additions & 1 deletion src/tagstudio/qt/previews/renderer.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down