MNT: pyupgrade --py37-plus

Author: effigies

pydra/engine/helpers_state.py

@@ -344,7 +344,7 @@ def _add_name(mlist, name):
             if "." in elem or elem.startswith("_"):
                 pass
             else:
-                mlist[i] = "{}.{}".format(name, mlist[i])
+                mlist[i] = f"{name}.{mlist[i]}"
         elif isinstance(elem, list):
             mlist[i] = _add_name(elem, name)
         elif isinstance(elem, tuple):

pydra/engine/state.py

@@ -454,13 +454,11 @@ def _remove_repeated(self, previous_splitters):
                     f"{self.other_states}"
                 )
 
-        repeated = set(
-            [
-                (el, previous_splitters.count(el))
-                for el in previous_splitters
-                if previous_splitters.count(el) > 1
-            ]
-        )
+        repeated = {
+            (el, previous_splitters.count(el))
+            for el in previous_splitters
+            if previous_splitters.count(el) > 1
+        }
         if repeated:
             # assuming that I want to remove from right
             previous_splitters.reverse()

pydra/engine/tests/test_helpers.py

@@ -47,7 +47,7 @@ def test_save(tmpdir):
 
 def test_hash_file(tmpdir):
     outdir = Path(tmpdir)
-    with open(outdir / "test.file", "wt") as fp:
+    with open(outdir / "test.file", "w") as fp:
         fp.write("test")
     assert (
         helpers_file.hash_file(outdir / "test.file")

pydra/engine/tests/test_specs.py

@@ -168,7 +168,7 @@ def test_input_file_hash_1(tmpdir):
         inputs(in_file=outfile).hash
         == "1384a1eb11cd94a5b826a82b948313b9237a0956d406ccff59e79ec92b3c935f"
     )
-    with open(outfile, "wt") as fp:
+    with open(outfile, "w") as fp:
         fp.write("test")
     fields = [("in_file", File)]
     input_spec = SpecInfo(name="Inputs", fields=fields, bases=(BaseSpec,))

pydra/engine/tests/test_task.py

@@ -1030,7 +1030,7 @@ def testfunc(a: int, b: float = 0.1) -> ty.NamedTuple("Output", [("out", float)]
     message_path = tmpdir / funky.checksum / "messages"
 
     for file in glob(str(message_path) + "/*.jsonld"):
-        with open(file, "r") as f:
+        with open(file) as f:
             data = json.load(f)
             if "@type" in data:
                 if "AssociatedWith" in data:
@@ -1065,7 +1065,7 @@ def test_audit_shellcommandtask(tmpdir):
     command_content = []
 
     for file in glob(str(message_path) + "/*.jsonld"):
-        with open(file, "r") as f:
+        with open(file) as f:
             data = json.load(f)
 
             if "@type" in data:
@@ -1148,7 +1148,7 @@ def test_audit_shellcommandtask_file(tmpdir):
     shelly()
     message_path = tmpdir / shelly.checksum / "messages"
     for file in glob.glob(str(message_path) + "/*.jsonld"):
-        with open(file, "r") as x:
+        with open(file) as x:
             data = json.load(x)
             if "@type" in data:
                 if data["@type"] == "input":
@@ -1184,7 +1184,7 @@ def test_audit_shellcommandtask_version(tmpdir):
     # go through each jsonld file in message_path and check if the label field exists
     version_content = []
     for file in glob.glob(str(message_path) + "/*.jsonld"):
-        with open(file, "r") as f:
+        with open(file) as f:
             data = json.load(f)
             if "AssociatedWith" in data:
                 if version_cmd in data["AssociatedWith"]:

pydra/engine/workers.py

@@ -143,7 +143,7 @@ async def exec_serial(self, runnable, rerun=False):
 
     async def fetch_finished(self, futures):
         await asyncio.gather(*futures)
-        return set([])
+        return set()
 
     # async def fetch_finished(self, futures):
     #     return await asyncio.wait(futures)

pydra/utils/messenger.py

@@ -196,5 +196,5 @@ def collect_messages(collected_path, message_path, ld_op="compact"):
             pld.jsonld.from_rdf(pld.jsonld.to_rdf(data, {})), data[0]
         )
         records["@id"] = f"uid:{gen_uuid()}"
-        with open(collected_path / "messages.jsonld", "wt") as fp:
+        with open(collected_path / "messages.jsonld", "w") as fp:
             json.dump(records, fp, ensure_ascii=False, indent=2, sort_keys=False)