From 40b38f875781ec0071c131f7566f54ec1e99ec09 Mon Sep 17 00:00:00 2001 From: Lindsey Gray Date: Tue, 14 Mar 2023 04:51:25 -0500 Subject: [PATCH 1/4] repin awkward and numpy awkward - without memory leak numpy - upper bound for numba / higher python versions --- setup.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/setup.py b/setup.py index 140a17dde..d1d51dd9e 100644 --- a/setup.py +++ b/setup.py @@ -56,7 +56,7 @@ def get_description(): INSTALL_REQUIRES = [ - "awkward>=1.5.1,<2", + "awkward>=1.10.3,<2", "uproot>=4.1.6,==4.*,!=4.2.4,!=4.3.0,!=4.3.1", "uproot3-methods>=0.10.0", "uproot3>=3.14.1", @@ -67,7 +67,7 @@ def get_description(): 'numba>=0.50.0;python_version<"3.7"', 'numba>=0.56.0;python_version>"3.6"', 'numpy>=1.16.0,<1.22;python_version<"3.7"', # <1.22 for numba version restrictions with 1.55 series - 'numpy>=1.18.0;python_version>"3.6"', # numba 1.56 available for python > 3.6, no upper numpy requirement + 'numpy>=1.18.0,<1.24;python_version>"3.6"', # numba 1.56 available for python > 3.6, upper requirement for higher python versions "scipy>=1.1.0", "tqdm>=4.27.0", "lz4", From dc5737f3197d6862a47f94006866a66eaa769274 Mon Sep 17 00:00:00 2001 From: Lindsey Gray Date: Tue, 14 Mar 2023 05:13:11 -0500 Subject: [PATCH 2/4] change to calver for next coffea version --- coffea/hist/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/coffea/hist/__init__.py b/coffea/hist/__init__.py index 3934700b4..3c188f7c3 100644 --- a/coffea/hist/__init__.py +++ b/coffea/hist/__init__.py @@ -30,7 +30,7 @@ from coffea.util import deprecate -deprecate(ImportError("coffea.hist is deprecated"), "v0.8.0", "31 Dec 2022") +deprecate(ImportError("coffea.hist is deprecated"), "v2023.3.0", "31 Mar 2023") __all__ = [ "Hist", From d6bc0788fe7bfb0a413bdc2f0a13bcf77d4af223 Mon Sep 17 00:00:00 2001 From: Lindsey Gray Date: Tue, 14 Mar 2023 05:14:08 -0500 Subject: [PATCH 3/4] change to calver for next coffea version --- coffea/lookup_tools/csv_converters.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/coffea/lookup_tools/csv_converters.py b/coffea/lookup_tools/csv_converters.py index 823c2f534..4167be5f6 100644 --- a/coffea/lookup_tools/csv_converters.py +++ b/coffea/lookup_tools/csv_converters.py @@ -12,8 +12,8 @@ def convert_btag_csv_file(csvFilePath): RuntimeError( "Auto-conversion of btag CSV files is deprecated and will be removed. Try coffea.btag_tools.BTagScaleFactor or correctionlib!" ), - "v0.8.0", - "31 Dec 2022", + "v2023.4.0", + "31 Mar 2023", ) fopen = open From a40ba2b66851dfed4731a2b551a1363eb1556019 Mon Sep 17 00:00:00 2001 From: Lindsey Gray Date: Tue, 14 Mar 2023 05:14:30 -0500 Subject: [PATCH 4/4] correct date for old b-tag csv --- coffea/lookup_tools/csv_converters.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/coffea/lookup_tools/csv_converters.py b/coffea/lookup_tools/csv_converters.py index 4167be5f6..3344aabbe 100644 --- a/coffea/lookup_tools/csv_converters.py +++ b/coffea/lookup_tools/csv_converters.py @@ -12,7 +12,7 @@ def convert_btag_csv_file(csvFilePath): RuntimeError( "Auto-conversion of btag CSV files is deprecated and will be removed. Try coffea.btag_tools.BTagScaleFactor or correctionlib!" ), - "v2023.4.0", + "v2023.3.0", "31 Mar 2023", )