From 59f60f3dff7bceef3ec8c2e6dd1e1c4b01f90dc0 Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Thu, 6 Feb 2025 09:30:35 +0100 Subject: [PATCH 1/4] python312Packages.langfuse: unbreak, add missing dependency --- pkgs/development/python-modules/langfuse/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/langfuse/default.nix b/pkgs/development/python-modules/langfuse/default.nix index d1ca1a65af39..f499cb0aca8e 100644 --- a/pkgs/development/python-modules/langfuse/default.nix +++ b/pkgs/development/python-modules/langfuse/default.nix @@ -12,6 +12,7 @@ packaging, poetry-core, pydantic, + requests, wrapt, }: @@ -38,6 +39,7 @@ buildPythonPackage rec { idna packaging pydantic + requests wrapt ]; From 41ef2e876d37c66f68b8665503663945845115ee Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Thu, 6 Feb 2025 10:21:56 +0100 Subject: [PATCH 2/4] python312Packages.qdrant-client: relax `portalocker` dependency --- pkgs/development/python-modules/qdrant-client/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/python-modules/qdrant-client/default.nix b/pkgs/development/python-modules/qdrant-client/default.nix index 20de8ca53130..f4ec594f2153 100644 --- a/pkgs/development/python-modules/qdrant-client/default.nix +++ b/pkgs/development/python-modules/qdrant-client/default.nix @@ -32,6 +32,10 @@ buildPythonPackage rec { build-system = [ poetry-core ]; + pythonRelaxDeps = [ + "portalocker" + ]; + dependencies = [ grpcio grpcio-tools From 9ea2a1de240a92529d6b481c22513676cadf1db2 Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Thu, 6 Feb 2025 10:22:22 +0100 Subject: [PATCH 3/4] python312Packages.rapidocr-onnxruntime: unbreak, recreate the patch --- .../setup-py-override-version-checking.patch | 27 ++++++++++--------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/pkgs/development/python-modules/rapidocr-onnxruntime/setup-py-override-version-checking.patch b/pkgs/development/python-modules/rapidocr-onnxruntime/setup-py-override-version-checking.patch index 227618c2a60c..3800ded38c6a 100644 --- a/pkgs/development/python-modules/rapidocr-onnxruntime/setup-py-override-version-checking.patch +++ b/pkgs/development/python-modules/rapidocr-onnxruntime/setup-py-override-version-checking.patch @@ -1,22 +1,23 @@ -diff --git a/setup_onnxruntime.py b/setup_onnxruntime.py -index cd698d1..c6e8a33 100644 ---- a/setup_onnxruntime.py -+++ b/setup_onnxruntime.py +diff --git i/setup_onnxruntime.py w/setup_onnxruntime.py +index e9572e9..f5f3b32 100644 +--- i/setup_onnxruntime.py ++++ w/setup_onnxruntime.py @@ -6,7 +6,6 @@ from pathlib import Path from typing import List, Union - + import setuptools -from get_pypi_latest_version import GetPyPiLatestVersion - - + + def read_txt(txt_path: Union[Path, str]) -> List[str]: -@@ -26,16 +25,7 @@ def get_readme(): - +@@ -25,17 +24,7 @@ def get_readme(): + + MODULE_NAME = "rapidocr_onnxruntime" - +- -obtainer = GetPyPiLatestVersion() -latest_version = obtainer(MODULE_NAME) --VERSION_NUM = obtainer.version_add_one(latest_version) +-VERSION_NUM = obtainer.version_add_one(latest_version, add_patch=True) - -if len(sys.argv) > 2: - match_str = " ".join(sys.argv[2:]) @@ -25,6 +26,6 @@ index cd698d1..c6e8a33 100644 - VERSION_NUM = matched_versions -sys.argv = sys.argv[:2] +VERSION_NUM = "@version@" - + project_urls = { - "Documentation": "https://rapidai.github.io/RapidOCRDocs/docs/install_usage/rapidocr/usage/", + "Documentation": "https://rapidai.github.io/RapidOCRDocs", From d227d84815671fa1cec347d33e956df1300a8bfb Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Thu, 6 Feb 2025 10:23:11 +0100 Subject: [PATCH 4/4] python312Packages.youtube-transcript-api: unbreak, switch to poetry, add missing dependencies --- .../youtube-transcript-api/default.nix | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/youtube-transcript-api/default.nix b/pkgs/development/python-modules/youtube-transcript-api/default.nix index a26d5f9ca60b..80c913d9f130 100644 --- a/pkgs/development/python-modules/youtube-transcript-api/default.nix +++ b/pkgs/development/python-modules/youtube-transcript-api/default.nix @@ -2,6 +2,8 @@ lib, buildPythonPackage, fetchFromGitHub, + poetry-core, + defusedxml, requests, mock, httpretty, @@ -12,18 +14,27 @@ buildPythonPackage rec { pname = "youtube-transcript-api"; version = "0.6.3"; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "jdepoix"; - repo = pname; + repo = "youtube-transcript-api"; tag = "v${version}"; hash = "sha256-ZoF9BOQLrq2GVCZ98I8C9qouUhwZKEPp0zlTAqyEoYk="; }; - propagatedBuildInputs = [ requests ]; + build-system = [ poetry-core ]; + + pythonRelaxDeps = [ + "defusedxml" + ]; + + dependencies = [ + defusedxml + requests + ]; nativeCheckInputs = [ mock