Update build requirements and fix warnings

CHANGELOG.md

@@ -7,8 +7,10 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 ### Added
 
 ### Changed
+ * Updated versions of python, numba and numpy
 
 ### Fixed
+ * Warnings from numpy and scikit
 
 ### Removed
 

conda/conda_build_config.yaml

@@ -1,3 +1,6 @@
 python:
-    - 3.6
-    - 3.7
+    - 3.10
+numpy:
+    - 1.21
+numba:
+    - 0.55

conda/meta.yaml

@@ -18,12 +18,12 @@ requirements:
     - openmp
   run:
     - python
-    - numpy >=1.12
+    - numpy >=1.21
     - scikit-image
     - psutil
     - h5py
     - tqdm
-    - numba >=0.41
+    - numba >=0.55
     - cudatoolkit
     - imageio
     - openmp

examples/generatedata.py

@@ -47,7 +47,7 @@ def generate():
     while i<nit:
         found=False
         while found==False:
-            x, y = (np.random.random(2)*(n-sz)).astype(np.int)
+            x, y = (np.random.random(2)*(n-sz)).astype(np.int32)
             if l[x:x+sz,y:y+sz].max()==0:
                 found=True
         vl = np.random.random()*0.8+0.2

msdnet/data.py

@@ -91,7 +91,7 @@ def __init__(self, dlist, batchsize, seed=None):
         self.d = dlist
         self.nd = len(self.d)
         self.rndm = np.random.RandomState(seed)
-        self.idx = np.arange(self.nd,dtype=np.int)
+        self.idx = np.arange(self.nd,dtype=np.int32)
         self.rndm.shuffle(self.idx)
         self.bsize = batchsize
         self.i = 0

msdnet/loggers.py

@@ -89,7 +89,7 @@ def getheaderimage(width):
         header_dict[header_image.shape[1]] = header_image
         if width == header_image.shape[1]:
             return header_image
-    res_image = skt.rescale(header_image, width/1536, preserve_range=True, mode='constant', anti_aliasing=True, multichannel=False)
+    res_image = skt.rescale(header_image, width/1536, preserve_range=True, mode='constant', anti_aliasing=True, channel_axis=None)
     header_dict[width] = res_image
     return res_image