From 609fb16482329f1ba2f92c803806e5b91a3f535f Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 9 Apr 2024 10:06:11 +0200 Subject: [PATCH 1/3] python312Packages.clarifai: 10.2.1 -> 10.3.0 Diff: https://github.com/Clarifai/clarifai-python/compare/refs/tags/10.2.1...10.3.0 Changelog: https://github.com/Clarifai/clarifai-python/releases/tag/10.3.0 --- pkgs/development/python-modules/clarifai/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/clarifai/default.nix b/pkgs/development/python-modules/clarifai/default.nix index 54faa5fd47c8..661c7a74bf3a 100644 --- a/pkgs/development/python-modules/clarifai/default.nix +++ b/pkgs/development/python-modules/clarifai/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { pname = "clarifai"; - version = "10.2.1"; + version = "10.3.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -33,7 +33,7 @@ buildPythonPackage rec { owner = "Clarifai"; repo = "clarifai-python"; rev = "refs/tags/${version}"; - hash = "sha256-jI85xMApeEd0Hl6h4Am5qxWoSSTWHsmb7FxUjJPmBQM="; + hash = "sha256-8EPs6kGB+Px9Fs2Z+YwDcmEYI5+z/kOIKLraJFMykF0="; }; pythonRelaxDeps = [ From 7efb1fe2f3e58e92b4be8dea3191b06fe8389fa9 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 9 Apr 2024 10:08:40 +0200 Subject: [PATCH 2/3] python312Packages.clarifai: refac tor --- pkgs/development/python-modules/clarifai/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/clarifai/default.nix b/pkgs/development/python-modules/clarifai/default.nix index 661c7a74bf3a..c1771665e505 100644 --- a/pkgs/development/python-modules/clarifai/default.nix +++ b/pkgs/development/python-modules/clarifai/default.nix @@ -45,10 +45,13 @@ buildPythonPackage rec { ]; build-system = [ - pythonRelaxDepsHook setuptools ]; + nativeBuildInputs = [ + pythonRelaxDepsHook + ]; + dependencies = [ clarifai-grpc inquirerpy From 1ad7046bcfef841998e26aaf05f7eb2c8ce36bc5 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 9 Apr 2024 10:08:57 +0200 Subject: [PATCH 3/3] python312Packages.clarifai: format with nixfmt --- .../python-modules/clarifai/default.nix | 73 ++++++++----------- 1 file changed, 30 insertions(+), 43 deletions(-) diff --git a/pkgs/development/python-modules/clarifai/default.nix b/pkgs/development/python-modules/clarifai/default.nix index c1771665e505..ee6a1eb6bc64 100644 --- a/pkgs/development/python-modules/clarifai/default.nix +++ b/pkgs/development/python-modules/clarifai/default.nix @@ -1,25 +1,26 @@ -{ lib -, buildPythonPackage -, clarifai-grpc -, fetchFromGitHub -, inquirerpy -, llama-index-core -, numpy -, opencv4 -, pandas -, pillow -, pycocotools -, pypdf -, pytestCheckHook -, pythonOlder -, pythonRelaxDepsHook -, pyyaml -, rich -, schema -, setuptools -, tabulate -, tqdm -, tritonclient +{ + lib, + buildPythonPackage, + clarifai-grpc, + fetchFromGitHub, + inquirerpy, + llama-index-core, + numpy, + opencv4, + pandas, + pillow, + pycocotools, + pypdf, + pytestCheckHook, + pythonOlder, + pythonRelaxDepsHook, + pyyaml, + rich, + schema, + setuptools, + tabulate, + tqdm, + tritonclient, }: buildPythonPackage rec { @@ -36,21 +37,13 @@ buildPythonPackage rec { hash = "sha256-8EPs6kGB+Px9Fs2Z+YwDcmEYI5+z/kOIKLraJFMykF0="; }; - pythonRelaxDeps = [ - "clarifai-grpc" - ]; + pythonRelaxDeps = [ "clarifai-grpc" ]; - pythonRemoveDeps = [ - "opencv-python" - ]; + pythonRemoveDeps = [ "opencv-python" ]; - build-system = [ - setuptools - ]; + build-system = [ setuptools ]; - nativeBuildInputs = [ - pythonRelaxDepsHook - ]; + nativeBuildInputs = [ pythonRelaxDepsHook ]; dependencies = [ clarifai-grpc @@ -70,14 +63,10 @@ buildPythonPackage rec { ]; passthru.optional-dependencies = { - all = [ - pycocotools - ]; + all = [ pycocotools ]; }; - nativeCheckInputs = [ - pytestCheckHook - ]; + nativeCheckInputs = [ pytestCheckHook ]; preCheck = '' export HOME=$(mktemp -d) @@ -102,9 +91,7 @@ buildPythonPackage rec { "clarifai/models/model_serving/repo_build/static_files/base_test.py" ]; - pythonImportsCheck = [ - "clarifai" - ]; + pythonImportsCheck = [ "clarifai" ]; meta = with lib; { description = "Clarifai Python Utilities";