pyallel 1.3.0__tar.gz → 1.3.1__tar.gz

{pyallel-1.3.0 → pyallel-1.3.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pyallel
-Version: 1.3.0
+Version: 1.3.1
 Summary: Run and handle the output of multiple executables in pyallel (as in parallel)
 Home-page: https://github.com/Danthewaann/pyallel
 License: MIT

{pyallel-1.3.0 → pyallel-1.3.1}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "pyallel"
-version = "1.3.0"
+version = "1.3.1"
 description = "Run and handle the output of multiple executables in pyallel (as in parallel)"
 authors = ["Daniel Black <danielcrblack@gmail.com>"]
 license = "MIT"

{pyallel-1.3.0 → pyallel-1.3.1}/src/pyallel/main.py

@@ -35,7 +35,7 @@ def run_interactive(
             if poll > 0:
                 return poll
 
-            printer.clear()
+            printer.reset()
             process_group_manager.run()
             if not process_group_manager.next():
                 return 0

{pyallel-1.3.0 → pyallel-1.3.1}/src/pyallel/printer.py

@@ -243,9 +243,9 @@ class Printer:
                     end="",
                 )
 
-        self.clear()
+        self.reset()
 
-    def clear(self) -> None:
+    def reset(self) -> None:
         self._printed.clear()
 
 
@@ -260,6 +260,7 @@ def set_process_lines(
 
     # Allocate lines to processes that have a fixed percentage of lines set
     used_lines = 0
+    process_with_most_lines: ProcessOutput | None = None
     other_processes: list[ProcessOutput] = []
     for out in output.processes:
         if not out.process.percentage_lines:
@@ -269,6 +270,12 @@ def set_process_lines(
         out.process.lines = int(lines * out.process.percentage_lines)
         used_lines += out.process.lines
 
+        if (
+            process_with_most_lines is None
+            or process_with_most_lines.process.lines < out.process.lines
+        ):
+            process_with_most_lines = out
+
     lines -= used_lines
 
     # Allocate the rest of the available lines to the other processes that don't have fixed lines set
@@ -280,11 +287,18 @@ def set_process_lines(
         for out in other_processes:
             out.process.lines = tail
 
-        # If we have lines left to allocate, we give all of them to the last process
+        # If we have lines left to allocate, we give all of them to the process with the highest 
+        # allocated lines or to the last process
         if remainder:
-            for out in other_processes[-1::-1]:
-                out.process.lines += remainder
-                break
+            if process_with_most_lines:
+                process_with_most_lines.process.lines += remainder
+            else:
+                other_processes[-1].process.lines += remainder
+    else:
+        # Otherwise allocate remaining lines to the process with the highest allocated lines
+        remainder = lines
+        if remainder and process_with_most_lines:
+            process_with_most_lines.process.lines += remainder
 
 
 def get_num_lines(line: str, columns: int | None = None) -> int:

{pyallel-1.3.0 → pyallel-1.3.1}/src/pyallel/process.py

@@ -82,7 +82,7 @@ class Process:
 
         args, *parts = cmd
 
-        percentage_lines = 0.0
+        percentage_lines = 0
         for arg in args.split(" "):
             try:
                 arg, value = args.split("=")
@@ -91,17 +91,17 @@ class Process:
 
             if arg == "lines":
                 try:
-                    percentage_lines = int(value) / 100
+                    percentage_lines = int(value)
                 except ValueError:
                     raise InvalidLinesModifierError(
                         "lines modifier must be a number between 1 and 100"
                     )
 
-                if not 0.0 < percentage_lines <= 1.0:
+                if not 0 < percentage_lines <= 100:
                     raise InvalidLinesModifierError(
                         "lines modifier must be a number between 1 and 100"
                     )
 
                 break
 
-        return cls(id, " ".join(parts), percentage_lines)
+        return cls(id, " ".join(parts), round(percentage_lines / 100, 2))

{pyallel-1.3.0 → pyallel-1.3.1}/src/pyallel/process_group.py

@@ -72,7 +72,7 @@ class ProcessGroup:
             percentage_lines_sum += process.percentage_lines
             processes.append(process)
 
-        if percentage_lines_sum > 1.0:
+        if round(percentage_lines_sum, 2) > 1.0:
             raise InvalidLinesModifierError(
                 "lines modifier must not exceed 100 across all processes within each process group"
             )