From f9653cc113accdcf34a92e9bb0163e8148cf03e6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 27 Sep 2024 00:31:31 +0000 Subject: [PATCH 1/3] python312Packages.albucore: 0.0.15 -> 0.0.17 --- pkgs/development/python-modules/albucore/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/albucore/default.nix b/pkgs/development/python-modules/albucore/default.nix index b176b817da83..07f2e3f4ce72 100644 --- a/pkgs/development/python-modules/albucore/default.nix +++ b/pkgs/development/python-modules/albucore/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "albucore"; - version = "0.0.15"; + version = "0.0.17"; pyproject = true; disabled = pythonOlder "3.8"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "albumentations-team"; repo = "albucore"; rev = "refs/tags/${version}"; - hash = "sha256-FA11dVw47KucSYU1+3oxw6GUQfPZtjoNPUb96vb6wqo="; + hash = "sha256-9fv5jewfL3JKhZyD0YS1WDNZ7wWt+8iF2DcygCOl168="; }; pythonRemoveDeps = [ "opencv-python" ]; From 2a2dc509feb8fd663f7b1c77e22cb1b99fa912de Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Fri, 27 Sep 2024 13:24:39 -0700 Subject: [PATCH 2/3] python312Packages.albumentations: 1.4.11 -> 1.4.16 Diff: https://github.com/albumentations-team/albumentations/compare/refs/tags/1.4.11...1.4.16 Changelog: https://github.com/albumentations-team/albumentations/releases/tag/1.4.12 https://github.com/albumentations-team/albumentations/releases/tag/1.4.13 https://github.com/albumentations-team/albumentations/releases/tag/1.4.14 https://github.com/albumentations-team/albumentations/releases/tag/1.4.15 https://github.com/albumentations-team/albumentations/releases/tag/1.4.16 --- .../python-modules/albumentations/default.nix | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/albumentations/default.nix b/pkgs/development/python-modules/albumentations/default.nix index a7bc2d525140..4c641ca0aab0 100644 --- a/pkgs/development/python-modules/albumentations/default.nix +++ b/pkgs/development/python-modules/albumentations/default.nix @@ -15,8 +15,12 @@ pydantic, pyyaml, scikit-image, - scikit-learn, + # optional dependencies + huggingface-hub, + pillow, + + # tests deepdiff, pytestCheckHook, pytest-mock, @@ -26,7 +30,7 @@ buildPythonPackage rec { pname = "albumentations"; - version = "1.4.11"; + version = "1.4.16"; pyproject = true; disabled = pythonOlder "3.8"; @@ -35,7 +39,7 @@ buildPythonPackage rec { owner = "albumentations-team"; repo = "albumentations"; rev = "refs/tags/${version}"; - hash = "sha256-1070V9+EZ4qrhxmbMyvTbu89pLoonrn0Peb8nwp2lwA="; + hash = "sha256-cfft5RovAJaCNTD9P9KsAJFmdwHwE0gYQ3yd6a3AAMU="; }; pythonRemoveDeps = [ "opencv-python" ]; @@ -50,9 +54,13 @@ buildPythonPackage rec { pydantic pyyaml scikit-image - scikit-learn ]; + optional-dependencies = { + hub = [ huggingface-hub ]; + text = [ pillow ]; + }; + nativeCheckInputs = [ deepdiff pytestCheckHook @@ -62,6 +70,7 @@ buildPythonPackage rec { ]; disabledTests = [ + "test_pca_inverse_transform" # this test hangs up "test_transforms" ]; From 51a4c5aacc3bf696729e032dde5a1ef6f4d5c64c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Fri, 27 Sep 2024 19:32:16 -0700 Subject: [PATCH 3/3] immich-machine-learning: fix albumentations override --- pkgs/by-name/im/immich-machine-learning/package.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/im/immich-machine-learning/package.nix b/pkgs/by-name/im/immich-machine-learning/package.nix index 5b35ecfaea04..c24e6672e31b 100644 --- a/pkgs/by-name/im/immich-machine-learning/package.nix +++ b/pkgs/by-name/im/immich-machine-learning/package.nix @@ -15,7 +15,7 @@ let doCheck = false; }); - albumentations = super.albumentations.overridePythonAttrs (_: rec { + albumentations = super.albumentations.overridePythonAttrs (old: rec { version = "1.4.3"; src = fetchFromGitHub { owner = "albumentations-team"; @@ -23,6 +23,9 @@ let rev = version; hash = "sha256-JIBwjYaUP4Sc1bVM/zlj45cz9OWpb/LOBsIqk1m+sQA="; }; + dependencies = old.dependencies ++ [ + self.scikit-learn + ]; }); }; };