From 9d03188ee19bd606b5738c3e24c0a9b3dde1532c Mon Sep 17 00:00:00 2001 From: Jim Pivarski Date: Fri, 4 Dec 2020 13:32:17 -0600 Subject: [PATCH] Fixed package names for persistent files. --- awkward0/persist.py | 14 ++++++++++++-- awkward0/version.py | 2 +- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/awkward0/persist.py b/awkward0/persist.py index 66347ddc..29c15971 100644 --- a/awkward0/persist.py +++ b/awkward0/persist.py @@ -39,6 +39,14 @@ ["awkward0.util", "frombuffer"], ["awkward0.persist"], ["awkward0.arrow", "_ParquetFile", "fromjson"], + ["awkward", "*Array"], + ["awkward", "Table"], + ["awkward", "numpy", "frombuffer"], + ["awkward.util", "frombuffer"], + ["awkward.persist"], + ["awkward.arrow", "_ParquetFile", "fromjson"], + ["uproot3_methods.classes.*"], + ["uproot3_methods.profiles.*"], ["uproot_methods.classes.*"], ["uproot_methods.profiles.*"], ["uproot.tree", "_LazyFiles"], @@ -63,6 +71,8 @@ def spec2function(obj, whitelist=whitelist): obj = [awkwardlib] + obj[1:] elif obj[0] == "awkward": obj = [awkwardlib] + obj[1:] + if obj[0].startswith("uproot_methods"): + obj = ["uproot3_methods" + obj[0][14:]] + obj[1:] gen, genname = importlib.import_module(obj[0]), obj[1:] if not isinstance(gen, types.ModuleType): raise TypeError("first item of a function description must be a module") @@ -501,8 +511,8 @@ def deserialize(storage, name="", whitelist=whitelist, cache=None, seen=None): schema = schema.decode("ascii") schema = json.loads(schema) - if "awkward0" not in schema: - raise ValueError("JSON object is not an Awkward Array schema (missing 'awkward0' field)") + if "awkward" not in schema: + raise ValueError("JSON object is not an Awkward Array schema (missing 'awkward' field)") prefix = schema.get("prefix", "") if seen is None: diff --git a/awkward0/version.py b/awkward0/version.py index a1758a2c..e7943bd1 100644 --- a/awkward0/version.py +++ b/awkward0/version.py @@ -4,7 +4,7 @@ import re -__version__ = "0.15.0" +__version__ = "0.15.1" version = __version__ version_info = tuple(re.split(r"[-\.]", __version__))