From 7da9dcd414944b601444bcf2e0c2fc3504e4ac2e Mon Sep 17 00:00:00 2001
From: naglepuff <mike.nagler@kitware.com>
Date: Fri, 17 Jan 2025 15:18:17 -0500
Subject: [PATCH 1/3] Remove unused type: ignore

---
 large_image/cache_util/cachefactory.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/large_image/cache_util/cachefactory.py b/large_image/cache_util/cachefactory.py
index b3b670d89..bdbc24399 100644
--- a/large_image/cache_util/cachefactory.py
+++ b/large_image/cache_util/cachefactory.py
@@ -115,7 +115,7 @@ def getFirstAvailableCache() -> Tuple[Optional[cachetools.Cache], Optional[threa
             f'Automatically setting `{cacheBackend}` as cache_backend from availableCaches',
         )
         config.setConfig('cache_backend', cacheBackend)
-    return cache, cacheLock  # type: ignore
+    return cache, cacheLock
 
 
 class CacheFactory:

From 3b4a78c930fa14802110a52c5cc1c3e7501471c5 Mon Sep 17 00:00:00 2001
From: naglepuff <mike.nagler@kitware.com>
Date: Mon, 20 Jan 2025 15:13:02 -0500
Subject: [PATCH 2/3] Disable dicom plugin tests

---
 tox.ini | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/tox.ini b/tox.ini
index dd65a21a1..877f4d4ae 100644
--- a/tox.ini
+++ b/tox.ini
@@ -379,7 +379,8 @@ testpaths =
   test
   girder/test_girder
   girder_annotation/test_annotation
-  sources/dicom/test_dicom
+  # TODO: re-enable dicom web plugin tests when it is converted to Girder 5
+  # sources/dicom/test_dicom
 markers =
   singular: mark a test to run in a non-parallel environment.
   girder: mark a test as requiring girder

From e16cf14d2d86fb80ca2edbad4f87f29d1ee9c3e6 Mon Sep 17 00:00:00 2001
From: naglepuff <mike.nagler@kitware.com>
Date: Mon, 20 Jan 2025 17:13:00 -0500
Subject: [PATCH 3/3] Pin numpy to fix type tests

---
 setup.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/setup.py b/setup.py
index eea3bd441..af612fedc 100644
--- a/setup.py
+++ b/setup.py
@@ -108,7 +108,10 @@ def prerelease_local_scheme(version):
         'cachetools',
         'palettable',
         'Pillow',
-        'numpy',
+        # Newer versions of numpy include some typing changes that may need to be addressed in
+        # large_image.
+        # https://github.com/numpy/numpy/issues/28076
+        'numpy<2.1.0',
         'typing-extensions',
     ],
     extras_require=extraReqs,