libpipe 0.4__tar.gz → 0.5__tar.gz

libpipe-0.5/PKG-INFO

@@ -0,0 +1,34 @@
+Metadata-Version: 2.3
+Name: libpipe
+Version: 0.5
+Summary: Pipeline orchestration and node management utilities
+License: GPL-3.0-or-later
+Author: Florent Mertens
+Author-email: florent.mertens@gmail.com
+Requires-Python: >=3.10
+Classifier: License :: OSI Approved :: GNU General Public License v3 or later (GPLv3+)
+Classifier: Programming Language :: Python :: 3
+Classifier: Programming Language :: Python :: 3.10
+Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
+Requires-Dist: asyncssh (>=2.0)
+Requires-Dist: click (>=8.0)
+Requires-Dist: progressbar2 (>=3.40)
+Requires-Dist: toml (>=0.10)
+Description-Content-Type: text/markdown
+
+Libpipe
+=======
+
+Common pipeline framework and library
+
+Installation
+------------
+
+libpipe can be installed via pip:
+
+    $ pip install libpipe
+
+and requires Python 3.6.0 or higher.
+

{libpipe-0.4 → libpipe-0.5}/libpipe/tests/test_worker.py

@@ -224,13 +224,18 @@ def test_run_on_host():
 
         for i in range(20 * n_hosts):
             w.add('echo 0', run_on_host=random.choice(hosts))
+        w.add('echo 0', run_on_host='wrong_host')
+        task_last = w.tasks[-1]
 
         success, errors = w.execute()
 
         assert len(errors) == 0
 
         for task in success:
-            assert task.remote_host == task.run_on_host
+            if task == task_last:
+                assert task.run_on_host == None
+            else:
+                assert task.remote_host == task.run_on_host
 
 
 def test_line_too_long(tmp_path):

{libpipe-0.4 → libpipe-0.5}/libpipe/worker.py

@@ -249,7 +249,7 @@ class Client(object):
             try:
                 self.conn, self.client = await asyncssh.create_connection(SSHClient, self.host, username=self.user,
                                                                           password=self.password, agent_forwarding=True)
-                self.conn.set_keepalive(60, 3)
+                self.conn.set_keepalive(120, 5)
             except Exception:
                 raise
             finally:
@@ -445,6 +445,7 @@ class WorkerPool(object):
         """
         if run_on_host is not None and run_on_host not in self.hosts:
             print(f'Requested run_on_host "{run_on_host}" is not in the hosts list. Releasing constraint ...')
+            run_on_host = None
 
         if self.env_file:
             command = f"bash -c '. {self.env_file}; {command}'"
@@ -519,6 +520,9 @@ class WorkerPool(object):
         asyncio.get_event_loop().call_soon_threadsafe(sys.exit, exit_code)
 
     async def process_tasks(self):
+        # Sort tasks so that those with run_on_host are started first
+        self.tasks.sort(key=lambda task: not task.run_on_host)
+
         self.pbar.start(max_value=len(self.tasks))
 
         self.futures = [asyncio.ensure_future(task.run(self)) for task in self.tasks]

libpipe-0.5/pyproject.toml

@@ -0,0 +1,29 @@
+[build-system]
+requires = ["poetry-core>=1.9.0"]
+build-backend = "poetry.core.masonry.api"
+
+[project]
+name = "libpipe"
+version = "0.5"
+description = "Pipeline orchestration and node management utilities"
+readme = "README.md"
+license = { text = "GPL-3.0-or-later" }
+authors = [
+    { name = "Florent Mertens", email = "florent.mertens@gmail.com" }
+]
+repository = "https://gitlab.com/flomertens/libpipe"
+requires-python = ">=3.10"
+
+dependencies = [
+    "asyncssh>=2.0",
+    "progressbar2>=3.40",
+    "toml>=0.10",
+    "click>=8.0",
+]
+
+[project.scripts]
+nodetool = "libpipe.tools.nodetool:main"
+
+[tool.poetry.group.dev.dependencies]
+pytest = "^8.0"
+pytest-cov = "^5.0"

libpipe-0.4/PKG-INFO

@@ -1,39 +0,0 @@
-Metadata-Version: 2.1
-Name: libpipe
-Version: 0.4
-Summary: 
-Home-page: https://gitlab.com/flomertens/libpipe
-License: GPL-3.0-or-later
-Author: "Florent Mertens"
-Author-email: "florent.mertens@gmail.com"
-Requires-Python: >=3.6,<4.0
-Classifier: License :: OSI Approved :: GNU General Public License v3 or later (GPLv3+)
-Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.6
-Classifier: Programming Language :: Python :: 3.7
-Classifier: Programming Language :: Python :: 3.8
-Classifier: Programming Language :: Python :: 3.9
-Classifier: Programming Language :: Python :: 3.10
-Classifier: Programming Language :: Python :: 3.11
-Requires-Dist: asyncssh (>=2.0,<3.0)
-Requires-Dist: click (>=7.0,<9.0)
-Requires-Dist: importlib-metadata (>=1.0,<2.0); python_version < "3.8"
-Requires-Dist: progressbar2 (>=3.40)
-Requires-Dist: toml (>=0.10)
-Project-URL: Repository, https://gitlab.com/flomertens/libpipe
-Description-Content-Type: text/markdown
-
-Libpipe
-=======
-
-Common pipeline framework and library
-
-Installation
-------------
-
-libpipe can be installed via pip:
-
-    $ pip install libpipe
-
-and requires Python 3.6.0 or higher.
-

libpipe-0.4/pyproject.toml

@@ -1,27 +0,0 @@
-[tool.poetry]
-name = "libpipe"
-version = "0.4"
-description = ""
-authors = ["\"Florent Mertens\" <\"florent.mertens@gmail.com\">"]
-license = "GPL-3.0-or-later"
-readme = 'README.md'
-repository = "https://gitlab.com/flomertens/libpipe"
-
-[tool.poetry.dependencies]
-python = "^3.6"
-asyncssh = "^2.0"
-progressbar2 = ">=3.40"
-toml = ">=0.10"
-click = "^7.0 | ^8.0"
-importlib-metadata = {version = "^1.0", python = "<3.8"}
-
-[tool.poetry.dev-dependencies]
-pytest = ">=5.2"
-pytest-cov = "^2.8.1"
-
-[tool.poetry.scripts]
-nodetool = "libpipe.tools.nodetool:main"
-
-[build-system]
-requires = ["poetry-core>=1.0.8"]
-build-backend = "poetry.core.masonry.api"

libpipe-0.4/setup.py

@@ -1,38 +0,0 @@
-# -*- coding: utf-8 -*-
-from setuptools import setup
-
-packages = \
-['libpipe', 'libpipe.tests', 'libpipe.tools']
-
-package_data = \
-{'': ['*']}
-
-install_requires = \
-['asyncssh>=2.0,<3.0', 'click>=7.0,<9.0', 'progressbar2>=3.40', 'toml>=0.10']
-
-extras_require = \
-{':python_version < "3.8"': ['importlib-metadata>=1.0,<2.0']}
-
-entry_points = \
-{'console_scripts': ['nodetool = libpipe.tools.nodetool:main']}
-
-setup_kwargs = {
-    'name': 'libpipe',
-    'version': '0.4',
-    'description': '',
-    'long_description': 'Libpipe\n=======\n\nCommon pipeline framework and library\n\nInstallation\n------------\n\nlibpipe can be installed via pip:\n\n    $ pip install libpipe\n\nand requires Python 3.6.0 or higher.\n',
-    'author': '"Florent Mertens"',
-    'author_email': '"florent.mertens@gmail.com"',
-    'maintainer': 'None',
-    'maintainer_email': 'None',
-    'url': 'https://gitlab.com/flomertens/libpipe',
-    'packages': packages,
-    'package_data': package_data,
-    'install_requires': install_requires,
-    'extras_require': extras_require,
-    'entry_points': entry_points,
-    'python_requires': '>=3.6,<4.0',
-}
-
-
-setup(**setup_kwargs)