Merge pull request #19 from biigle/python3

Use Python 3
biigle · May 18, 2020 · 9c75b01 · 9c75b01
2 parents df66aaf + bc760d4
commit 9c75b01
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/src/config/color_sort.php b/src/config/color_sort.php
@@ -5,7 +5,7 @@
     /*
     | Path to the Python executable.
     */
-    'python' => '/usr/bin/python',
+    'python' => '/usr/bin/python3',
 
     /*
     | Path to the sorting script.

diff --git a/src/resources/scripts/sort.py b/src/resources/scripts/sort.py
@@ -1,5 +1,5 @@
 import numpy as np
-from scipy.misc import imread
+from PIL import Image
 import scipy.spatial.distance
 import sys
 import json
@@ -19,8 +19,8 @@ def hex_to_rgb(value):
 
 mdists = []
 for path in files:
-    img = imread(path)
+    img = np.array(Image.open(path))
     mdists.append(np.mean(scipy.spatial.distance.cdist(color, img.reshape(-1, 3))))
 idxs = np.argsort(mdists)
 
-print json.dumps(ids[idxs].tolist())
+print(json.dumps(ids[idxs].tolist()))