From edac3666df541a1af3504d94f40276e0a377b117 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 29 Apr 2024 12:49:50 +0200 Subject: [PATCH 1/3] python312Packages.weaviate-client: refactor --- .../weaviate-client/default.nix | 32 +++++++++++++------ 1 file changed, 23 insertions(+), 9 deletions(-) diff --git a/pkgs/development/python-modules/weaviate-client/default.nix b/pkgs/development/python-modules/weaviate-client/default.nix index 5db198141293..6b632cc6682c 100644 --- a/pkgs/development/python-modules/weaviate-client/default.nix +++ b/pkgs/development/python-modules/weaviate-client/default.nix @@ -2,7 +2,13 @@ , authlib , buildPythonPackage , fetchPypi +, grpcio +, grpcio-health-checking +, grpcio-tools +, httpx +, pydantic , pythonOlder +, pythonRelaxDepsHook , setuptools-scm , tqdm , validators @@ -11,27 +17,35 @@ buildPythonPackage rec { pname = "weaviate-client"; version = "4.5.1"; - format = "setuptools"; + pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; hash = "sha256-gElboFIwEMiwN6HhpPPT+tcmh0pMiDjq7R8TG2eMMKI="; }; - postPatch = '' - substituteInPlace setup.cfg \ - --replace "validators>=0.18.2,<=0.21.0" "validators>=0.18.2" \ - --replace "requests>=2.28.0,<2.29.0" "requests>=2.28.0" - ''; + pythonRelaxDeps = [ + "httpx" + "validators" + ]; - nativeBuildInputs = [ + build-system = [ setuptools-scm ]; - propagatedBuildInputs = [ + nativeBuildInputs = [ + pythonRelaxDepsHook + ]; + + dependencies = [ authlib + grpcio + grpcio-health-checking + grpcio-tools + httpx + pydantic tqdm validators ]; From 892323fac6cb05d2aad51c34d41157dfb7282a35 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 29 Apr 2024 12:50:15 +0200 Subject: [PATCH 2/3] python312Packages.weaviate-client: format with nixmft --- .../weaviate-client/default.nix | 41 ++++++++----------- 1 file changed, 18 insertions(+), 23 deletions(-) diff --git a/pkgs/development/python-modules/weaviate-client/default.nix b/pkgs/development/python-modules/weaviate-client/default.nix index 6b632cc6682c..817c0d11b631 100644 --- a/pkgs/development/python-modules/weaviate-client/default.nix +++ b/pkgs/development/python-modules/weaviate-client/default.nix @@ -1,17 +1,18 @@ -{ lib -, authlib -, buildPythonPackage -, fetchPypi -, grpcio -, grpcio-health-checking -, grpcio-tools -, httpx -, pydantic -, pythonOlder -, pythonRelaxDepsHook -, setuptools-scm -, tqdm -, validators +{ + lib, + authlib, + buildPythonPackage, + fetchPypi, + grpcio, + grpcio-health-checking, + grpcio-tools, + httpx, + pydantic, + pythonOlder, + pythonRelaxDepsHook, + setuptools-scm, + tqdm, + validators, }: buildPythonPackage rec { @@ -31,13 +32,9 @@ buildPythonPackage rec { "validators" ]; - build-system = [ - setuptools-scm - ]; + build-system = [ setuptools-scm ]; - nativeBuildInputs = [ - pythonRelaxDepsHook - ]; + nativeBuildInputs = [ pythonRelaxDepsHook ]; dependencies = [ authlib @@ -52,9 +49,7 @@ buildPythonPackage rec { doCheck = false; - pythonImportsCheck = [ - "weaviate" - ]; + pythonImportsCheck = [ "weaviate" ]; meta = with lib; { description = "Python native client for easy interaction with a Weaviate instance"; From e91977cfc07004044b0dc9626347a9bc9b4103ea Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 29 Apr 2024 12:53:07 +0200 Subject: [PATCH 3/3] python312Packages.weaviate-client: 4.5.1 -> 4.5.6 Diff: https://github.com/weaviate/weaviate-python-client/compare/refs/tags/v4.5.1...v4.5.6 Changelog: https://github.com/weaviate/weaviate-python-client/releases/tag/v4.5.6 --- .../python-modules/weaviate-client/default.nix | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/weaviate-client/default.nix b/pkgs/development/python-modules/weaviate-client/default.nix index 817c0d11b631..f92ef94177d5 100644 --- a/pkgs/development/python-modules/weaviate-client/default.nix +++ b/pkgs/development/python-modules/weaviate-client/default.nix @@ -2,7 +2,7 @@ lib, authlib, buildPythonPackage, - fetchPypi, + fetchFromGitHub, grpcio, grpcio-health-checking, grpcio-tools, @@ -17,14 +17,16 @@ buildPythonPackage rec { pname = "weaviate-client"; - version = "4.5.1"; + version = "4.5.6"; pyproject = true; disabled = pythonOlder "3.8"; - src = fetchPypi { - inherit pname version; - hash = "sha256-gElboFIwEMiwN6HhpPPT+tcmh0pMiDjq7R8TG2eMMKI="; + src = fetchFromGitHub { + owner = "weaviate"; + repo = "weaviate-python-client"; + rev = "refs/tags/v${version}"; + hash = "sha256-P1GiTsRDbJssoLZR//c+b4IJ2Zyb/0PaBLL+wmmI6zc="; }; pythonRelaxDeps = [