rawmaker 2.40.3__tar.gz → 2.40.5__tar.gz

{rawmaker-2.40.3 → rawmaker-2.40.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: rawmaker
-Version: 2.40.3
+Version: 2.40.5
 Author-email: Helmut Konrad Schewe <helmutus@outlook.com>
 License-Expression: MIT
 Project-URL: Homepage, https://github.com/anaticulae/rawmaker
@@ -12,19 +12,21 @@ Requires-Python: >=3.12
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: pdfminer.six<20270000,>=20260107
-Requires-Dist: pillow<13.0.0,>=12.2.0
-Requires-Dist: camelot_py<2.0.0,>=1.0.9
-Requires-Dist: utilo<3.0.0,>=2.105.0
+Requires-Dist: pillow<13.0.0,>=12.3.0
+Requires-Dist: utilo<3.0.0,>=2.109.0
 Requires-Dist: configos<2.0.0,>=1.0.4
-Requires-Dist: iamraw<5.0.0,>=4.91.0
+Requires-Dist: iamraw<5.0.0,>=4.91.7
 Requires-Dist: protoerror<4.0.0,>=3.20.2
 Requires-Dist: ughost<2.0.0,>=1.0.1
 Requires-Dist: pdflog<2.0.0,>=1.0.2
 Provides-Extra: dev
-Requires-Dist: hoverpower<2.0.0,>=1.1.0; extra == "dev"
-Requires-Dist: jamer<2.0.0,>=1.0.1; extra == "dev"
-Requires-Dist: utilotest<2.0.0,>=1.0.2; extra == "dev"
-Requires-Dist: gennex<2.0.0,>=1.0.1; extra == "dev"
+Requires-Dist: hoverpower<2.0.0,>=1.5.1; extra == "dev"
+Requires-Dist: jamer<2.0.0,>=1.0.2; extra == "dev"
+Requires-Dist: utilotest<2.0.0,>=1.0.4; extra == "dev"
+Requires-Dist: gennex<2.0.0,>=1.0.3; extra == "dev"
+Requires-Dist: yamlfix<2.0.0,>=1.19.1; extra == "dev"
+Provides-Extra: table
+Requires-Dist: camelot_py<2.0.0,>=1.0.9; extra == "table"
 Dynamic: license-file
 
 # rawmaker - convert PDF to raw data

{rawmaker-2.40.3 → rawmaker-2.40.5}/letty/optimizer.py

@@ -10,7 +10,6 @@
 import collections
 import concurrent
 import itertools
-import math
 import os
 import sys
 
@@ -99,10 +98,10 @@ def strategy(
     lines: int = 1,
     boxes: int = 1,
 ):
-    boxes_flow = ranges(0.5, 1.0, boxes)
-    char_margin = ranges(0.5, 20.0, chars)
-    line_margin = ranges(0.01, 5.0, lines)
-    word_margin = ranges(1.5, 5.0, words)
+    boxes_flow = utilo.ranged_exp(0.5, 1.0, boxes)
+    char_margin = utilo.ranged_exp(0.5, 20.0, chars)
+    line_margin = utilo.ranged_exp(0.01, 5.0, lines)
+    word_margin = utilo.ranged_exp(1.5, 5.0, words)
     result = []
     for char, word, box, line, in itertools.product(
             char_margin,
@@ -117,22 +116,3 @@ def strategy(
             'line_margin': line,
         })
     return result
-
-
-# TODO: REPLACE WITH utilo CODE
-def ranges(mini: float, maxi: float, steps: int = 15):
-    """Compute parameter.
-
-    >>> utilo.roundme(ranges(0.1, 100, steps=10))
-    [0.1, 0.12, 0.18, 0.34, 0.76, 1.92, 5.06, 13.61, 36.84, 99.99]
-    >>> utilo.roundme(ranges(0.1, 20, steps=5))
-    [0.1, 0.73, 2.43, 7.06, 19.64]
-    """
-    func = math.exp
-    maxed = func(steps - 1) / (maxi - mini)
-    result = []
-    for index in range(steps):
-        value = mini + (math.exp(index) - 1) / maxed
-        value = utilo.roundme(value, digits=5)  # pylint:disable=R0204
-        result.append(value)
-    return result

{rawmaker-2.40.3 → rawmaker-2.40.5}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "rawmaker"
-version = "2.40.3"
+version = "2.40.5"
 description = ""
 requires-python = ">=3.12"
 authors = [
@@ -8,11 +8,10 @@ authors = [
 ]
 dependencies = [
     "pdfminer.six>=20260107,<20270000",
-    "pillow>=12.2.0,<13.0.0",
-    "camelot_py>=1.0.9,<2.0.0",
-    "utilo>=2.105.0,<3.0.0",
+    "pillow>=12.3.0,<13.0.0",
+    "utilo>=2.109.0,<3.0.0",
     "configos>=1.0.4,<2.0.0",
-    "iamraw>=4.91.0,<5.0.0",
+    "iamraw>=4.91.7,<5.0.0",
     "protoerror>=3.20.2,<4.0.0",
     "ughost>=1.0.1,<2.0.0",
     "pdflog>=1.0.2,<2.0.0",
@@ -34,10 +33,14 @@ content-type = "text/markdown"
 
 [project.optional-dependencies]
 dev = [
-    "hoverpower>=1.1.0,<2.0.0",
-    "jamer>=1.0.1,<2.0.0",
-    "utilotest>=1.0.2,<2.0.0",
-    "gennex>=1.0.1,<2.0.0",
+    "hoverpower>=1.5.1,<2.0.0",
+    "jamer>=1.0.2,<2.0.0",
+    "utilotest>=1.0.4,<2.0.0",
+    "gennex>=1.0.3,<2.0.0",
+    "yamlfix>=1.19.1,<2.0.0",
+]
+table = [
+    "camelot_py>=1.0.9,<2.0.0",
 ]
 
 [project.urls]

{rawmaker-2.40.3 → rawmaker-2.40.5}/rawmaker/cli_automate.py

@@ -12,7 +12,6 @@ import os
 import sys
 
 import utilo
-import utilotest
 
 DESCRIPTION = """\
 Collect pdf files of defined folders and use them to run rawmaker.
@@ -60,7 +59,7 @@ def run(inpath: str, outpath: str, cores: int = 1):
         _, name = os.path.split(item)
         # use quotation marks to encapsulate file path white spaces
         item = f'"{item}"' if ' ' in str(item) else item
-        name = utilotest.simple(name)  # TODO: REPLACE WITH utilo CODE
+        name = utilo.simple(name)
         out = os.path.join(outpath, name)
         cmd = f'rawmaker -i {item} -o {out} -j4'
         cmds.append(cmd)

{rawmaker-2.40.3 → rawmaker-2.40.5}/rawmaker/reader.py

@@ -44,9 +44,8 @@ def read(path: str, password: str = None, verify: bool = True) -> PDFDocument:
     if verify:
         header = open(path, 'rb').read(5)
         if header != b'%PDF-':
-            # TODO: MOVE TO def before() method after upgrading utilo
-            utilo.error('invalid pdf header')
-            sys.exit(1)
+            # TODO: MOVE TO def before() method after upgrading utilo ?
+            utilo.exitx('invalid pdf header')
     with open(path, 'rb') as fp:
         # Create a PDF parser object associated with the file object.
         parser = PDFParser(fp)

{rawmaker-2.40.3 → rawmaker-2.40.5}/rawmaker.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: rawmaker
-Version: 2.40.3
+Version: 2.40.5
 Author-email: Helmut Konrad Schewe <helmutus@outlook.com>
 License-Expression: MIT
 Project-URL: Homepage, https://github.com/anaticulae/rawmaker
@@ -12,19 +12,21 @@ Requires-Python: >=3.12
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: pdfminer.six<20270000,>=20260107
-Requires-Dist: pillow<13.0.0,>=12.2.0
-Requires-Dist: camelot_py<2.0.0,>=1.0.9
-Requires-Dist: utilo<3.0.0,>=2.105.0
+Requires-Dist: pillow<13.0.0,>=12.3.0
+Requires-Dist: utilo<3.0.0,>=2.109.0
 Requires-Dist: configos<2.0.0,>=1.0.4
-Requires-Dist: iamraw<5.0.0,>=4.91.0
+Requires-Dist: iamraw<5.0.0,>=4.91.7
 Requires-Dist: protoerror<4.0.0,>=3.20.2
 Requires-Dist: ughost<2.0.0,>=1.0.1
 Requires-Dist: pdflog<2.0.0,>=1.0.2
 Provides-Extra: dev
-Requires-Dist: hoverpower<2.0.0,>=1.1.0; extra == "dev"
-Requires-Dist: jamer<2.0.0,>=1.0.1; extra == "dev"
-Requires-Dist: utilotest<2.0.0,>=1.0.2; extra == "dev"
-Requires-Dist: gennex<2.0.0,>=1.0.1; extra == "dev"
+Requires-Dist: hoverpower<2.0.0,>=1.5.1; extra == "dev"
+Requires-Dist: jamer<2.0.0,>=1.0.2; extra == "dev"
+Requires-Dist: utilotest<2.0.0,>=1.0.4; extra == "dev"
+Requires-Dist: gennex<2.0.0,>=1.0.3; extra == "dev"
+Requires-Dist: yamlfix<2.0.0,>=1.19.1; extra == "dev"
+Provides-Extra: table
+Requires-Dist: camelot_py<2.0.0,>=1.0.9; extra == "table"
 Dynamic: license-file
 
 # rawmaker - convert PDF to raw data

rawmaker-2.40.5/rawmaker.egg-info/requires.txt

@@ -0,0 +1,18 @@
+pdfminer.six<20270000,>=20260107
+pillow<13.0.0,>=12.3.0
+utilo<3.0.0,>=2.109.0
+configos<2.0.0,>=1.0.4
+iamraw<5.0.0,>=4.91.7
+protoerror<4.0.0,>=3.20.2
+ughost<2.0.0,>=1.0.1
+pdflog<2.0.0,>=1.0.2
+
+[dev]
+hoverpower<2.0.0,>=1.5.1
+jamer<2.0.0,>=1.0.2
+utilotest<2.0.0,>=1.0.4
+gennex<2.0.0,>=1.0.3
+yamlfix<2.0.0,>=1.19.1
+
+[table]
+camelot_py<2.0.0,>=1.0.9

{rawmaker-2.40.3 → rawmaker-2.40.5}/tests/test_horizontals.py

@@ -88,9 +88,7 @@ def test_lines_master099c(td, mp):
     cmd = f'-i {hoverpower.MASTER099C_PDF} --pages=7,8,9,10,80,81,82 --line --horizontals'
     tests.run(cmd, mp=mp)
     lines = serializeraw.load_horizontals(td.tmpdir)
-    boundings = []
-    for page in lines:
-        boundings.append((page.page, page.content[0].box[3]))
+    boundings = [(page.page, page.content[0].box[3]) for page in lines]
     # page, horizontal y1 bounding
     expected = [
         (7, 618.6),

{rawmaker-2.40.3 → rawmaker-2.40.5}/tests/test_master.py

@@ -27,8 +27,19 @@ def test_master_compare_vim(td, mp):
 
     golden = tests.resources.GOLDEN_VIM
     current = td.tmpdir
-    diff = f'diff -rd --suppress-common-lines -y {golden} {current}'
+    # run yamlfix to compare to golden master correctly
+    utilo.run(f'yamlfix {current}', cwd=td.tmpdir)
 
+    if is_busybox():
+        diff = f'diff -ru {golden} {current}'
+    else:
+        diff = f'diff -rd --suppress-common-lines -y {golden} {current}'
     completed = utilo.run(diff)
+
     utilo.error(completed.stdout)
     assert completed.returncode == utilo.SUCCESS
+
+
+def is_busybox() -> bool:
+    completed = utilo.run('diff --help')
+    return 'BusyBox' in completed.stderr

rawmaker-2.40.3/rawmaker.egg-info/requires.txt

@@ -1,15 +0,0 @@
-pdfminer.six<20270000,>=20260107
-pillow<13.0.0,>=12.2.0
-camelot_py<2.0.0,>=1.0.9
-utilo<3.0.0,>=2.105.0
-configos<2.0.0,>=1.0.4
-iamraw<5.0.0,>=4.91.0
-protoerror<4.0.0,>=3.20.2
-ughost<2.0.0,>=1.0.1
-pdflog<2.0.0,>=1.0.2
-
-[dev]
-hoverpower<2.0.0,>=1.1.0
-jamer<2.0.0,>=1.0.1
-utilotest<2.0.0,>=1.0.2
-gennex<2.0.0,>=1.0.1