Merge pull request #63 from CoffeaTeam/topic_housekeeping

Reduce numba requirement and move numba into util
scikit-hep · Mar 19, 2019 · 806d298 · 806d298
2 parents 5a6576f + 9ed908c
commit 806d298
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 7 deletions.
diff --git a/fnal_column_analysis_tools/lookup_tools/dense_evaluated_lookup.py b/fnal_column_analysis_tools/lookup_tools/dense_evaluated_lookup.py
@@ -1,9 +1,10 @@
-from fnal_column_analysis_tools.lookup_tools.lookup_base import lookup_base
+from ..lookup_tools.lookup_base import lookup_base
+
+from ..util import numpy as np
+from ..util import awkward
+from ..util import numba
 
-from fnal_column_analysis_tools.util import numpy as np
-from fnal_column_analysis_tools.util import awkward
 from copy import deepcopy
-import numba
 
 ### methods for dealing with b-tag SFs
 @numba.jit(forceobj=True)

diff --git a/fnal_column_analysis_tools/util.py b/fnal_column_analysis_tools/util.py
@@ -4,3 +4,5 @@
     import awkward as awkward
 
 from awkward.util import numpy
+
+import numba
diff --git a/fnal_column_analysis_tools/version.py b/fnal_column_analysis_tools/version.py
@@ -30,7 +30,7 @@
 
 import re
 
-__version__ = "0.2.4"
+__version__ = "0.2.5"
 version = __version__
 version_info = tuple(re.split(r"[-\.]", __version__))
 

diff --git a/setup.py b/setup.py
@@ -71,8 +71,8 @@ def get_description():
       install_requires = [
           "awkward>=0.8.4",
           "matplotlib<3" if six.PY2 else "matplotlib>=3",
-          "numba>=0.42.0",
-          "numpy>=1.13.1",
+          "numba>=0.37.0",
+          "numpy>=1.16.0",
           "scipy>=1.1.0",
           "uproot-methods>=0.4.3",
           "uproot>=3.4.5",
Original file line number	Diff line number	Diff line change
Expand Up		@@ -4,3 +4,5 @@
		import awkward as awkward

		from awkward.util import numpy

		import numba