From e469dbafab7de82fc4f135927518113f9091a9ac Mon Sep 17 00:00:00 2001
From: IsakTheHacker <67378443+IsakTheHacker@users.noreply.github.com>
Date: Sat, 14 Oct 2023 00:45:02 +0200
Subject: [PATCH 1/5] Add mahotas package

---
 server/pypi/packages/mahotas/meta.yaml | 7 +++++++
 1 file changed, 7 insertions(+)
 create mode 100644 server/pypi/packages/mahotas/meta.yaml

diff --git a/server/pypi/packages/mahotas/meta.yaml b/server/pypi/packages/mahotas/meta.yaml
new file mode 100644
index 0000000000..474167c64f
--- /dev/null
+++ b/server/pypi/packages/mahotas/meta.yaml
@@ -0,0 +1,7 @@
+package:
+  name: mahotas
+  version: "1.4.13"
+
+requirements:
+  build:
+    - numpy 1.24.4

From da64b722eb92a154ac7e156d2baf8db1d41e6f83 Mon Sep 17 00:00:00 2001
From: IsakTheHacker <67378443+IsakTheHacker@users.noreply.github.com>
Date: Wed, 18 Oct 2023 21:48:22 +0200
Subject: [PATCH 2/5] Write test for mahotas (currenly failing)

---
 server/pypi/packages/mahotas/test.py | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)
 create mode 100644 server/pypi/packages/mahotas/test.py

diff --git a/server/pypi/packages/mahotas/test.py b/server/pypi/packages/mahotas/test.py
new file mode 100644
index 0000000000..7d093a8263
--- /dev/null
+++ b/server/pypi/packages/mahotas/test.py
@@ -0,0 +1,22 @@
+import unittest
+
+class TestMahotas(unittest.TestCase):
+
+    def test_hitmiss(self):
+        import mahotas
+        import numpy as np
+
+        A = np.zeros((100,100), np.bool_)
+        Bc = np.array([
+            [0,1,2],
+            [0,1,1],
+            [2,1,1]])
+        mahotas.morph.hitmiss(A,Bc)
+        self.assertEqual(mahotas.morph.hitmiss(A,Bc).sum(), False)
+
+        A[4:7,4:7] = np.array([
+            [0,1,1],
+            [0,1,1],
+            [0,1,1]])
+        self.assertEqual(mahotas.morph.hitmiss(A,Bc).sum(), 1)
+        self.assertEqual(mahotas.morph.hitmiss(A,Bc)[5,5], True)

From b9f9fd21af5359e09e75e8bd47b72f1221932ace Mon Sep 17 00:00:00 2001
From: IsakTheHacker <67378443+IsakTheHacker@users.noreply.github.com>
Date: Sat, 28 Oct 2023 23:17:38 +0200
Subject: [PATCH 3/5] Simplify mahotas package test

---
 server/pypi/packages/mahotas/test.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/server/pypi/packages/mahotas/test.py b/server/pypi/packages/mahotas/test.py
index 7d093a8263..88a172dac3 100644
--- a/server/pypi/packages/mahotas/test.py
+++ b/server/pypi/packages/mahotas/test.py
@@ -12,11 +12,11 @@ def test_hitmiss(self):
             [0,1,1],
             [2,1,1]])
         mahotas.morph.hitmiss(A,Bc)
-        self.assertEqual(mahotas.morph.hitmiss(A,Bc).sum(), False)
+        self.assertFalse(mahotas.morph.hitmiss(A,Bc).sum())
 
         A[4:7,4:7] = np.array([
             [0,1,1],
             [0,1,1],
             [0,1,1]])
         self.assertEqual(mahotas.morph.hitmiss(A,Bc).sum(), 1)
-        self.assertEqual(mahotas.morph.hitmiss(A,Bc)[5,5], True)
+        self.assertTrue(mahotas.morph.hitmiss(A,Bc)[5,5])

From ddc25b6ca0dc13055b1a6c3e7ccfda3ce483d6c7 Mon Sep 17 00:00:00 2001
From: IsakTheHacker <67378443+IsakTheHacker@users.noreply.github.com>
Date: Sat, 18 Nov 2023 01:22:50 +0100
Subject: [PATCH 4/5] Update meta.yaml for mahotas package

---
 server/pypi/packages/mahotas/meta.yaml | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/server/pypi/packages/mahotas/meta.yaml b/server/pypi/packages/mahotas/meta.yaml
index 474167c64f..171714e744 100644
--- a/server/pypi/packages/mahotas/meta.yaml
+++ b/server/pypi/packages/mahotas/meta.yaml
@@ -1,7 +1,13 @@
+{% if PY_VER == "3.8" %}
+    {% set numpy_version = "1.19.5" %}
+{% else %}
+    {% set numpy_version = "1.23.3" %}
+{% endif %}
+
 package:
   name: mahotas
   version: "1.4.13"
 
 requirements:
-  build:
-    - numpy 1.24.4
+  host:
+    - numpy {{ numpy_version }}

From d80fb26c2690e41625ed8e2a1631793f3e30b281 Mon Sep 17 00:00:00 2001
From: IsakTheHacker <67378443+IsakTheHacker@users.noreply.github.com>
Date: Sat, 18 Nov 2023 01:26:49 +0100
Subject: [PATCH 5/5] Create numpy patch for mahotas

---
 .../pypi/packages/mahotas/patches/chaquopy.patch   | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
 create mode 100644 server/pypi/packages/mahotas/patches/chaquopy.patch

diff --git a/server/pypi/packages/mahotas/patches/chaquopy.patch b/server/pypi/packages/mahotas/patches/chaquopy.patch
new file mode 100644
index 0000000000..235e2e73e4
--- /dev/null
+++ b/server/pypi/packages/mahotas/patches/chaquopy.patch
@@ -0,0 +1,14 @@
+--- src-original/setup.py	2022-08-23 17:16:48.000000000 +0000
++++ src/setup.py	2023-09-05 08:36:00.870847761 +0000
+@@ -20,6 +20,11 @@
+ #  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ #  THE SOFTWARE.
+ 
++# Chaquopy
++if "egg_info" not in sys.argv:
++    import builtins
++    builtins.__NUMPY_SETUP__ = True  # Prevent the compiled parts from being imported.
++
+ from __future__ import division
+ try:
+     import setuptools