Merge branch 'master' into line

Parsl · Mar 8, 2024 · 80b4969 · 80b4969
2 parents 6a918f2 + 49cca8a
commit 80b4969
Show file tree

Hide file tree

Showing 13 changed files with 26 additions and 16 deletions.
diff --git a/.flake8 b/.flake8
@@ -8,7 +8,7 @@
 # W504: line break after binary operator
 #       (Raised by flake8 even when it is followed)
 ignore = E126, E402, E129, W504
-max-line-length = 148
+max-line-length = 147
 exclude = test_import_fail.py,
   parsl/executors/workqueue/parsl_coprocess.py
 # E741 disallows ambiguous single letter names which look like numbers

diff --git a/docs/devguide/index.rst b/docs/devguide/index.rst
@@ -5,8 +5,6 @@ Developer documentation
    :maxdepth: 3
 
    contributing
-   changelog
-   design
    roadmap
    packaging
    ../README
diff --git a/docs/devguide/changelog.rst → docs/historical/changelog.rst b/docs/devguide/changelog.rst → docs/historical/changelog.rst
diff --git a/docs/devguide/design.rst → docs/historical/design.rst b/docs/devguide/design.rst → docs/historical/design.rst
diff --git a/docs/historical/index.rst b/docs/historical/index.rst
@@ -0,0 +1,9 @@
+Historical Documents
+====================
+
+.. toctree::
+   :maxdepth: 2
+
+   changelog
+   design
+   performance
diff --git a/docs/userguide/performance.rst → docs/historical/performance.rst b/docs/userguide/performance.rst → docs/historical/performance.rst
diff --git a/docs/index.rst b/docs/index.rst
@@ -108,6 +108,7 @@ Table of Contents
    faq
    reference
    devguide/index
+   historical/index
 
 
 Indices and tables

diff --git a/docs/userguide/index.rst b/docs/userguide/index.rst
@@ -21,4 +21,3 @@ User guide
    usage_tracking
    plugins
    parsl_perf
-   performance
diff --git a/parsl/addresses.py b/parsl/addresses.py
@@ -81,7 +81,7 @@ def address_by_hostname() -> str:
 def address_by_interface(ifname: str) -> str:
     """Returns the IP address of the given interface name, e.g. 'eth0'
 
-    This is taken from a Stack Overflow answer: https://stackoverflow.com/questions/24196932/how-can-i-get-the-ip-address-of-eth0-in-python#24196955
+    This is from a Stack Overflow answer: https://stackoverflow.com/questions/24196932/how-can-i-get-the-ip-address-of-eth0-in-python#24196955
 
     Parameters
     ----------

diff --git a/parsl/dataflow/dflow.py b/parsl/dataflow/dflow.py
@@ -723,9 +723,9 @@ def launch_task(self, task_record: TaskRecord) -> Future:
 
         if hasattr(exec_fu, "parsl_executor_task_id"):
             logger.info(
-                 f"Parsl task {task_id} try {try_id} launched on executor {executor.label} "
-                 f"with executor id {exec_fu.parsl_executor_task_id}"
-            )
+                f"Parsl task {task_id} try {try_id} launched on executor {executor.label} "
+                f"with executor id {exec_fu.parsl_executor_task_id}")
+
         else:
             logger.info(f"Parsl task {task_id} try {try_id} launched on executor {executor.label}")
 

diff --git a/parsl/executors/taskvine/executor.py b/parsl/executors/taskvine/executor.py
@@ -230,8 +230,7 @@ def __create_data_and_logging_dirs(self):
         logger.debug(f"Function data directory: {self._function_data_dir}, log directory: {log_dir}")
         logger.debug(
             f"TaskVine manager log directory: {self.manager_config.vine_log_dir}, "
-            f"factory log directory: {self.factory_config.scratch_dir}"
-        )
+            f"factory log directory: {self.factory_config.scratch_dir}")
 
     def start(self):
         """Create submit process and collector thread to create, send, and

diff --git a/parsl/monitoring/db_manager.py b/parsl/monitoring/db_manager.py
@@ -103,7 +103,13 @@ def insert(self, *, table: str, messages: List[MonitoringMessage]) -> None:
     def rollback(self) -> None:
         self.session.rollback()
 
-    def _generate_mappings(self, table: Table, columns: Optional[List[str]] = None, messages: List[MonitoringMessage] = []) -> List[Dict[str, Any]]:
+    def _generate_mappings(
+        self,
+        table: Table,
+        columns: Optional[List[str]] = None,
+        messages: List[MonitoringMessage] = [],
+    ) -> List[Dict[str, Any]]:
+
         mappings = []
         for msg in messages:
             m = {}

diff --git a/parsl/tests/configs/user_opts.py b/parsl/tests/configs/user_opts.py
@@ -52,11 +52,9 @@
     #     'username': MIDWAY_USERNAME,
     #     'script_dir': '/scratch/midway2/{}/parsl_scripts'.format(MIDWAY_USERNAME),
     #     'scheduler_options': "",
-    #     'worker_init': (
-    #         'cd /scratch/midway2/{}/parsl_scripts; '
-    #         'module load Anaconda3/5.1.0; '
-    #         'source activate parsl_testing;'
-    #      ).format(MIDWAY_USERNAME),
+    #     'worker_init': 'cd /scratch/midway2/{}/parsl_scripts; '
+    #                    'module load Anaconda3/5.1.0; source activate parsl_testing;'
+    #                    .format(MIDWAY_USERNAME),
     # },
     # 'osg': {
     #     'username': OSG_USERNAME,