From 7d5dfb8cfa646ff55df1155e433e9e9b17f73c3b Mon Sep 17 00:00:00 2001 From: Lindsey Gray Date: Mon, 26 Jun 2023 11:50:11 -0500 Subject: [PATCH 1/4] remove references to no-longer-existing classes --- src/coffea/jetmet_tools/CorrectedJetsFactory.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/coffea/jetmet_tools/CorrectedJetsFactory.py b/src/coffea/jetmet_tools/CorrectedJetsFactory.py index 89b183855..cd4cbbff8 100644 --- a/src/coffea/jetmet_tools/CorrectedJetsFactory.py +++ b/src/coffea/jetmet_tools/CorrectedJetsFactory.py @@ -47,7 +47,7 @@ def rand_gauss(item): def getfunction(layout, depth, **kwargs): if isinstance(layout, awkward.contents.NumpyArray) or not isinstance( - layout, (awkward.contents.Content, awkward.partition.PartitionedArray) + layout, (awkward.contents.Content, ) ): return awkward.contents.NumpyArray( randomstate.normal(size=len(layout)).astype(numpy.float32) From a6dd1fab8c1929e1bc19ffc41df5b8f256545494 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Mon, 26 Jun 2023 16:51:14 +0000 Subject: [PATCH 2/4] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- src/coffea/jetmet_tools/CorrectedJetsFactory.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/coffea/jetmet_tools/CorrectedJetsFactory.py b/src/coffea/jetmet_tools/CorrectedJetsFactory.py index cd4cbbff8..98c3d7c98 100644 --- a/src/coffea/jetmet_tools/CorrectedJetsFactory.py +++ b/src/coffea/jetmet_tools/CorrectedJetsFactory.py @@ -47,7 +47,7 @@ def rand_gauss(item): def getfunction(layout, depth, **kwargs): if isinstance(layout, awkward.contents.NumpyArray) or not isinstance( - layout, (awkward.contents.Content, ) + layout, (awkward.contents.Content,) ): return awkward.contents.NumpyArray( randomstate.normal(size=len(layout)).astype(numpy.float32) From f45e608154f8ba2caca7019fb897067f1a3ea2be Mon Sep 17 00:00:00 2001 From: Lindsey Gray Date: Mon, 26 Jun 2023 11:58:01 -0500 Subject: [PATCH 3/4] update readme versions --- README.rst | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.rst b/README.rst index fcf7f005f..d7409549c 100644 --- a/README.rst +++ b/README.rst @@ -71,13 +71,13 @@ For more details, see the `Installing coffea `__ (3.6+) +- `Python `__ (3.8+) The following are installed automatically when you install coffea with pip: - `numpy `__ (1.15+); -- `uproot `__ for interacting with ROOT files and handling their data transparently; -- `awkward-array `__ to manipulate complex-structured columnar data, such as jagged arrays; +- `uproot `__ for interacting with ROOT files and handling their data transparently; +- `awkward-array `__ to manipulate complex-structured columnar data, such as jagged arrays; - `numba `__ just-in-time compilation of python functions; - `scipy `__ for many statistical functions; - `matplotlib `__ as a plotting backend; From bcf54036fefd9b6859ccc7166349132e8f88b762 Mon Sep 17 00:00:00 2001 From: Lindsey Gray Date: Mon, 26 Jun 2023 11:58:57 -0500 Subject: [PATCH 4/4] get numpy as well --- README.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.rst b/README.rst index d7409549c..763db04fb 100644 --- a/README.rst +++ b/README.rst @@ -75,7 +75,7 @@ Strict dependencies The following are installed automatically when you install coffea with pip: -- `numpy `__ (1.15+); +- `numpy `__ (1.22+); - `uproot `__ for interacting with ROOT files and handling their data transparently; - `awkward-array `__ to manipulate complex-structured columnar data, such as jagged arrays; - `numba `__ just-in-time compilation of python functions;