python3.pkgs.pyocr: 0.7.2 -> 0.8.3

pkgs/development/python-modules/pyocr/default.nix

···
 , fetchFromGitLab
 , buildPythonPackage
 , pillow
-, setuptools-scm
-, setuptools-scm-git-archive
 , tesseract
 , cuneiform
 , isPy3k
···
 
 buildPythonPackage rec {
   pname = "pyocr";
-  version = "0.7.2";
+  version = "0.8.3";
   disabled = !isPy3k;
 
   # Don't fetch from PYPI because it doesn't contain tests.
···
     owner = "OpenPaperwork";
     repo = "pyocr";
     rev = version;
-    sha256 = "09ab86bmizpv94w3mdvdqkjyyvk1vafw3jqhkiw5xx7p180xn3il";
+    sha256 = "sha256-gIn50H9liQcTb7SzoWnBwm5LTvkr+R+5OPvITls1B/w=";
   };
 
   patches = [
···
     })
   ];
 
-  SETUPTOOLS_SCM_PRETEND_VERSION = version;
-
-  buildInputs = [ setuptools-scm setuptools-scm-git-archive ];
+  # see the logic in setup.py
+  ENABLE_SETUPTOOLS_SCM = "0";
+  preConfigure = ''
+    echo 'version = "${version}"' > src/pyocr/_version.py
+  '';
 
   propagatedBuildInputs = [ pillow ];
 
···
     inherit (src.meta) homepage;
     description = "A Python wrapper for Tesseract and Cuneiform";
     license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ ];
+    maintainers = with maintainers; [ symphorien ];
   };
 }

pkgs/development/python-modules/pyocr/paths.patch

···
+commit c4bac00441363fcaeb074682d8226ca523614ea2
+Author: Guillaume Girol <[e-mail]>
+Date:   Sat Aug 20 17:48:01 2022 +0200
+
+    Fix finding tesseract and cuneiform
+
 diff --git a/src/pyocr/cuneiform.py b/src/pyocr/cuneiform.py
 index 2e5b717..35647e2 100644
 --- a/src/pyocr/cuneiform.py
···
  LANGUAGES_LINE_PREFIX = "Supported languages: "
  LANGUAGES_SPLIT_RE = re.compile("[^a-z]")
 diff --git a/src/pyocr/libtesseract/tesseract_raw.py b/src/pyocr/libtesseract/tesseract_raw.py
-index a068e73..9ebea5c 100644
+index 2002614..9ebea5c 100644
 --- a/src/pyocr/libtesseract/tesseract_raw.py
 +++ b/src/pyocr/libtesseract/tesseract_raw.py
 @@ -2,7 +2,6 @@ import ctypes
···
  
  from ..error import TesseractError
  
-@@ -10,48 +9,16 @@ from ..error import TesseractError
+@@ -10,51 +9,16 @@ from ..error import TesseractError
  logger = logging.getLogger(__name__)
  
  TESSDATA_PREFIX = os.getenv('TESSDATA_PREFIX', None)
···
 -            )
 -        )
 -    else:
--        TESSDATA_PREFIX = tessdata
+-        TESSDATA_PREFIX = os.path.join(tessdata, "tessdata")
 -
 -
 -if sys.platform[:3] == "win":  # pragma: no cover
···
 -    ]
 -else:
 -    libnames += [
+-        "libtesseract.so.5",
 -        "libtesseract.so.4",
 -        "libtesseract.so.3",
+-        "libtesseract.5.dylib",
+-        "libtesseract.4.dylib",
 -    ]
 -
 +libnames = [ "@tesseract@/lib/libtesseract.so" ]
  
  g_libtesseract = None
  
-@@ -364,12 +331,12 @@ def init(lang=None):
+@@ -367,12 +331,12 @@ def init(lang=None):
      try:
          if lang:
              lang = lang.encode("utf-8")
···
          )
          g_libtesseract.TessBaseAPISetVariable(
 diff --git a/src/pyocr/tesseract.py b/src/pyocr/tesseract.py
-index 7c30852..44e8446 100644
+index 0fe0d20..c1fdd27 100644
 --- a/src/pyocr/tesseract.py
 +++ b/src/pyocr/tesseract.py
 @@ -28,8 +28,7 @@ from .builders import DigitBuilder  # backward compatibility
···
              stderr=subprocess.STDOUT
          )
 diff --git a/tests/tests_libtesseract.py b/tests/tests_libtesseract.py
-index ad7fdc9..57e7a60 100644
+index a5d46d8..8b9e315 100644
 --- a/tests/tests_libtesseract.py
 +++ b/tests/tests_libtesseract.py
 @@ -165,7 +165,8 @@ class TestLibTesseractRaw(BaseTest):
···
  
              self.assertEqual(
 diff --git a/tests/tests_tesseract.py b/tests/tests_tesseract.py
-index 1a55567..a24d96f 100644
+index 18d01ef..593cf94 100644
 --- a/tests/tests_tesseract.py
 +++ b/tests/tests_tesseract.py
 @@ -36,7 +36,7 @@ class TestTesseract(BaseTest):
···
  
      @patch("subprocess.Popen")
      def test_version_error(self, popen):
-@@ -156,7 +156,7 @@ class TestTesseract(BaseTest):
+@@ -162,7 +162,7 @@ class TestTesseract(BaseTest):
          for lang in ("eng", "fra", "jpn", "osd"):
              self.assertIn(lang, langs)
          popen.assert_called_once_with(
···
              startupinfo=None, creationflags=0,
              stdout=subprocess.PIPE, stderr=subprocess.STDOUT
          )
-@@ -171,7 +171,7 @@ class TestTesseract(BaseTest):
+@@ -177,7 +177,7 @@ class TestTesseract(BaseTest):
          self.assertEqual(te.exception.status, 1)
          self.assertEqual("unable to get languages", te.exception.message)
          popen.assert_called_once_with(
···
              startupinfo=None, creationflags=0,
              stdout=subprocess.PIPE, stderr=subprocess.STDOUT
          )
-@@ -248,7 +248,7 @@ class TestTesseract(BaseTest):
+@@ -254,7 +254,7 @@ class TestTesseract(BaseTest):
          self.assertEqual(status, 0)
          self.assertEqual(error, message)
          popen.assert_called_once_with(
···
              cwd=tmpdir,
              startupinfo=None,
              creationflags=0,
-@@ -271,7 +271,7 @@ class TestTesseract(BaseTest):
+@@ -277,7 +277,7 @@ class TestTesseract(BaseTest):
          self.assertEqual(status, 0)
          self.assertEqual(error, message)
          popen.assert_called_with(
···
              cwd=tmpdir,
              startupinfo=None,
              creationflags=0,
-@@ -302,7 +302,7 @@ class TestTesseract(BaseTest):
+@@ -308,7 +308,7 @@ class TestTesseract(BaseTest):
              self.assertEqual(result["angle"], 90)
              self.assertEqual(result["confidence"], 9.30)
              popen.assert_called_once_with(
···
                  stdin=subprocess.PIPE,
                  shell=False,
                  startupinfo=None,
-@@ -338,7 +338,7 @@ class TestTesseract(BaseTest):
+@@ -344,7 +344,7 @@ class TestTesseract(BaseTest):
              self.assertEqual(result["angle"], 90)
              self.assertEqual(result["confidence"], 9.30)
              popen.assert_called_once_with(
···
                  stdin=subprocess.PIPE,
                  shell=False,
                  startupinfo=None,
-@@ -371,7 +371,7 @@ class TestTesseract(BaseTest):
+@@ -377,7 +377,7 @@ class TestTesseract(BaseTest):
              self.assertEqual(result["angle"], 90)
              self.assertEqual(result["confidence"], 9.30)
              popen.assert_called_once_with(
···
                   "--psm", "0", "-l", "osd"],
                  stdin=subprocess.PIPE,
                  shell=False,
-@@ -399,7 +399,7 @@ class TestTesseract(BaseTest):
+@@ -405,7 +405,7 @@ class TestTesseract(BaseTest):
              with self.assertRaises(tesseract.TesseractError) as te:
                  tesseract.detect_orientation(self.image)
              popen.assert_called_once_with(
···
                  stdin=subprocess.PIPE,
                  shell=False,
                  startupinfo=None,
-@@ -433,7 +433,7 @@ class TestTesseract(BaseTest):
+@@ -439,7 +439,7 @@ class TestTesseract(BaseTest):
              with self.assertRaises(tesseract.TesseractError) as te:
                  tesseract.detect_orientation(self.image)
              popen.assert_called_once_with(
···
                  stdin=subprocess.PIPE,
                  shell=False,
                  startupinfo=None,
-@@ -467,7 +467,7 @@ class TestTesseract(BaseTest):
+@@ -473,7 +473,7 @@ class TestTesseract(BaseTest):
              self.assertEqual(result["angle"], 90)
              self.assertEqual(result["confidence"], 9.30)
              popen.assert_called_once_with(
···
                  stdin=subprocess.PIPE,
                  shell=False,
                  startupinfo=None,
-@@ -500,7 +500,7 @@ class TestTesseract(BaseTest):
+@@ -506,7 +506,7 @@ class TestTesseract(BaseTest):
              self.assertEqual(result["angle"], 90)
              self.assertEqual(result["confidence"], 9.30)
              popen.assert_called_once_with(
···
                  stdin=subprocess.PIPE,
                  shell=False,
                  startupinfo=None,
-@@ -527,7 +527,7 @@ class TestTesseract(BaseTest):
+@@ -533,7 +533,7 @@ class TestTesseract(BaseTest):
              with self.assertRaises(tesseract.TesseractError) as te:
                  tesseract.detect_orientation(self.image)
              popen.assert_called_once_with(
···
                  stdin=subprocess.PIPE,
                  shell=False,
                  startupinfo=None,
-@@ -561,7 +561,7 @@ class TestTesseract(BaseTest):
+@@ -567,7 +567,7 @@ class TestTesseract(BaseTest):
              with self.assertRaises(tesseract.TesseractError) as te:
                  tesseract.detect_orientation(self.image)
              popen.assert_called_once_with(