pyallel 1.2.4__tar.gz → 1.2.6__tar.gz

{pyallel-1.2.4 → pyallel-1.2.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pyallel
-Version: 1.2.4
+Version: 1.2.6
 Summary: Run and handle the output of multiple executables in pyallel (as in parallel)
 Home-page: https://github.com/Danthewaann/pyallel
 License: MIT
@@ -17,6 +17,8 @@ Classifier: Programming Language :: Python :: 3.8
 Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
 Project-URL: Repository, https://github.com/Danthewaann/pyallel
 Description-Content-Type: text/markdown
 

{pyallel-1.2.4 → pyallel-1.2.6}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "pyallel"
-version = "1.2.4"
+version = "1.2.6"
 description = "Run and handle the output of multiple executables in pyallel (as in parallel)"
 authors = ["Daniel Black <danielcrblack@gmail.com>"]
 license = "MIT"
@@ -25,7 +25,7 @@ python = ">=3.8,<3.14"
 [tool.poetry.group.dev.dependencies]
 pytest = "^7.4.3"
 mypy = "^1.7.0"
-pyinstaller = "6.4.0"
+pyinstaller = "6.11.0"
 
 [tool.mypy]
 strict = true

{pyallel-1.2.4 → pyallel-1.2.6}/src/pyallel/constants.py

@@ -1,5 +1,5 @@
-import os
 import re
+import shutil
 import sys
 
 IN_TTY = sys.stdout.isatty()
@@ -10,10 +10,10 @@ ANSI_ESCAPE = re.compile(r"(\x9B|\x1B\[|\x1B\()[0-?]*[ -\/]*[@-~]")
 if IN_TTY:
 
     def COLUMNS() -> int:
-        return os.get_terminal_size().columns
+        return shutil.get_terminal_size().columns
 
     def LINES() -> int:
-        return os.get_terminal_size().lines
+        return shutil.get_terminal_size().lines
 
 else:
 

{pyallel-1.2.4 → pyallel-1.2.6}/src/pyallel/process_group.py

@@ -291,11 +291,12 @@ class ProcessGroup:
                 self.output[process.id].append("")
             self.output[process.id][0] += p_output
             p_output = self.output[process.id][0]
-            p_output_lines = 0
+            p_output_lines_num = 0
             if p_output:
                 if not all:
+                    p_output_lines = p_output.splitlines()[-self.process_lines[i - 1] :]
                     p_output = ""
-                    for line in p_output.splitlines()[-self.process_lines[i - 1] :]:
+                    for line in p_output_lines:
                         if len(line) + 3 > constants.COLUMNS():
                             p_output += f"{''.join(line[:constants.COLUMNS()-3])}\n"
                         else:
@@ -305,10 +306,15 @@ class ProcessGroup:
                     p_output += "\n"
                 if i != num_processes:
                     p_output += "\n"
-                p_output_lines = get_num_lines(p_output)
-
-            if not all and (command_lines + p_output_lines) > self.process_lines[i - 1]:
-                truncate = (command_lines + p_output_lines) - self.process_lines[i - 1]
+                p_output_lines_num = get_num_lines(p_output)
+
+            if (
+                not all
+                and (command_lines + p_output_lines_num) > self.process_lines[i - 1]
+            ):
+                truncate = (command_lines + p_output_lines_num) - self.process_lines[
+                    i - 1
+                ]
                 p_output = "\n".join(p_output.splitlines()[truncate:])
                 p_output += "\n"