Merge pull request #1351 from girder/more-pil-formats

Handle more formats with PIL
girder · Oct 29, 2023 · df16ea8 · df16ea8
2 parents 636129a + 291d0ed
commit df16ea8
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -9,6 +9,7 @@
 - Guard against throwing a javascript warning ([#1337](../../pull/1337))
 - Test on Python 3.12 ([#1335](../../pull/1335))
 - Added filtering and limit options to the DICOMweb assetstore ([#1327](../../pull/1327))
+- Support more formats through PIL ([#1351](../../pull/1351))
 
 ### Changes
 - Prohibit bioformats and vips from reading mrxs directly ([#1328](../../pull/1328))

diff --git a/sources/pil/large_image_source_pil/__init__.py b/sources/pil/large_image_source_pil/__init__.py
@@ -37,6 +37,14 @@
     register_avif_opener()
 except Exception:
     pass
+try:
+    import pillow_jxl  # noqa
+except Exception:
+    pass
+try:
+    import pillow_jpls  # noqa
+except Exception:
+    pass
 
 try:
     from importlib.metadata import PackageNotFoundError

diff --git a/sources/pil/setup.py b/sources/pil/setup.py
@@ -59,8 +59,10 @@ def prerelease_local_scheme(version):
     ],
     extras_require={
         'all': [
-            'rawpy ; python_version < "3.7" and python_version < "3.12"',
+            'rawpy ; python_version >= "3.7" and python_version < "3.12"',
             'pillow-heif',
+            'pillow-jxl-plugin ; python_version >= "3.8"',
+            'pillow-jpls ; python_version < "3.12"',
         ],
         'girder': f'girder-large-image{limit_version}',
     },