parsl 2024.5.6__tar.gz → 2024.5.13__tar.gz

{parsl-2024.5.6/parsl.egg-info → parsl-2024.5.13}/PKG-INFO

@@ -1,9 +1,9 @@
 Metadata-Version: 2.1
 Name: parsl
-Version: 2024.5.6
+Version: 2024.5.13
 Summary: Simple data dependent workflows in Python
 Home-page: https://github.com/Parsl/parsl
-Download-URL: https://github.com/Parsl/parsl/archive/2024.05.06.tar.gz
+Download-URL: https://github.com/Parsl/parsl/archive/2024.05.13.tar.gz
 Author: The Parsl Team
 Author-email: parsl@googlegroups.com
 License: Apache 2.0

{parsl-2024.5.6 → parsl-2024.5.13}/parsl/dataflow/dflow.py

@@ -1177,12 +1177,9 @@ class DataFlowKernel:
         self.job_status_poller.add_executors(block_executors)
 
     def atexit_cleanup(self) -> None:
-        if not self.cleanup_called:
-            logger.warning("Python is exiting with a DFK still running. "
-                           "You should call parsl.dfk().cleanup() before "
-                           "exiting to release any resources")
-        else:
-            logger.info("python process is exiting, but DFK has already been cleaned up")
+        logger.warning("Python is exiting with a DFK still running. "
+                       "You should call parsl.dfk().cleanup() before "
+                       "exiting to release any resources")
 
     def wait_for_current_tasks(self) -> None:
         """Waits for all tasks in the task list to be completed, by waiting for their
@@ -1270,6 +1267,10 @@ class DataFlowKernel:
             self.monitoring.close()
             logger.info("Terminated monitoring")
 
+        logger.info("Unregistering atexit hook")
+        atexit.unregister(self.atexit_cleanup)
+        logger.info("Unregistered atexit hook")
+
         logger.info("DFK cleanup complete")
 
     def checkpoint(self, tasks: Optional[Sequence[TaskRecord]] = None) -> str:

{parsl-2024.5.6 → parsl-2024.5.13}/parsl/executors/high_throughput/interchange.py

@@ -310,6 +310,8 @@ class Interchange:
                                 'tasks': len(m['tasks']),
                                 'idle_duration': idle_duration,
                                 'active': m['active'],
+                                'parsl_version': m['parsl_version'],
+                                'python_version': m['python_version'],
                                 'draining': m['draining']}
                         reply.append(resp)
 
@@ -435,6 +437,8 @@ class Interchange:
                                                     'worker_count': 0,
                                                     'active': True,
                                                     'draining': False,
+                                                    'parsl_version': msg['parsl_v'],
+                                                    'python_version': msg['python_v'],
                                                     'tasks': []}
                 self.connected_block_history.append(msg['block_id'])
 

{parsl-2024.5.6 → parsl-2024.5.13}/parsl/executors/high_throughput/manager_record.py

@@ -14,3 +14,5 @@ class ManagerRecord(TypedDict, total=False):
     last_heartbeat: float
     idle_since: Optional[float]
     timestamp: datetime
+    parsl_version: str
+    python_version: str

{parsl-2024.5.6 → parsl-2024.5.13}/parsl/providers/pbspro/pbspro.py

@@ -7,9 +7,7 @@ from parsl.channels import LocalChannel
 from parsl.jobs.states import JobState, JobStatus
 from parsl.launchers import SingleNodeLauncher
 from parsl.providers.pbspro.template import template_string
-from parsl.providers import TorqueProvider
-
-from parsl.providers.torque.torque import translate_table
+from parsl.providers.torque.torque import TorqueProvider, translate_table
 
 logger = logging.getLogger(__name__)
 

parsl-2024.5.13/parsl/tests/test_htex/test_managers_command.py

@@ -0,0 +1,40 @@
+import pytest
+import logging
+
+import sys
+import parsl
+from parsl.app.app import python_app
+from parsl.tests.configs.htex_local import fresh_config
+
+
+def local_setup():
+    config = fresh_config()
+    config.executors[0].poll_period = 1
+    config.executors[0].max_workers_per_node = 1
+    parsl.load(config)
+
+
+def local_teardown():
+    parsl.dfk().cleanup()
+    parsl.clear()
+
+
+@python_app
+def dummy():
+    pass
+
+
+@pytest.mark.local
+def test_connected_managers():
+
+    # Run dummy function to ensure a manager is online
+    x = dummy()
+    assert x.result() is None
+    executor = parsl.dfk().executors['htex_local']
+    manager_info_list = executor.connected_managers()
+    assert len(manager_info_list) == 1
+    manager_info = manager_info_list[0]
+    assert 'python_version' in manager_info
+    assert 'parsl_version' in manager_info
+    assert manager_info['parsl_version'] == parsl.__version__
+    assert manager_info['python_version'] == f"{sys.version_info.major}.{sys.version_info.minor}.{sys.version_info.micro}"

{parsl-2024.5.6 → parsl-2024.5.13}/parsl/version.py

@@ -3,4 +3,4 @@
 Year.Month.Day[alpha/beta/..]
 Alphas will be numbered like this -> 2024.12.10a0
 """
-VERSION = '2024.05.06'
+VERSION = '2024.05.13'

{parsl-2024.5.6 → parsl-2024.5.13/parsl.egg-info}/PKG-INFO

@@ -1,9 +1,9 @@
 Metadata-Version: 2.1
 Name: parsl
-Version: 2024.5.6
+Version: 2024.5.13
 Summary: Simple data dependent workflows in Python
 Home-page: https://github.com/Parsl/parsl
-Download-URL: https://github.com/Parsl/parsl/archive/2024.05.06.tar.gz
+Download-URL: https://github.com/Parsl/parsl/archive/2024.05.13.tar.gz
 Author: The Parsl Team
 Author-email: parsl@googlegroups.com
 License: Apache 2.0

{parsl-2024.5.6 → parsl-2024.5.13}/parsl.egg-info/SOURCES.txt

@@ -352,6 +352,7 @@ parsl/tests/test_htex/test_disconnected_blocks.py
 parsl/tests/test_htex/test_drain.py
 parsl/tests/test_htex/test_htex.py
 parsl/tests/test_htex/test_manager_failure.py
+parsl/tests/test_htex/test_managers_command.py
 parsl/tests/test_htex/test_missing_worker.py
 parsl/tests/test_htex/test_multiple_disconnected_blocks.py
 parsl/tests/test_htex/test_worker_failure.py