cleepcli 1.45.0__tar.gz → 1.45.1__tar.gz

{cleepcli-1.45.0/cleepcli.egg-info → cleepcli-1.45.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cleepcli
-Version: 1.45.0
+Version: 1.45.1
 Summary: Cleep-cli helps developers to build great Cleep applications from command line.
 Home-page: https://github.com/CleepDevice/cleep-cli
 Author: Tanguy Bonneau
@@ -142,7 +142,7 @@ The [watchdog](https://pypi.org/project/watchdog/) python library is used to det
 
 ## CI (GitHub Actions)
 
-A tag `vX.Y.Z` (or a manual **workflow_dispatch**) builds a **py3** wheel + sdist on `ubuntu-latest` (Python 3.9) via `python -m build` and uploads them to PyPI.
+A tag `vX.Y.Z` (or a manual **workflow_dispatch**) builds a **py3** wheel + sdist on `ubuntu-latest` (Python 3.12) via `python -m build` and uploads them to PyPI.
 
 GitHub **environment** `actions` (Settings → Environments), secret:
 

{cleepcli-1.45.0 → cleepcli-1.45.1}/README.md

@@ -106,7 +106,7 @@ The [watchdog](https://pypi.org/project/watchdog/) python library is used to det
 
 ## CI (GitHub Actions)
 
-A tag `vX.Y.Z` (or a manual **workflow_dispatch**) builds a **py3** wheel + sdist on `ubuntu-latest` (Python 3.9) via `python -m build` and uploads them to PyPI.
+A tag `vX.Y.Z` (or a manual **workflow_dispatch**) builds a **py3** wheel + sdist on `ubuntu-latest` (Python 3.12) via `python -m build` and uploads them to PyPI.
 
 GitHub **environment** `actions` (Settings → Environments), secret:
 

{cleepcli-1.45.0 → cleepcli-1.45.1}/cleepcli/console.py

@@ -4,6 +4,7 @@
 import sys
 import subprocess
 import time
+import atexit
 from threading import Timer, Thread
 try: # pragma: no cover
     from Queue import Queue, Empty
@@ -58,12 +59,40 @@ class EndlessConsole(Thread):
         self.__stderr_queue = Queue()
         self.__stdout_thread = None
         self.__stderr_thread = None
+        self.__proc = None
+        self.__pid = None
+        # Child runs in its own session (setsid). Reap it if the CLI exits via
+        # Ctrl-C before kill() — otherwise coverage/pytest can orphan and OOM a Pi.
+        atexit.register(self.__reap_child)
 
     def __del__(self):
         """
         Destructor
         """
         self.__stop()
+        self.__reap_child()
+
+    def __reap_child(self):
+        """Kill leftover process group if the subprocess is still running."""
+        pid = self.__pid
+        proc = self.__proc
+        if not pid or pid == 1:
+            return
+        try:
+            if proc is not None and proc.poll() is None:
+                self.logger.debug('Reaping leftover process group pid=%s', pid)
+                if ON_POSIX:
+                    os.killpg(os.getpgid(pid), signal.SIGKILL)
+                else:  # pragma: no cover
+                    proc.kill()
+                self.killed = True
+        except Exception:  # pragma: no cover
+            pass
+        finally:
+            try:
+                atexit.unregister(self.__reap_child)
+            except Exception:  # pragma: no cover
+                pass
 
     def __enqueue_output(self, output, queue):
         for line in iter(output.readline, b''):
@@ -103,6 +132,7 @@ class EndlessConsole(Thread):
         self.logger.debug('Process killed manually')
         self.killed = True
         self.__stop()
+        self.__reap_child()
 
     def __send_stds(self):
         """
@@ -156,7 +186,9 @@ class EndlessConsole(Thread):
             close_fds=True,
             preexec_fn=os.setsid
         )
-        pid = proc.pid
+        self.__proc = proc
+        self.__pid = proc.pid
+        pid = self.__pid
         self.logger.trace('PID=%d' % pid)
 
         if self.callback:
@@ -214,14 +246,19 @@ class EndlessConsole(Thread):
         except Exception: # pragma: no cover
             pass
 
-        # make sure process (and child processes) is really killed
-        if self.killed and pid != 1:
+        # Always reap the process group if still alive. The child is started in its
+        # own session (setsid): if the CLI exits on Ctrl-C without kill(), pytest/
+        # coverage would otherwise keep running and can OOM a Raspberry Pi.
+        if pid != 1:
             try:
-                if ON_POSIX:
-                    os.killpg(os.getpgid(pid), signal.SIGKILL)
-                else: # pragma: no cover
-                    proc.kill()
-            except Exception: # pragma: no cover
+                if proc.poll() is None:
+                    self.logger.debug('Terminating leftover process group pid=%s', pid)
+                    if ON_POSIX:
+                        os.killpg(os.getpgid(pid), signal.SIGKILL)
+                    else:  # pragma: no cover
+                        proc.kill()
+                    self.killed = True
+            except Exception:  # pragma: no cover
                 pass
 
         # process is over

{cleepcli-1.45.0 → cleepcli-1.45.1}/cleepcli/test.py

@@ -379,56 +379,6 @@ PYTHONPATH=. python3 -m pytest tests -k "%s"
         """
         return config.REPO_DIR
 
-    def __list_core_files(self, core_path, pattern=None):
-        """
-        Return all python files on core with their associated tests
-
-        Args:
-            core_path (string): core path
-            pattern (str): custom pattern to filter files to process
-
-        Returns:
-            dict: list of files with test file path::
-
-                {
-                    python file (string): test file (string)
-                }
-
-        """
-        files = []
-        tests_path = self.__get_core_tests_path()
-
-        self.logger.info('Searching core files...')
-        for root, _, filenames in os.walk(core_path):
-            for filename in filenames:
-                # build paths
-                filepath = os.path.join(root, filename)
-                core_relative_path = root.replace('%s' % core_path, '')
-                core_relative_path = core_relative_path[1:] if core_relative_path.startswith('/') else core_relative_path
-                test_filepath = os.path.join(tests_path, core_relative_path, 'test_%s' % filename)
-
-                # drop useless files
-                if not filename.endswith('.py'):
-                    self.logger.debug('  Drop file "%s": not python file', filepath)
-                    continue
-                if filename.startswith('__init__'):
-                    self.logger.debug('  Drop file "%s": python init file', filepath)
-                    continue
-                if filename.startswith('test_'):
-                    self.logger.debug('  Drop file "%s": test file', filepath)
-                    continue
-                if root.endswith('libs/tests'):
-                    self.logger.debug('  Drop file "%s": test lib', filepath)
-                    continue
-                if pattern and not re.search(pattern, test_filepath) and not re.search(pattern, filepath):
-                    self.logger.debug('  Drop file "%s": does not match pattern %s', filepath, pattern)
-                    continue
-
-                self.logger.debug('  Found "%s" [%s]' % (filepath, test_filepath))
-                files.append((filepath, test_filepath))
-
-        return files
-
     def core_tests(self, display_coverage=False, display_test_output=False, xml=False, quiet=True, pattern=None):
         """
         Execute core unit tests and display process output on stdout
@@ -469,8 +419,15 @@ PYTHONPATH=. coverage run --omit="*/lib/python*/*","*/tests/*","*test_*.py" --so
         c = EndlessConsole(cmd, console_callback, self.__console_end_callback)
         c.start()
 
-        while self.__endless_command_running:
-            time.sleep(0.25)
+        try:
+            while self.__endless_command_running:
+                time.sleep(0.25)
+        except KeyboardInterrupt:
+            self.logger.warning('Interrupted — stopping tests...')
+            c.kill()
+            while self.__endless_command_running:
+                time.sleep(0.1)
+            raise
 
         success = self.__endless_command_return_code == 0
 

{cleepcli-1.45.0 → cleepcli-1.45.1}/cleepcli/version.py

@@ -1,4 +1,4 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 
-VERSION = "1.45.0"
+VERSION = "1.45.1"

{cleepcli-1.45.0 → cleepcli-1.45.1/cleepcli.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cleepcli
-Version: 1.45.0
+Version: 1.45.1
 Summary: Cleep-cli helps developers to build great Cleep applications from command line.
 Home-page: https://github.com/CleepDevice/cleep-cli
 Author: Tanguy Bonneau
@@ -142,7 +142,7 @@ The [watchdog](https://pypi.org/project/watchdog/) python library is used to det
 
 ## CI (GitHub Actions)
 
-A tag `vX.Y.Z` (or a manual **workflow_dispatch**) builds a **py3** wheel + sdist on `ubuntu-latest` (Python 3.9) via `python -m build` and uploads them to PyPI.
+A tag `vX.Y.Z` (or a manual **workflow_dispatch**) builds a **py3** wheel + sdist on `ubuntu-latest` (Python 3.12) via `python -m build` and uploads them to PyPI.
 
 GitHub **environment** `actions` (Settings → Environments), secret: