From da26a26331f030de4224eb312afc202f225a9c1b Mon Sep 17 00:00:00 2001
From: Dan Allan <dallan@bnl.gov>
Date: Mon, 22 Apr 2024 18:03:14 -0400
Subject: [PATCH] Switch to blosc2; add Python 3.12 support (#719)

* Switch to blosc2; add Python 3.12 support

* Add Python 3.12 to CI matrix.

* Switch Windows build to use 3.12 also.
---
 .github/workflows/ci.yml         |  3 ++-
 pyproject.toml                   |  9 +++++----
 tiled/client/decoders.py         |  6 +++---
 tiled/media_type_registration.py | 14 ++++----------
 4 files changed, 14 insertions(+), 18 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 131c5efb8..edb76729d 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -29,6 +29,7 @@ jobs:
         - "3.9"
         - "3.10"
         - "3.11"
+        - "3.12"
       fail-fast: false
     steps:
 
@@ -90,7 +91,7 @@ jobs:
     runs-on: windows-latest
     strategy:
       matrix:
-        python-version: ["3.11"]
+        python-version: ["3.12"]
       fail-fast: false
     steps:
 
diff --git a/pyproject.toml b/pyproject.toml
index ad0d37593..463e9153c 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -28,6 +28,7 @@ classifiers = [
   "Programming Language :: Python :: 3.9",
   "Programming Language :: Python :: 3.10",
   "Programming Language :: Python :: 3.11",
+  "Programming Language :: Python :: 3.12",
   "Topic :: Scientific/Engineering :: Physics",
 ]
 
@@ -51,7 +52,7 @@ all = [
     "asyncpg",
     "appdirs",
     "awkward >=2.4.3",
-    "blosc",
+    "blosc2",
     "cachetools",
     "cachey",
     "click !=8.1.0",
@@ -108,7 +109,7 @@ array = [
 client = [
     "appdirs",
     "awkward >=2.4.3",
-    "blosc",
+    "blosc2",
     "click !=8.1.0",
     "dask[array]",
     "dask[dataframe]",
@@ -132,7 +133,7 @@ client = [
 # These are used by the client/server to more efficiently compress.
 # They fall back to gzip (which is slower) if these are not installed.
 compression = [
-    "blosc",
+    "blosc2",
     "lz4",
     "zstandard",
 ]
@@ -233,7 +234,7 @@ server = [
     "asgi-correlation-id",
     "asyncpg",
     "awkward >=2.4.3",
-    "blosc",
+    "blosc2",
     "cachetools",
     "cachey",
     "click !=8.1.0",
diff --git a/tiled/client/decoders.py b/tiled/client/decoders.py
index 37002ca6f..02617a245 100644
--- a/tiled/client/decoders.py
+++ b/tiled/client/decoders.py
@@ -3,7 +3,7 @@
 
 from ..utils import modules_available
 
-if modules_available("blosc"):
+if modules_available("blosc2"):
 
     class BloscDecoder:
         def __init__(self):
@@ -18,13 +18,13 @@ def decode(self, data: bytes) -> bytes:
 
         def flush(self) -> bytes:
             # Hide this here to defer the numpy import that it triggers.
-            import blosc
+            import blosc2
 
             if len(self._data) == 1:
                 (data,) = self._data
             else:
                 data = b"".join(self._data)
-            return blosc.decompress(data)
+            return blosc2.decompress(data)
 
     SUPPORTED_DECODERS["blosc"] = BloscDecoder
 
diff --git a/tiled/media_type_registration.py b/tiled/media_type_registration.py
index 4465fd368..a3e80d6f9 100644
--- a/tiled/media_type_registration.py
+++ b/tiled/media_type_registration.py
@@ -328,14 +328,8 @@ def close(self):
     ]:
         compression_registry.register(media_type, "lz4", LZ4Buffer)
 
-if modules_available("blosc"):
-    import blosc
-
-    # The choice of settings here is cribbed from distributed.protocol.compression.
-    n = blosc.set_nthreads(2)
-    if hasattr("blosc", "releasegil"):
-        blosc.set_releasegil(True)
-    blosc_settings = {"cname": "lz4", "clevel": 5}
+if modules_available("blosc2"):
+    import blosc2
 
     class BloscBuffer:
         """
@@ -352,9 +346,9 @@ def write(self, b):
             if hasattr(b, "itemsize"):
                 # This could be memoryview or numpy.ndarray, for example.
                 # Blosc uses item-aware shuffling for improved results.
-                compressed = blosc.compress(b, typesize=b.itemsize, **blosc_settings)
+                compressed = blosc2.compress(b, typesize=b.itemsize)
             else:
-                compressed = blosc.compress(b, **blosc_settings)
+                compressed = blosc2.compress(b)
             self._file.write(compressed)
 
         def close(self):