Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package python-uproot for openSUSE:Factory
checked in at 2022-06-23 10:24:39
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-uproot (Old)
and /work/SRC/openSUSE:Factory/.python-uproot.new.1548 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-uproot"
Thu Jun 23 10:24:39 2022 rev:8 rq:984458 version:4.3.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/python-uproot/python-uproot.changes
2022-03-15 19:05:48.556984294 +0100
+++ /work/SRC/openSUSE:Factory/.python-uproot.new.1548/python-uproot.changes
2022-06-23 10:25:28.091818082 +0200
@@ -1,0 +2,10 @@
+Tue Jun 21 23:24:57 UTC 2022 - Atri Bhattacharya <badshah...@gmail.com>
+
+- Update to version 4.3.0:
+ * Added a TMatrixTSym model (long stalled PR):
+ gh#scikit/uproot4#484.
+ * Restored the argument list of Interpretation.awkward_form, a
+ public function: PR gh#scikit/uproot4#618.
+- Refresh tests tarball with updated dir from git repository.
+
+-------------------------------------------------------------------
Old:
----
uproot-4.2.2.tar.gz
New:
----
uproot-4.3.0.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-uproot.spec ++++++
--- /var/tmp/diff_new_pack.iC58vC/_old 2022-06-23 10:25:28.583818617 +0200
+++ /var/tmp/diff_new_pack.iC58vC/_new 2022-06-23 10:25:28.587818621 +0200
@@ -20,7 +20,7 @@
%define skip_python36 1
%global modname uproot
Name: python-uproot
-Version: 4.2.2
+Version: 4.3.0
Release: 0
Summary: ROOT I/O in pure Python and Numpy
License: BSD-3-Clause
++++++ _service ++++++
--- /var/tmp/diff_new_pack.iC58vC/_old 2022-06-23 10:25:28.619818656 +0200
+++ /var/tmp/diff_new_pack.iC58vC/_new 2022-06-23 10:25:28.623818660 +0200
@@ -2,7 +2,7 @@
<service name="tar_scm" mode="disabled">
<param name="scm">git</param>
<param name="url">https://github.com/scikit-hep/uproot4</param>
- <param name="revision">4.2.2</param>
+ <param name="revision">4.3.0</param>
<param name="subdir">tests</param>
<param name="filename">tests</param>
<param name="version">_none_</param>
++++++ tests.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/tests/test_0034-generic-objects-in-ttrees.py
new/tests/test_0034-generic-objects-in-ttrees.py
--- old/tests/test_0034-generic-objects-in-ttrees.py 2022-03-14
21:01:25.000000000 +0100
+++ new/tests/test_0034-generic-objects-in-ttrees.py 2022-06-22
00:02:04.000000000 +0200
@@ -326,8 +326,16 @@
with
uproot.open(skhep_testdata.data_path("uproot-small-evnt-tree-nosplit.root"))[
"tree/evt"
] as branch:
+ context = {
+ "index_format": "i64",
+ "header": False,
+ "tobject_header": True,
+ "breadcrumbs": (),
+ }
assert json.loads(
-
branch.interpretation.awkward_form(branch.file).tojson(verbose=False)
+ branch.interpretation.awkward_form(branch.file, context).tojson(
+ verbose=False
+ )
) == json.loads(
"""{
"class": "RecordArray",
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/tests/test_0341-manipulate-streamer-info.py
new/tests/test_0341-manipulate-streamer-info.py
--- old/tests/test_0341-manipulate-streamer-info.py 2022-03-14
21:01:25.000000000 +0100
+++ new/tests/test_0341-manipulate-streamer-info.py 2022-06-22
00:02:04.000000000 +0200
@@ -41,45 +41,9 @@
y.Write()
f5.Close()
- assert set(uproot.open(filename).file.streamers) == {
- "TObject",
- "TNamed",
- "TH1F",
- "TH1",
- "TAttLine",
- "TAttFill",
- "TAttMarker",
- "TAxis",
- "TAttAxis",
- "THashList",
- "TList",
- "TSeqCollection",
- "TCollection",
- "TString",
- "TObjString",
- }
-
with uproot.writing.update(filename) as f6:
f6.file._cascading.streamers.write(f6.file.sink)
- assert set(uproot.open(filename).file.streamers) == {
- "TObject",
- "TNamed",
- "TH1F",
- "TH1",
- "TAttLine",
- "TAttFill",
- "TAttMarker",
- "TAxis",
- "TAttAxis",
- "THashList",
- "TList",
- "TSeqCollection",
- "TCollection",
- "TString",
- "TObjString",
- }
-
def test_with_mkdir(tmp_path):
filename = os.path.join(tmp_path, "testy.root")
@@ -112,45 +76,9 @@
y.Write()
f5.Close()
- assert set(uproot.open(filename).file.streamers) == {
- "TObject",
- "TNamed",
- "TH1F",
- "TH1",
- "TAttLine",
- "TAttFill",
- "TAttMarker",
- "TAxis",
- "TAttAxis",
- "THashList",
- "TList",
- "TSeqCollection",
- "TCollection",
- "TString",
- "TObjString",
- }
-
with uproot.writing.update(filename) as f6:
f6.mkdir("three")
- assert set(uproot.open(filename).file.streamers) == {
- "TObject",
- "TNamed",
- "TH1F",
- "TH1",
- "TAttLine",
- "TAttFill",
- "TAttMarker",
- "TAxis",
- "TAttAxis",
- "THashList",
- "TList",
- "TSeqCollection",
- "TCollection",
- "TString",
- "TObjString",
- }
-
def test_add_streamers1(tmp_path):
has_TObjString = os.path.join(tmp_path, "has_TObjString.root")
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/tests/test_0484-manually-add-model-for-TMatrixTSym_double_.py
new/tests/test_0484-manually-add-model-for-TMatrixTSym_double_.py
--- old/tests/test_0484-manually-add-model-for-TMatrixTSym_double_.py
1970-01-01 01:00:00.000000000 +0100
+++ new/tests/test_0484-manually-add-model-for-TMatrixTSym_double_.py
2022-06-22 00:02:04.000000000 +0200
@@ -0,0 +1,18 @@
+# BSD 3-Clause License; see
https://github.com/scikit-hep/uproot4/blob/main/LICENSE
+
+
+import io
+import os
+
+import numpy as np
+import pytest
+import skhep_testdata
+
+import uproot
+
+
+def test():
+ with uproot.open(skhep_testdata.data_path("uproot-issue-359.root")) as
file:
+ matrix = file["covmatrixOCratio"]
+ num_elements = matrix.member("fNrows") * (matrix.member("fNcols") + 1)
// 2
+ assert len(matrix.member("fElements")) == num_elements
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/tests/test_0576-unicode-in-names.py
new/tests/test_0576-unicode-in-names.py
--- old/tests/test_0576-unicode-in-names.py 1970-01-01 01:00:00.000000000
+0100
+++ new/tests/test_0576-unicode-in-names.py 2022-06-22 00:02:04.000000000
+0200
@@ -0,0 +1,24 @@
+# BSD 3-Clause License; see
https://github.com/scikit-hep/uproot4/blob/main/LICENSE
+
+
+import os
+
+import numpy as np
+import pytest
+import skhep_testdata
+
+import uproot
+
+ROOT = pytest.importorskip("ROOT")
+
+
+def test(tmp_path):
+ filename = os.path.join(tmp_path, "whatever.root")
+
+ with uproot.recreate(filename) as file:
+ file["\u03c0"] = np.histogram(np.random.normal(0, 1, 10))
+ assert file["\u03c0"].name == "\u03c0"
+
+ file2 = ROOT.TFile(filename)
+ histogram = file2.Get("\u03c0")
+ assert histogram.GetName() == "\u03c0"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/tests/test_0578-dask-for-numpy.py
new/tests/test_0578-dask-for-numpy.py
--- old/tests/test_0578-dask-for-numpy.py 1970-01-01 01:00:00.000000000
+0100
+++ new/tests/test_0578-dask-for-numpy.py 2022-06-22 00:02:04.000000000
+0200
@@ -0,0 +1,767 @@
+# BSD 3-Clause License; see
https://github.com/scikit-hep/uproot4/blob/main/LICENSE
+
+
+import numpy
+import pytest
+import skhep_testdata
+
+import uproot
+
+dask = pytest.importorskip("dask")
+da = pytest.importorskip("dask.array")
+
+
+def test_single_dask_array():
+ test_path = skhep_testdata.data_path("uproot-Zmumu.root") + ":events"
+ ttree = uproot.open(test_path)
+
+ np_arrays = ttree.arrays(library="np")
+ dask_arrays = uproot.dask(test_path)
+
+ assert list(dask_arrays.keys()) == list(
+ np_arrays.keys()
+ ), "Different keys detected in dictionary of dask arrays and dictionary of
numpy arrays"
+
+ for key in np_arrays.keys():
+ comp = dask_arrays[key].compute() == np_arrays[key]
+ assert comp.all(), f"Incorrect array at key {key}"
+
+
+def test_dask_concatenation():
+ test_path1 = skhep_testdata.data_path("uproot-Zmumu.root") + ":events"
+ test_path2 = skhep_testdata.data_path("uproot-Zmumu-uncompressed.root") +
":events"
+ test_path3 = skhep_testdata.data_path("uproot-Zmumu-zlib.root") + ":events"
+ test_path4 = skhep_testdata.data_path("uproot-Zmumu-lzma.root") + ":events"
+
+ np_arrays = uproot.concatenate(
+ [test_path1, test_path2, test_path3, test_path4], library="np"
+ )
+ dask_arrays = uproot.dask([test_path1, test_path2, test_path3, test_path4])
+
+ assert list(dask_arrays.keys()) == list(
+ np_arrays.keys()
+ ), "Different keys detected in dictionary of dask arrays and dictionary of
numpy arrays"
+
+ for key in np_arrays.keys():
+ comp = dask_arrays[key].compute() == np_arrays[key]
+ assert comp.all(), f"Incorrect array at key {key}"
+
+
+def test_multidim_array():
+ test_path = (
+ skhep_testdata.data_path("uproot-sample-6.08.04-uncompressed.root") +
":sample"
+ )
+ ttree = uproot.open(test_path)
+
+ np_arrays = ttree.arrays(library="np")
+ dask_arrays = uproot.dask(test_path)
+
+ assert list(dask_arrays.keys()) == list(
+ np_arrays.keys()
+ ), "Different keys detected in dictionary of dask arrays and dictionary of
numpy arrays"
+
+ comp = dask_arrays["ab"].compute() == np_arrays["ab"]
+ assert comp.all(), "Incorrect array at key {}".format("ab")
+
+
+def test_chunking_single_num():
+ filename1 = skhep_testdata.data_path("uproot-Zmumu.root") + ":events"
+ assert uproot.dask(filename1, step_size=30)["px1"].chunks == (
+ (
+ 30,
+ 30,
+ 30,
+ 30,
+ 30,
+ 30,
+ 30,
+ 30,
+ 30,
+ 30,
+ 30,
+ 30,
+ 30,
+ 30,
+ 30,
+ 30,
+ 30,
+ 30,
+ 30,
+ 30,
+ 30,
+ 30,
+ 30,
+ 30,
+ 30,
+ 30,
+ 30,
+ 30,
+ 30,
+ 30,
+ 30,
+ 30,
+ 30,
+ 30,
+ 30,
+ 30,
+ 30,
+ 30,
+ 30,
+ 30,
+ 30,
+ 30,
+ 30,
+ 30,
+ 30,
+ 30,
+ 30,
+ 30,
+ 30,
+ 30,
+ 30,
+ 30,
+ 30,
+ 30,
+ 30,
+ 30,
+ 30,
+ 30,
+ 30,
+ 30,
+ 30,
+ 30,
+ 30,
+ 30,
+ 30,
+ 30,
+ 30,
+ 30,
+ 30,
+ 30,
+ 30,
+ 30,
+ 30,
+ 30,
+ 30,
+ 30,
+ 24,
+ ),
+ )
+
+
+def test_chunking_single_string():
+ dask = pytest.importorskip("dask")
+ da = pytest.importorskip("dask.array")
+ filename1 = skhep_testdata.data_path("uproot-Zmumu.root") + ":events"
+ assert uproot.dask(filename1, step_size="100B")["px1"].chunks == (
+ (
+ 19,
+ 19,
+ 19,
+ 19,
+ 19,
+ 19,
+ 19,
+ 19,
+ 19,
+ 19,
+ 19,
+ 19,
+ 19,
+ 19,
+ 19,
+ 19,
+ 19,
+ 19,
+ 19,
+ 19,
+ 19,
+ 19,
+ 19,
+ 19,
+ 19,
+ 19,
+ 19,
+ 19,
+ 19,
+ 19,
+ 19,
+ 19,
+ 19,
+ 19,
+ 19,
+ 19,
+ 19,
+ 19,
+ 19,
+ 19,
+ 19,
+ 19,
+ 19,
+ 19,
+ 19,
+ 19,
+ 19,
+ 19,
+ 19,
+ 19,
+ 19,
+ 19,
+ 19,
+ 19,
+ 19,
+ 19,
+ 19,
+ 19,
+ 19,
+ 19,
+ 19,
+ 19,
+ 19,
+ 19,
+ 19,
+ 19,
+ 19,
+ 19,
+ 19,
+ 19,
+ 19,
+ 19,
+ 19,
+ 19,
+ 19,
+ 19,
+ 19,
+ 19,
+ 19,
+ 19,
+ 19,
+ 19,
+ 19,
+ 19,
+ 19,
+ 19,
+ 19,
+ 19,
+ 19,
+ 19,
+ 19,
+ 19,
+ 19,
+ 19,
+ 19,
+ 19,
+ 19,
+ 19,
+ 19,
+ 19,
+ 19,
+ 19,
+ 19,
+ 19,
+ 19,
+ 19,
+ 19,
+ 19,
+ 19,
+ 19,
+ 19,
+ 19,
+ 19,
+ 19,
+ 19,
+ 19,
+ 19,
+ 19,
+ 19,
+ 19,
+ 19,
+ 5,
+ ),
+ )
+
+
+def test_chunking_multiple_num():
+ filename1 = skhep_testdata.data_path("uproot-Zmumu.root") + ":events"
+ filename2 = skhep_testdata.data_path("uproot-Zmumu-uncompressed.root") +
":events"
+ assert uproot.dask([filename1, filename2], step_size=30)["px1"].chunks == (
+ (
+ 30,
+ 30,
+ 30,
+ 30,
+ 30,
+ 30,
+ 30,
+ 30,
+ 30,
+ 30,
+ 30,
+ 30,
+ 30,
+ 30,
+ 30,
+ 30,
+ 30,
+ 30,
+ 30,
+ 30,
+ 30,
+ 30,
+ 30,
+ 30,
+ 30,
+ 30,
+ 30,
+ 30,
+ 30,
+ 30,
+ 30,
+ 30,
+ 30,
+ 30,
+ 30,
+ 30,
+ 30,
+ 30,
+ 30,
+ 30,
+ 30,
+ 30,
+ 30,
+ 30,
+ 30,
+ 30,
+ 30,
+ 30,
+ 30,
+ 30,
+ 30,
+ 30,
+ 30,
+ 30,
+ 30,
+ 30,
+ 30,
+ 30,
+ 30,
+ 30,
+ 30,
+ 30,
+ 30,
+ 30,
+ 30,
+ 30,
+ 30,
+ 30,
+ 30,
+ 30,
+ 30,
+ 30,
+ 30,
+ 30,
+ 30,
+ 30,
+ 24,
+ 30,
+ 30,
+ 30,
+ 30,
+ 30,
+ 30,
+ 30,
+ 30,
+ 30,
+ 30,
+ 30,
+ 30,
+ 30,
+ 30,
+ 30,
+ 30,
+ 30,
+ 30,
+ 30,
+ 30,
+ 30,
+ 30,
+ 30,
+ 30,
+ 30,
+ 30,
+ 30,
+ 30,
+ 30,
+ 30,
+ 30,
+ 30,
+ 30,
+ 30,
+ 30,
+ 30,
+ 30,
+ 30,
+ 30,
+ 30,
+ 30,
+ 30,
+ 30,
+ 30,
+ 30,
+ 30,
+ 30,
+ 30,
+ 30,
+ 30,
+ 30,
+ 30,
+ 30,
+ 30,
+ 30,
+ 30,
+ 30,
+ 30,
+ 30,
+ 30,
+ 30,
+ 30,
+ 30,
+ 30,
+ 30,
+ 30,
+ 30,
+ 30,
+ 30,
+ 30,
+ 30,
+ 30,
+ 30,
+ 30,
+ 30,
+ 30,
+ 24,
+ ),
+ )
+
+
+def test_chunking_multiple_string():
+ filename1 = skhep_testdata.data_path("uproot-Zmumu.root") + ":events"
+ filename2 = skhep_testdata.data_path("uproot-Zmumu-uncompressed.root") +
":events"
+ assert uproot.dask([filename1, filename2], step_size="100B")["px1"].chunks
== (
+ (
+ 19,
+ 19,
+ 19,
+ 19,
+ 19,
+ 19,
+ 19,
+ 19,
+ 19,
+ 19,
+ 19,
+ 19,
+ 19,
+ 19,
+ 19,
+ 19,
+ 19,
+ 19,
+ 19,
+ 19,
+ 19,
+ 19,
+ 19,
+ 19,
+ 19,
+ 19,
+ 19,
+ 19,
+ 19,
+ 19,
+ 19,
+ 19,
+ 19,
+ 19,
+ 19,
+ 19,
+ 19,
+ 19,
+ 19,
+ 19,
+ 19,
+ 19,
+ 19,
+ 19,
+ 19,
+ 19,
+ 19,
+ 19,
+ 19,
+ 19,
+ 19,
+ 19,
+ 19,
+ 19,
+ 19,
+ 19,
+ 19,
+ 19,
+ 19,
+ 19,
+ 19,
+ 19,
+ 19,
+ 19,
+ 19,
+ 19,
+ 19,
+ 19,
+ 19,
+ 19,
+ 19,
+ 19,
+ 19,
+ 19,
+ 19,
+ 19,
+ 19,
+ 19,
+ 19,
+ 19,
+ 19,
+ 19,
+ 19,
+ 19,
+ 19,
+ 19,
+ 19,
+ 19,
+ 19,
+ 19,
+ 19,
+ 19,
+ 19,
+ 19,
+ 19,
+ 19,
+ 19,
+ 19,
+ 19,
+ 19,
+ 19,
+ 19,
+ 19,
+ 19,
+ 19,
+ 19,
+ 19,
+ 19,
+ 19,
+ 19,
+ 19,
+ 19,
+ 19,
+ 19,
+ 19,
+ 19,
+ 19,
+ 19,
+ 19,
+ 19,
+ 19,
+ 5,
+ 12,
+ 12,
+ 12,
+ 12,
+ 12,
+ 12,
+ 12,
+ 12,
+ 12,
+ 12,
+ 12,
+ 12,
+ 12,
+ 12,
+ 12,
+ 12,
+ 12,
+ 12,
+ 12,
+ 12,
+ 12,
+ 12,
+ 12,
+ 12,
+ 12,
+ 12,
+ 12,
+ 12,
+ 12,
+ 12,
+ 12,
+ 12,
+ 12,
+ 12,
+ 12,
+ 12,
+ 12,
+ 12,
+ 12,
+ 12,
+ 12,
+ 12,
+ 12,
+ 12,
+ 12,
+ 12,
+ 12,
+ 12,
+ 12,
+ 12,
+ 12,
+ 12,
+ 12,
+ 12,
+ 12,
+ 12,
+ 12,
+ 12,
+ 12,
+ 12,
+ 12,
+ 12,
+ 12,
+ 12,
+ 12,
+ 12,
+ 12,
+ 12,
+ 12,
+ 12,
+ 12,
+ 12,
+ 12,
+ 12,
+ 12,
+ 12,
+ 12,
+ 12,
+ 12,
+ 12,
+ 12,
+ 12,
+ 12,
+ 12,
+ 12,
+ 12,
+ 12,
+ 12,
+ 12,
+ 12,
+ 12,
+ 12,
+ 12,
+ 12,
+ 12,
+ 12,
+ 12,
+ 12,
+ 12,
+ 12,
+ 12,
+ 12,
+ 12,
+ 12,
+ 12,
+ 12,
+ 12,
+ 12,
+ 12,
+ 12,
+ 12,
+ 12,
+ 12,
+ 12,
+ 12,
+ 12,
+ 12,
+ 12,
+ 12,
+ 12,
+ 12,
+ 12,
+ 12,
+ 12,
+ 12,
+ 12,
+ 12,
+ 12,
+ 12,
+ 12,
+ 12,
+ 12,
+ 12,
+ 12,
+ 12,
+ 12,
+ 12,
+ 12,
+ 12,
+ 12,
+ 12,
+ 12,
+ 12,
+ 12,
+ 12,
+ 12,
+ 12,
+ 12,
+ 12,
+ 12,
+ 12,
+ 12,
+ 12,
+ 12,
+ 12,
+ 12,
+ 12,
+ 12,
+ 12,
+ 12,
+ 12,
+ 12,
+ 12,
+ 12,
+ 12,
+ 12,
+ 12,
+ 12,
+ 12,
+ 12,
+ 12,
+ 12,
+ 12,
+ 12,
+ 12,
+ 12,
+ 12,
+ 12,
+ 12,
+ 12,
+ 12,
+ 12,
+ 12,
+ 12,
+ 12,
+ 12,
+ 12,
+ 12,
+ 12,
+ 12,
+ 12,
+ 12,
+ ),
+ )
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/tests/test_0580-round-trip-for-no-flow-histograms.py
new/tests/test_0580-round-trip-for-no-flow-histograms.py
--- old/tests/test_0580-round-trip-for-no-flow-histograms.py 1970-01-01
01:00:00.000000000 +0100
+++ new/tests/test_0580-round-trip-for-no-flow-histograms.py 2022-06-22
00:02:04.000000000 +0200
@@ -0,0 +1,46 @@
+# BSD 3-Clause License; see
https://github.com/scikit-hep/uproot4/blob/main/LICENSE
+
+import os
+
+import numpy as np
+import pytest
+import skhep_testdata
+
+import uproot
+
+hist = pytest.importorskip("hist")
+
+
+def test_no_flow(tmp_path):
+ filename = os.path.join(tmp_path, "whatever.root")
+
+ h = hist.Hist(hist.axis.Regular(20, 0, 20, flow=False)).fill(
+ np.random.normal(10, 6, 1000)
+ )
+
+ with uproot.recreate(filename) as fout:
+ fout["test"] = h
+
+ with uproot.open(filename) as fin:
+ h_read = fin["test"]
+
+ assert np.array_equal(h.axes[0].edges, h_read.axes[0].edges())
+ assert np.array_equal(h.values(flow=False), h_read.values(flow=False))
+
+
+def test_yes_flow(tmp_path):
+ filename = os.path.join(tmp_path, "whatever.root")
+
+ h = hist.Hist(hist.axis.Regular(20, 0, 20, flow=True)).fill(
+ np.random.normal(10, 6, 1000)
+ )
+
+ with uproot.recreate(filename) as fout:
+ fout["test"] = h
+
+ with uproot.open(filename) as fin:
+ h_read = fin["test"]
+
+ assert np.array_equal(h.axes[0].edges, h_read.axes[0].edges())
+ assert np.array_equal(h.values(flow=False), h_read.values(flow=False))
+ assert np.array_equal(h.values(flow=True), h_read.values(flow=True))
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/tests/test_0589-explicitly-interpret-RVec-type.py
new/tests/test_0589-explicitly-interpret-RVec-type.py
--- old/tests/test_0589-explicitly-interpret-RVec-type.py 1970-01-01
01:00:00.000000000 +0100
+++ new/tests/test_0589-explicitly-interpret-RVec-type.py 2022-06-22
00:02:04.000000000 +0200
@@ -0,0 +1,26 @@
+# BSD 3-Clause License; see
https://github.com/scikit-hep/uproot4/blob/main/LICENSE
+
+import os
+
+import numpy as np
+import pytest
+import skhep_testdata
+
+import uproot
+
+
+def test_numpy():
+ with uproot.open(skhep_testdata.data_path("uproot-issue-589.root")) as
file:
+ array = file["events"]["MC_px"].array(library="np", entry_stop=2)
+ assert array[0][7] == 30.399463653564453
+ assert array[1][11] == 42.04872131347656
+
+
+pytest.importorskip("awkward")
+
+
+def test_awkward():
+ with uproot.open(skhep_testdata.data_path("uproot-issue-589.root")) as
file:
+ array = file["events"]["MC_px"].array(library="ak", entry_stop=2)
+ assert array[0][7] == 30.399463653564453
+ assert array[1][11] == 42.04872131347656
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/tests/test_0603-dask-delayed-open.py
new/tests/test_0603-dask-delayed-open.py
--- old/tests/test_0603-dask-delayed-open.py 1970-01-01 01:00:00.000000000
+0100
+++ new/tests/test_0603-dask-delayed-open.py 2022-06-22 00:02:04.000000000
+0200
@@ -0,0 +1,37 @@
+# BSD 3-Clause License; see
https://github.com/scikit-hep/uproot4/blob/main/LICENSE
+
+
+import numpy
+import pytest
+import skhep_testdata
+
+import uproot
+
+dask = pytest.importorskip("dask")
+da = pytest.importorskip("dask.array")
+
+
+def test_single_delay_open():
+ filename1 = skhep_testdata.data_path("uproot-Zmumu.root") + ":events"
+ ttree = uproot.open(filename1)
+
+ assert uproot.dask(filename1, open_files=False)["px1"].chunks ==
((numpy.nan,),)
+ arr = uproot.dask(filename1, open_files=False)["px1"].compute() == ttree[
+ "px1"
+ ].array(library="np")
+ assert arr.all()
+
+
+def test_multiple_delay_open():
+ filename1 = skhep_testdata.data_path("uproot-Zmumu.root") + ":events"
+ filename2 = skhep_testdata.data_path("uproot-Zmumu-uncompressed.root") +
":events"
+ true_val = uproot.concatenate([filename1, filename2], library="np")
+
+ assert uproot.dask([filename1, filename2], open_files=False)["px1"].chunks
== (
+ (numpy.nan, numpy.nan),
+ )
+ arr = (
+ uproot.dask([filename1, filename2], open_files=False)["px1"].compute()
+ == true_val["px1"]
+ )
+ assert arr.all()
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/tests/test_0609-num-enteries-func.py
new/tests/test_0609-num-enteries-func.py
--- old/tests/test_0609-num-enteries-func.py 1970-01-01 01:00:00.000000000
+0100
+++ new/tests/test_0609-num-enteries-func.py 2022-06-22 00:02:04.000000000
+0200
@@ -0,0 +1,57 @@
+import skhep_testdata
+
+import uproot
+
+
+def test_num_entries_single():
+ file1 = skhep_testdata.data_path("uproot-Zmumu.root")
+ ttree1 = file1 + ":events"
+ assert list(uproot.num_entries(ttree1)) == [(file1, "events", 2304)]
+
+
+def test_num_entries_multiple():
+ file1 = skhep_testdata.data_path("uproot-Zmumu.root")
+ ttree1 = file1 + ":events"
+ file2 = skhep_testdata.data_path("uproot-HZZ.root")
+ ttree2 = file2 + ":events"
+ file3 = skhep_testdata.data_path("uproot-sample-6.08.04-uncompressed.root")
+ ttree3 = file3 + ":sample"
+
+ assert list(uproot.num_entries([ttree1, ttree2, ttree3])) == [
+ (file1, "events", 2304),
+ (file2, "events", 2421),
+ (file3, "sample", 30),
+ ]
+
+
+def test_num_entries_as_iterator():
+ file1 = skhep_testdata.data_path("uproot-Zmumu.root")
+ ttree1 = file1 + ":events"
+ file2 = skhep_testdata.data_path("uproot-HZZ.root")
+ ttree2 = file2 + ":events"
+ file3 = skhep_testdata.data_path("uproot-sample-6.08.04-uncompressed.root")
+ ttree3 = file3 + ":sample"
+
+ vals = [
+ (file1, "events", 2304),
+ (file2, "events", 2421),
+ (file3, "sample", 30),
+ ]
+ for i, num in enumerate(uproot.num_entries([ttree1, ttree2, ttree3])):
+ assert num == vals[i]
+
+
+def test_dict_input():
+ file1 = skhep_testdata.data_path("uproot-Zmumu.root")
+ file2 = skhep_testdata.data_path("uproot-HZZ.root")
+ file3 = skhep_testdata.data_path("uproot-sample-6.08.04-uncompressed.root")
+
+ vals = [
+ (file1, "events", 2304),
+ (file2, "events", 2421),
+ (file3, "sample", 30),
+ ]
+ for i, num in enumerate(
+ uproot.num_entries({file1: "events", file2: "events", file3: "sample"})
+ ):
+ assert num == vals[i]
++++++ uproot-4.2.2.tar.gz -> uproot-4.3.0.tar.gz ++++++
++++ 5616 lines of diff (skipped)
++++++ uproot-use-packaging-module.patch ++++++
--- /var/tmp/diff_new_pack.iC58vC/_old 2022-06-23 10:25:28.803818856 +0200
+++ /var/tmp/diff_new_pack.iC58vC/_new 2022-06-23 10:25:28.807818860 +0200
@@ -1,8 +1,8 @@
-Index: uproot-4.2.1/src/uproot/_util.py
+Index: uproot-4.3.0/src/uproot/_util.py
===================================================================
---- uproot-4.2.1.orig/src/uproot/_util.py
-+++ uproot-4.2.1/src/uproot/_util.py
-@@ -16,7 +16,7 @@ from collections.abc import Iterable
+--- uproot-4.3.0.orig/src/uproot/_util.py
++++ uproot-4.3.0/src/uproot/_util.py
+@@ -17,7 +17,7 @@ from collections.abc import Iterable
from urllib.parse import unquote, urlparse
import numpy
@@ -11,7 +11,7 @@
win = platform.system().lower().startswith("win")
-@@ -92,10 +92,10 @@ def parse_version(version):
+@@ -93,10 +93,10 @@ def parse_version(version):
Converts a semver string into a Version object that can be compared with
``<``, ``>=``, etc.
