From dbdd021539eafd0acf4512a24bdbd6f9a2141f11 Mon Sep 17 00:00:00 2001 From: Lindsey Gray Date: Tue, 19 Mar 2019 13:27:41 -0500 Subject: [PATCH 1/2] reduce numba requirement and move numba into util --- .../lookup_tools/dense_evaluated_lookup.py | 9 +++++---- fnal_column_analysis_tools/util.py | 2 ++ setup.py | 4 ++-- 3 files changed, 9 insertions(+), 6 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 index 16a7defa8..2b33dc52f 100644 --- 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 index 30f1e5f2a..2edfd9632 100644 --- 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/setup.py b/setup.py index f874c1e98..8db84b205 100644 --- 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", From 9ed908ca2df76b61e0a8a8744844ecd43a7e1383 Mon Sep 17 00:00:00 2001 From: Lindsey Gray Date: Tue, 19 Mar 2019 13:29:40 -0500 Subject: [PATCH 2/2] version --- fnal_column_analysis_tools/version.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fnal_column_analysis_tools/version.py b/fnal_column_analysis_tools/version.py index d024e8e2c..c890fefc2 100644 --- 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__))