chore(pyproject): version bumping/relaxing

Author: xarvex

flake.nix

@@ -30,21 +30,18 @@
         {
           packages =
             let
-              pythonPackages = pkgs.python312Packages;
+              python3Packages = pkgs.python312Packages;
 
-              pillow-jxl-plugin = pythonPackages.callPackage ./nix/package/pillow-jxl-plugin.nix {
+              pillow-jxl-plugin = python3Packages.callPackage ./nix/package/pillow-jxl-plugin.nix {
                 inherit (pkgs) cmake;
                 inherit pyexiv2;
-                inherit (pkgs) rustPlatform;
               };
-              pyexiv2 = pythonPackages.callPackage ./nix/package/pyexiv2.nix { inherit (pkgs) exiv2; };
-              vtf2img = pythonPackages.callPackage ./nix/package/vtf2img.nix { };
+              pyexiv2 = python3Packages.callPackage ./nix/package/pyexiv2.nix { inherit (pkgs) exiv2; };
+              vtf2img = python3Packages.callPackage ./nix/package/vtf2img.nix { };
             in
             rec {
               default = tagstudio;
-              tagstudio = pythonPackages.callPackage ./nix/package {
-                inherit pillow-jxl-plugin vtf2img;
-              };
+              tagstudio = pkgs.callPackage ./nix/package { inherit pillow-jxl-plugin vtf2img; };
               tagstudio-jxl = tagstudio.override { withJXLSupport = true; };
 
               inherit pillow-jxl-plugin pyexiv2 vtf2img;

nix/package/default.nix

@@ -1,50 +1,30 @@
 {
-  buildPythonApplication,
-  chardet,
   ffmpeg-headless,
-  ffmpeg-python,
-  hatchling,
-  humanfriendly,
   lib,
-  mutagen,
-  numpy,
-  opencv-python,
-  pillow,
-  pillow-heif,
-  pillow-jxl-plugin,
   pipewire,
-  pydub,
-  pyside6,
-  pytest-qt,
-  pytest-xdist,
-  pytestCheckHook,
-  pythonRelaxDepsHook,
+  python3Packages,
   qt6,
-  rawpy,
-  send2trash,
-  sqlalchemy,
   stdenv,
-  structlog,
-  syrupy,
-  ujson,
-  vtf2img,
   wrapGAppsHook,
 
+  pillow-jxl-plugin,
+  vtf2img,
+
   withJXLSupport ? false,
 }:
 
 let
   pyproject = (lib.importTOML ../../pyproject.toml).project;
 in
-buildPythonApplication {
+python3Packages.buildPythonApplication {
   pname = pyproject.name;
   inherit (pyproject) version;
   pyproject = true;
 
   src = ../../.;
 
   nativeBuildInputs = [
-    pythonRelaxDepsHook
+    python3Packages.pythonRelaxDepsHook
     qt6.wrapQtAppsHook
 
     # INFO: Should be unnecessary once PR is pulled.
@@ -57,7 +37,7 @@ buildPythonApplication {
     qt6.qtmultimedia
   ];
 
-  nativeCheckInputs = [
+  nativeCheckInputs = with python3Packages; [
     pytest-qt
     pytest-xdist
     pytestCheckHook
@@ -78,28 +58,39 @@ buildPythonApplication {
       lib.makeLibraryPath [ pipewire ]
     }";
 
-  pythonRemoveDeps = true;
+  pythonRemoveDeps = lib.optional (!withJXLSupport) [ "pillow_jxl" ];
+  pythonRelaxDeps = [
+    "numpy"
+    "pillow"
+    "pillow-heif"
+    "pillow-jxl-plugin"
+    "structlog"
+    "typing-extensions"
+  ];
   pythonImportsCheck = [ "tagstudio" ];
 
-  build-system = [ hatchling ];
-  dependencies = [
-    chardet
-    ffmpeg-python
-    humanfriendly
-    mutagen
-    numpy
-    opencv-python
-    pillow
-    pillow-heif
-    pydub
-    pyside6
-    rawpy
-    send2trash
-    sqlalchemy
-    structlog
-    ujson
-    vtf2img
-  ] ++ lib.optional withJXLSupport pillow-jxl-plugin;
+  build-system = with python3Packages; [ hatchling ];
+  dependencies =
+    with python3Packages;
+    [
+      chardet
+      ffmpeg-python
+      humanfriendly
+      mutagen
+      numpy
+      opencv-python
+      pillow
+      pillow-heif
+      pydub
+      pyside6
+      rawpy
+      send2trash
+      sqlalchemy
+      structlog
+      ujson
+      vtf2img
+    ]
+    ++ lib.optional withJXLSupport pillow-jxl-plugin;
 
   # INFO: These tests require modifications to a library, which does not work
   # in a read-only environment.

pyproject.toml

@@ -9,39 +9,39 @@ version = "9.5.1"
 license = "GPL-3.0-only"
 readme = "README.md"
 dependencies = [
-    "chardet==5.2.0",
-    "ffmpeg-python==0.2.0",
-    "humanfriendly==10.0",
-    "mutagen==1.47.0",
-    "numpy==2.1.0",
-    "opencv_python==4.10.0.84",
-    "Pillow==10.3.0",
-    "pillow-heif==0.16.0",
-    "pillow-jxl-plugin==1.3.0",
-    "pydub==0.25.1",
-    "PySide6==6.8.0.1",
-    "rawpy==0.22.0",
-    "Send2Trash==1.8.3",
-    "SQLAlchemy==2.0.34",
-    "structlog==24.4.0",
-    "typing_extensions>=3.10.0.0,<4.11.0",
-    "ujson>=5.8.0,<5.9.0",
-    "vtf2img==0.1.0",
+    "chardet~=5.2",
+    "ffmpeg-python~=0.2",
+    "humanfriendly==10.*",
+    "mutagen~=1.47",
+    "numpy~=2.2",
+    "opencv_python~=4.11",
+    "Pillow~=11.1",
+    "pillow-heif~=0.22",
+    "pillow-jxl-plugin~=1.3",
+    "pydub~=0.25",
+    "PySide6~=6.8.0",
+    "rawpy~=0.24",
+    "Send2Trash~=1.8",
+    "SQLAlchemy~=2.0",
+    "structlog~=25.2",
+    "typing_extensions~=4.12",
+    "ujson~=5.10",
+    "vtf2img~=0.1",
 ]
 
 [project.optional-dependencies]
 dev = ["tagstudio[mkdocs,mypy,pre-commit,pyinstaller,pytest,ruff]"]
 mkdocs = ["mkdocs-material[imaging]==9.*"]
-mypy = ["mypy==1.11.2", "mypy-extensions==1.*", "types-ujson>=5.8.0,<5.9.0"]
-pre-commit = ["pre-commit==3.7.0"]
-pyinstaller = ["Pyinstaller==6.6.0"]
+mypy = ["mypy==1.15.0", "mypy-extensions==1.*", "types-ujson~=5.10"]
+pre-commit = ["pre-commit~=4.1"]
+pyinstaller = ["Pyinstaller~=6.12"]
 pytest = [
-    "pytest==8.2.0",
-    "pytest-cov==5.0.0",
+    "pytest==8.3.5",
+    "pytest-cov==6.0.0",
     "pytest-qt==4.4.0",
-    "syrupy==4.7.1",
+    "syrupy==4.9.0",
 ]
-ruff = ["ruff==0.8.1"]
+ruff = ["ruff==0.11.0"]
 
 [project.gui-scripts]
 tagstudio = "tagstudio.main:main"