From 76c3146e9a1f7904a356e92f65a06ee8f52d74dc Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 14 May 2023 09:09:49 +0200 Subject: [PATCH 1/6] python311Packages.weaviate-client: equalize --- .../python-modules/weaviate-client/default.nix | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/weaviate-client/default.nix b/pkgs/development/python-modules/weaviate-client/default.nix index da0e6348024e..eccc7fe7d267 100644 --- a/pkgs/development/python-modules/weaviate-client/default.nix +++ b/pkgs/development/python-modules/weaviate-client/default.nix @@ -1,4 +1,10 @@ -{ lib, buildPythonPackage, fetchPypi, authlib, tqdm, validators }: +{ lib +, authlib +, buildPythonPackage +, fetchPypi +, tqdm +, validators +}: buildPythonPackage rec { pname = "weaviate-client"; @@ -14,7 +20,11 @@ buildPythonPackage rec { --replace "validators>=0.18.2,<0.20.0" "validators>=0.18.2,<0.21.0" ''; - propagatedBuildInputs = [ authlib tqdm validators ]; + propagatedBuildInputs = [ + authlib + tqdm + validators + ]; doCheck = false; From 23f73a61f97e1454d3ef22386f10d3c5ec4e3d96 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 14 May 2023 09:13:27 +0200 Subject: [PATCH 2/6] python311Packages.weaviate-client: update meta - add changelog to meta --- pkgs/development/python-modules/weaviate-client/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/weaviate-client/default.nix b/pkgs/development/python-modules/weaviate-client/default.nix index eccc7fe7d267..8df8b21543e0 100644 --- a/pkgs/development/python-modules/weaviate-client/default.nix +++ b/pkgs/development/python-modules/weaviate-client/default.nix @@ -29,8 +29,9 @@ buildPythonPackage rec { doCheck = false; meta = with lib; { + description = "Python native client for easy interaction with a Weaviate instance"; homepage = "https://github.com/weaviate/weaviate-python-client"; - description = "A python native client for easy interaction with a Weaviate instance."; + changelog = "https://github.com/weaviate/weaviate-python-client/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ happysalada ]; }; From 6fac48341b6faf7b770aa824f3f005f49b7a8605 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 14 May 2023 09:15:00 +0200 Subject: [PATCH 3/6] python311Packages.weaviate-client: disable on unsupported Python releases - add format --- pkgs/development/python-modules/weaviate-client/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/python-modules/weaviate-client/default.nix b/pkgs/development/python-modules/weaviate-client/default.nix index 8df8b21543e0..17a6127595dd 100644 --- a/pkgs/development/python-modules/weaviate-client/default.nix +++ b/pkgs/development/python-modules/weaviate-client/default.nix @@ -2,6 +2,7 @@ , authlib , buildPythonPackage , fetchPypi +, pythonOlder , tqdm , validators }: @@ -9,6 +10,9 @@ buildPythonPackage rec { pname = "weaviate-client"; version = "3.18.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; From 77f755bb8b436cbb31a10eb3464823bfcf7ee25b Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 14 May 2023 09:16:47 +0200 Subject: [PATCH 4/6] python311Packages.weaviate-client: add pythonImportsCheck --- pkgs/development/python-modules/weaviate-client/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/python-modules/weaviate-client/default.nix b/pkgs/development/python-modules/weaviate-client/default.nix index 17a6127595dd..45df76de2319 100644 --- a/pkgs/development/python-modules/weaviate-client/default.nix +++ b/pkgs/development/python-modules/weaviate-client/default.nix @@ -32,6 +32,10 @@ buildPythonPackage rec { doCheck = false; + pythonImportsCheck = [ + "weaviate" + ]; + meta = with lib; { description = "Python native client for easy interaction with a Weaviate instance"; homepage = "https://github.com/weaviate/weaviate-python-client"; From cc68809a67955bc66d933ef8997d6b5e399242b4 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 14 May 2023 09:21:21 +0200 Subject: [PATCH 5/6] python311Packages.weaviate-client: relax requests constraint --- pkgs/development/python-modules/weaviate-client/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/weaviate-client/default.nix b/pkgs/development/python-modules/weaviate-client/default.nix index 45df76de2319..5d69d2a29b3f 100644 --- a/pkgs/development/python-modules/weaviate-client/default.nix +++ b/pkgs/development/python-modules/weaviate-client/default.nix @@ -21,7 +21,8 @@ buildPythonPackage rec { postPatch = '' substituteInPlace setup.cfg \ - --replace "validators>=0.18.2,<0.20.0" "validators>=0.18.2,<0.21.0" + --replace "validators>=0.18.2,<0.20.0" "validators>=0.18.2" \ + --replace "requests>=2.28.0,<2.29.0" "requests>=2.28.0" ''; propagatedBuildInputs = [ From 67609c59f5f07c8b0579f37000fa9111ebb8ea5b Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 14 May 2023 09:33:16 +0200 Subject: [PATCH 6/6] python311Packages.weaviate-client: fix versioning --- .../development/python-modules/weaviate-client/default.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/development/python-modules/weaviate-client/default.nix b/pkgs/development/python-modules/weaviate-client/default.nix index 5d69d2a29b3f..50cca6436cb4 100644 --- a/pkgs/development/python-modules/weaviate-client/default.nix +++ b/pkgs/development/python-modules/weaviate-client/default.nix @@ -3,6 +3,7 @@ , buildPythonPackage , fetchPypi , pythonOlder +, setuptools-scm , tqdm , validators }: @@ -19,12 +20,18 @@ buildPythonPackage rec { hash = "sha256-QjpSZRijJQXFKTMo5fJS5su/IOSzEkcz9w0Q/A1oI8k="; }; + SETUPTOOLS_SCM_PRETEND_VERSION = version; + postPatch = '' substituteInPlace setup.cfg \ --replace "validators>=0.18.2,<0.20.0" "validators>=0.18.2" \ --replace "requests>=2.28.0,<2.29.0" "requests>=2.28.0" ''; + nativeBuildInputs = [ + setuptools-scm + ]; + propagatedBuildInputs = [ authlib tqdm