Fix new E721 and F811 errors from ruff 0.5.0

galaxybot · Jul 3, 2024 · e61f2e8 · e61f2e8
1 parent cb61230
commit e61f2e8
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 4 deletions.
diff --git a/lib/galaxy/datatypes/genetics.py b/lib/galaxy/datatypes/genetics.py
@@ -334,7 +334,6 @@ def regenerate_primary_file(self, dataset: DatasetProtocol) -> None:
         ]
         for fname in flist:
             sfname = os.path.split(fname)[-1]
-            f, e = os.path.splitext(fname)
             rval.append(f'<li><a href="{sfname}">{sfname}</a></li>')
         rval.append("</ul></body></html>")
         with open(dataset.get_file_name(), "w") as f:

diff --git a/lib/galaxy/datatypes/spaln.py b/lib/galaxy/datatypes/spaln.py
@@ -91,7 +91,6 @@ def regenerate_primary_file(self, dataset: DatasetProtocol) -> None:
         ]
         for fname in flist:
             sfname = os.path.split(fname)[-1]
-            f, e = os.path.splitext(fname)
             rval.append(f'<li><a href="{sfname}">{sfname}</a></li>')
         rval.append("</ul></body></html>")
         with open(dataset.get_file_name(), "w") as f:

diff --git a/lib/galaxy/web_stack/message.py b/lib/galaxy/web_stack/message.py
@@ -68,7 +68,9 @@ def _merge_class_tuples(self):
         names = set()
         for cls in reversed(self.__class__.mro()):
             names.update(
-                [x for x in dir(cls) if x.startswith("_") and not x.startswith("__") and type(getattr(cls, x)) == tuple]
+                x
+                for x in dir(cls)
+                if x.startswith("_") and not x.startswith("__") and type(getattr(cls, x)) == tuple  # noqa: E721
             )
         for name in names:
             setattr(self.__class__, name.lstrip("_"), property(lambda self, name=name: self._get_list_from_mro(name)))

diff --git a/test/unit/data/model/test_model_store.py b/test/unit/data/model/test_model_store.py
@@ -1215,7 +1215,6 @@ def import_archive(archive_path, app, user, import_options=None):
     dest_dir = CompressedFile(archive_path).extract(dest_parent)
 
     import_options = import_options or store.ImportOptions()
-    new_history = None
     model_store = store.get_import_model_store_for_directory(
         dest_dir,
         app=app,