Merge pull request #59 from nu-radio/compatibility-numpy

fix outdated syntax to be compatible with new numpy version

pyproject.toml

@@ -7,6 +7,10 @@ module = "radiotools"
 author = "Christian Glaser"
 author-email = "[email protected]"
 home-page = "https://github.com/nu-radio/radiotools"
-requires-python=">3.4"
+requires-python=">=3.6"
 classifiers = ["License :: OSI Approved :: GNU General Public License v3 or later (GPLv3+)"]
 
+requires = [
+    "numpy",
+    "scipy",
+]

radiotools/__init__.py

@@ -2,4 +2,4 @@
 
 """A tool package for cosmic-ray and neutrino radio detectors."""
 
-__version__ = '0.2.1'
+__version__ = '0.2.2'

radiotools/atmosphere/models.py

@@ -1,8 +1,4 @@
-# Python 2 and 3: backward-compatible
-from __future__ import absolute_import, division, print_function  # , unicode_literals
-
 from scipy import optimize, interpolate, integrate
-
 import numpy as np
 import os
 import sys

radiotools/coreas/generate_coreas_sim.py

@@ -1,4 +1,3 @@
-from __future__ import absolute_import, division, print_function  # , unicode_literals
 import os
 import stat
 import numpy as np

radiotools/helper.py

@@ -1,6 +1,5 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
-from __future__ import absolute_import, division, print_function  # , unicode_literals
 from radiotools.atmosphere import models as atm
 import numpy as np
 import sys

radiotools/plthelpers.py

@@ -14,7 +14,7 @@
 def get_discrete_cmap(N, base_cmap='viridis'):
     cmap = plt.get_cmap(base_cmap, N)
     colors = []
-    N = np.int(N)
+    N = int(N)
     for i in range(N):
         if(i % 2 == 0):
             colors.append(cmap.colors[i // 2])
@@ -302,7 +302,7 @@ def get_histograms(histograms, bins=None, xlabels=None, ylabels=None, stats=True
     for i in range(N):
         xlabel = ""
         if xlabels:
-            if(type(xlabels) != np.str):
+            if(type(xlabels) != str):
                 xlabel = xlabels[i]
             else:
                 xlabel = xlabels
@@ -317,7 +317,7 @@ def get_histograms(histograms, bins=None, xlabels=None, ylabels=None, stats=True
         if titles:
             title = titles[i]
         if bins is not None:
-            if(type(bins) == np.int):
+            if(type(bins) == int):
                 tbin = bins
             else:
                 if (isinstance(bins[0], float) or isinstance(bins[0], int)):