Unverified Commit b0494e60 authored by Nick Cao's avatar Nick Cao Committed by GitHub
Browse files

Merge pull request #270317 from NixOS/backport-270059-to-release-23.11 

[Backport release-23.11] python311Packages.clarifai: 9.7.1 -> 9.10.4; python311Packages.clarifai-grpc: 9.10.0 -> 9.10.5
parents 0e6503a0 e8732813

pkgs/development/python-modules/clarifai-grpc/default.nix

+13 −6
Original line number Diff line number Diff line 
{ lib

, buildPythonPackage

, fetchPypi

, fetchFromGitHub

, pythonOlder

, setuptools

, googleapis-common-protos

, grpcio

, protobuf
@@ -10,16 +11,22 @@ 


buildPythonPackage rec {

  pname = "clarifai-grpc";

  version = "9.10.0";

  format = "setuptools";

  version = "9.10.5";

  pyproject = true;



  disabled = pythonOlder "3.8";



  src = fetchPypi {

    inherit pname version;

    hash = "sha256-8jx2OP1VcQtGmen58r1k/w7srjSJC/53sNxFrRm7IXs=";

  src = fetchFromGitHub {

    owner = "Clarifai";

    repo = "clarifai-python-grpc";

    rev = "refs/tags/${version}";

    hash = "sha256-lTvxafPdWET0p6dRnaTiOd8oPOjcRFZ45AtXkObNSBQ=";

  };



  nativeBuildInputs = [

    setuptools

  ];



  propagatedBuildInputs = [

    googleapis-common-protos

    grpcio

pkgs/development/python-modules/clarifai/default.nix

+43 −6
Original line number Diff line number Diff line
@@ -2,38 +2,75 @@ 
, buildPythonPackage

, fetchFromGitHub

, pythonOlder

, setuptools

, clarifai-grpc

, numpy

, opencv4

, pillow

, pyyaml

, rich

, schema

, tqdm

, tritonclient

, pytestCheckHook

}:



buildPythonPackage rec {

  pname = "clarifai";

  version = "9.7.1";

  format = "setuptools";

  version = "9.10.4";

  pyproject = true;



  disabled = pythonOlder "3.8";



  src = fetchFromGitHub {

    owner = "Clarifai";

    repo = "clarifai-python-utils";

    repo = "clarifai-python";

    rev = "refs/tags/${version}";

    hash = "sha256-/zgHgD2kf3ZG7Mu9AEBfOwqpcD0Ye0LVrFxLeuGurCM=";

    hash = "sha256-i/B4wtSqG/ZysAcidsXnqYPdcmu93Ufd6N9fxUmDJ2E=";

  };



  nativeBuildInputs = [

    setuptools

  ];



  propagatedBuildInputs = [

    clarifai-grpc

    numpy

    tqdm

    opencv4

    tritonclient

    rich

    schema

    pillow

    pyyaml

  ];



  nativeCheckInputs = [

    pytestCheckHook

  ];



  disabledTests = [

    # require network access and API key

    "test_export_workflow_general"

  ];



  disabledTestPaths = [

    # require network access and API key

    "tests/test_app.py"

    "tests/test_data_upload.py"

    "tests/test_model_predict.py"

    "tests/test_model_train.py"

    "tests/test_search.py"

    "tests/workflow/test_create_delete.py"

    "tests/workflow/test_predict.py"

  ];



  pythonImportsCheck = [ "clarifai" ];



  meta = with lib; {

    description = "Clarifai Python Utilities";

    homepage = "https://github.com/Clarifai/clarifai-python-utils";

    changelog = "https://github.com/Clarifai/clarifai-python-utils/releases/tag/${src.rev}";

    homepage = "https://github.com/Clarifai/clarifai-python";

    changelog = "https://github.com/Clarifai/clarifai-python/releases/tag/${src.rev}";

    license = licenses.asl20;

    maintainers = with maintainers; [ natsukium ];

  };