Unverified Commit 655ec39c authored by Sandro Jäckel's avatar Sandro Jäckel Committed by GitHub
Browse files

Various fixes extracted from #379779 (#379820)

parents fbba7b1d d227d848
Loading
Loading
Loading
Loading
+2 −0
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@
  packaging,
  poetry-core,
  pydantic,
  requests,
  wrapt,
}:

@@ -38,6 +39,7 @@ buildPythonPackage rec {
    idna
    packaging
    pydantic
    requests
    wrapt
  ];

+4 −0
Original line number Diff line number Diff line
@@ -32,6 +32,10 @@ buildPythonPackage rec {

  build-system = [ poetry-core ];

  pythonRelaxDeps = [
    "portalocker"
  ];

  dependencies = [
    grpcio
    grpcio-tools
+14 −13
Original line number Diff line number Diff line
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

@@ -10,13 +10,14 @@ index cd698d1..c6e8a33 100644


 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"

 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:])
@@ -27,4 +28,4 @@ index cd698d1..c6e8a33 100644
+VERSION_NUM = "@version@"

 project_urls = {
     "Documentation": "https://rapidai.github.io/RapidOCRDocs/docs/install_usage/rapidocr/usage/",
     "Documentation": "https://rapidai.github.io/RapidOCRDocs",
+14 −3
Original line number Diff line number Diff line
@@ -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