fixed up sorting of inserted method args and xors for deterministic generation

Author: tclose

nipype2pydra/interface/base.py

@@ -1159,7 +1159,7 @@ def process_method(
             pass
         if "runtime" in args:
             args.remove("runtime")
-        args_to_add = list(self.used.method_args.get(method.__name__, [])) + list(
+        args_to_add = sorted(self.used.method_args.get(method.__name__, [])) + sorted(
             additional_args
         )
         if args_to_add:
@@ -1338,7 +1338,7 @@ def unwrap_nested_methods(
                     )
             # Insert additional arguments to the method call (which were previously
             # accessed via member attributes)
-            args_to_be_inserted = list(self.used.method_args[name]) + list(
+            args_to_be_inserted = sorted(self.used.method_args[name]) + sorted(
                 additional_args
             )
             try:
@@ -1405,8 +1405,7 @@ def unwrap_nested_methods(
         "trait_modified",
     ]
 
-    CONFTEST = """
-# For debugging in IDE's don't catch raised exceptions and let the IDE
+    CONFTEST = """# For debugging in IDE's don't catch raised exceptions and let the IDE
 # break at it
 import os
 import pytest
@@ -1423,7 +1422,7 @@ def pytest_internalerror(excinfo):
         raise excinfo.value  # raise internal errors instead of capturing them
 
     def pytest_configure(config):
-        config.option.capture = 'no'  # allow print statements to show up in the console
+        config.option.capture = "no"  # allow print statements to show up in the console
         config.option.log_cli = True  # show log messages in the console
         config.option.log_level = "INFO"  # set the log level to INFO
 

nipype2pydra/interface/shell.py

@@ -190,7 +190,9 @@ def generate_code(self, input_fields, nonstd_types, output_fields) -> str:
 
         spec_str += "@shell.define"
         if xor_sets:
-            spec_str += f"(xor={[list(x) for x in xor_sets]})"
+            spec_str += (
+                f"(xor={[list(x) for x in sorted(tuple(sorted(s)) for s in xor_sets)]})"
+            )
         spec_str += (
             f"\nclass {self.task_name}(shell.Task['{self.task_name}.Outputs']):\n"
         )

nipype2pydra/package.py

@@ -708,7 +708,7 @@ def write_post_release_file(self, fspath: Path):
 src_pkg_version = "{src_pkg_version}"
 nipype2pydra_version = "{nipype2pydra_version}"
 post_release = "{post_release}"
-        """
+"""
             )
 
     @classmethod

nipype2pydra/statements/imports.py

@@ -217,6 +217,9 @@ def __str__(self):
         if self.from_:
             imported_str = ", ".join(str(i) for i in sorted(self.imported.values()))
             module = self.translation if self.translation else self.from_
+            # Drop trailing hidden module (e.g. '_local' from 'pathlib._local')
+            if module.split(".")[-1].startswith("_"):
+                module = ".".join(module.split(".")[:-1])
             stmt_str = f"{self.indent}from {module} import {imported_str}"
         elif self.translation:
             stmt_str = f"{self.indent}import {self.translation}"
@@ -614,7 +617,7 @@ def to_statement(self):
 
 
 def from_list_to_imports(
-    obj: ty.Union[ty.List[ExplicitImport], list]
+    obj: ty.Union[ty.List[ExplicitImport], list],
 ) -> ty.List[ExplicitImport]:
     if obj is None:
         return []

nipype2pydra/workflow.py

@@ -44,7 +44,7 @@
 
 
 def convert_node_prefixes(
-    nodes: ty.Union[ty.Dict[str, str], ty.Sequence[ty.Union[ty.Tuple[str, str], str]]]
+    nodes: ty.Union[ty.Dict[str, str], ty.Sequence[ty.Union[ty.Tuple[str, str], str]]],
 ) -> ty.Dict[str, str]:
     if isinstance(nodes, dict):
         nodes_it = nodes.items()
@@ -1310,8 +1310,7 @@ def default_spec(
                 )
         return yaml_str
 
-    CONFTEST = """
-# For debugging in IDE's don't catch raised exceptions and let the IDE
+    CONFTEST = """# For debugging in IDE's don't catch raised exceptions and let the IDE
 # break at it
 import os
 import pytest
@@ -1328,7 +1327,7 @@ def pytest_internalerror(excinfo):
         raise excinfo.value  # raise internal errors instead of capturing them
 
     def pytest_configure(config):
-        config.option.capture = 'no'  # allow print statements to show up in the console
+        config.option.capture = "no"  # allow print statements to show up in the console
         config.option.log_cli = True  # show log messages in the console
         config.option.log_level = "INFO"  # set the log level to INFO