Merge pull request #18813 from mvdbeek/make_pylibmagic_import_optional

[24.1] Make pylibmagic import optional
galaxyproject · Sep 16, 2024 · ca33e23 · ca33e23
2 parents f1b86ee + b6d0d51
commit ca33e23
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/lib/galaxy/datatypes/sniff.py b/lib/galaxy/datatypes/sniff.py
@@ -37,7 +37,11 @@
 )
 from galaxy.util.path import StrPath
 
-import pylibmagic  # noqa: F401  # isort:skip
+try:
+    import pylibmagic  # noqa: F401  # isort:skip
+except ImportError:
+    # Not available in conda, but docker image contains libmagic
+    pass
 import magic  # isort:skip