From d3477df1ea84cab8f759798aff24af415c13c7af Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 4 Apr 2024 23:10:27 +0200 Subject: [PATCH 1/2] python312Packages.qdrant-client: refactor --- .../python-modules/qdrant-client/default.nix | 26 +++++++++---------- 1 file changed, 12 insertions(+), 14 deletions(-) diff --git a/pkgs/development/python-modules/qdrant-client/default.nix b/pkgs/development/python-modules/qdrant-client/default.nix index 79cd40c2a2f3..1f919bfcb6df 100644 --- a/pkgs/development/python-modules/qdrant-client/default.nix +++ b/pkgs/development/python-modules/qdrant-client/default.nix @@ -1,48 +1,46 @@ { lib , buildPythonPackage +, fastembed , fetchFromGitHub , grpcio , grpcio-tools , httpx , numpy -, pytestCheckHook , poetry-core +, portalocker , pydantic +, pytest-asyncio +, pytestCheckHook , pythonOlder , urllib3 -, portalocker -, fastembed -# check inputs -, pytest-asyncio }: buildPythonPackage rec { pname = "qdrant-client"; version = "1.8.2"; - format = "pyproject"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "qdrant"; - repo = pname; + repo = "qdrant-client"; rev = "refs/tags/v${version}"; hash = "sha256-skPBKSqtwMfm5Tvvhg0pSOsnrf0tfvsUgwxjnUbj3NA="; }; - nativeBuildInputs = [ + build-system = [ poetry-core ]; - propagatedBuildInputs = [ - numpy - httpx + dependencies = [ grpcio - # typing-extensions grpcio-tools + httpx + numpy + portalocker pydantic urllib3 - portalocker ] ++ httpx.optional-dependencies.http2; pythonImportsCheck = [ @@ -54,7 +52,7 @@ buildPythonPackage rec { pytest-asyncio ]; - # tests require network access + # Tests require network access doCheck = false; passthru.optional-dependencies = { From ffd81766ce9ec9de06928ae94e9ab0dfbb30a731 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 4 Apr 2024 23:10:44 +0200 Subject: [PATCH 2/2] python312Packages.qdrant-client: format with nixfmt --- .../python-modules/qdrant-client/default.nix | 39 +++++++++---------- 1 file changed, 18 insertions(+), 21 deletions(-) diff --git a/pkgs/development/python-modules/qdrant-client/default.nix b/pkgs/development/python-modules/qdrant-client/default.nix index 1f919bfcb6df..a2538e32e485 100644 --- a/pkgs/development/python-modules/qdrant-client/default.nix +++ b/pkgs/development/python-modules/qdrant-client/default.nix @@ -1,18 +1,19 @@ -{ lib -, buildPythonPackage -, fastembed -, fetchFromGitHub -, grpcio -, grpcio-tools -, httpx -, numpy -, poetry-core -, portalocker -, pydantic -, pytest-asyncio -, pytestCheckHook -, pythonOlder -, urllib3 +{ + lib, + buildPythonPackage, + fastembed, + fetchFromGitHub, + grpcio, + grpcio-tools, + httpx, + numpy, + poetry-core, + portalocker, + pydantic, + pytest-asyncio, + pytestCheckHook, + pythonOlder, + urllib3, }: buildPythonPackage rec { @@ -29,9 +30,7 @@ buildPythonPackage rec { hash = "sha256-skPBKSqtwMfm5Tvvhg0pSOsnrf0tfvsUgwxjnUbj3NA="; }; - build-system = [ - poetry-core - ]; + build-system = [ poetry-core ]; dependencies = [ grpcio @@ -43,9 +42,7 @@ buildPythonPackage rec { urllib3 ] ++ httpx.optional-dependencies.http2; - pythonImportsCheck = [ - "qdrant_client" - ]; + pythonImportsCheck = [ "qdrant_client" ]; nativeCheckInputs = [ pytestCheckHook