From a8c9e1122e63819880f007b6a172a06a32d2672b Mon Sep 17 00:00:00 2001 From: mbaak Date: Tue, 23 Mar 2021 17:20:14 +0100 Subject: [PATCH 1/3] fix spark typo in addmethods function --- histogrammar/dfinterface/addmethods.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/histogrammar/dfinterface/addmethods.py b/histogrammar/dfinterface/addmethods.py index d6da7ec..aadb636 100644 --- a/histogrammar/dfinterface/addmethods.py +++ b/histogrammar/dfinterface/addmethods.py @@ -53,7 +53,7 @@ def add_sparksql_methods(cls, prefix=''): - add_methods(cls=cls, hg=hg_fill_sparksqlm, prefix=prefix) + add_methods(cls=cls, hg=hg_fill_sparksql, prefix=prefix) def add_pandas_methods(cls, prefix=''): From 8889d8b0ba23c3cbbe2d6fcef0a99256947c7eb0 Mon Sep 17 00:00:00 2001 From: mbaak Date: Tue, 23 Mar 2021 17:20:47 +0100 Subject: [PATCH 2/3] working tests in docker setup --- tests/test_pandas_histogrammar.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/tests/test_pandas_histogrammar.py b/tests/test_pandas_histogrammar.py index ae03c41..868fd6e 100644 --- a/tests/test_pandas_histogrammar.py +++ b/tests/test_pandas_histogrammar.py @@ -96,7 +96,7 @@ def test_make_histograms_no_time_axis(): assert time_axis == "" assert "date" in hists h = hists["date"] - assert h.binWidth == 751582381944440.9 + assert h.binWidth == 751582381944448.0 for cols in features: cols = cols.split(":") assert len(cols) == 1 @@ -121,7 +121,7 @@ def test_make_histograms_with_time_axis(): assert time_axis == "date" assert "date:age" in hists h = hists["date:age"] - assert h.binWidth == 751582381944440.9 + assert h.binWidth == 751582381944448.0 for cols in features: cols = cols.split(":") assert len(cols) == 2 and cols[0] == "date" @@ -129,7 +129,7 @@ def test_make_histograms_with_time_axis(): assert len(bs) == 2 assert "date:age" in bin_specs dateage = bin_specs["date:age"] - assert dateage[0]["binWidth"] == 751582381944440.9 + assert dateage[0]["binWidth"] == 751582381944448.0 assert dateage[1]["binWidth"] == 2.0 assert dateage[1]["origin"] == 9.5 @@ -137,7 +137,7 @@ def test_make_histograms_with_time_axis(): bin_specs = get_bin_specs(hists) assert "date:age" in bin_specs dateage = bin_specs["date:age"] - assert dateage[0]["binWidth"] == 751582381944440.9 + assert dateage[0]["binWidth"] == 751582381944448.0 assert dateage[1]["binWidth"] == 2.0 assert dateage[1]["origin"] == 9.5 @@ -150,7 +150,7 @@ def test_make_histograms_with_time_axis(): # test get_bin_specs 3 bin_specs = get_bin_specs(hists["date:age"]) - assert bin_specs[0]["binWidth"] == 751582381944440.9 + assert bin_specs[0]["binWidth"] == 751582381944448.0 assert bin_specs[1]["binWidth"] == 2.0 assert bin_specs[1]["origin"] == 9.5 From 66b011fb9e787a4f1ebfed60710a076ee6f124bc Mon Sep 17 00:00:00 2001 From: mbaak Date: Tue, 23 Mar 2021 17:21:41 +0100 Subject: [PATCH 3/3] bump up version to 1.0.22 --- README.rst | 2 +- setup.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.rst b/README.rst index b43f7db..b242093 100644 --- a/README.rst +++ b/README.rst @@ -19,7 +19,7 @@ Histograms and other aggregators may also be converted into CUDA code for inclus PyCUDA is available, they can also be filled from Numpy arrays by JIT-compiling the CUDA code. This Python implementation of histogrammar been tested to guarantee compatibility with its Scala implementation. -Latest Python release: v1.0.22 (Mar 2021). +Latest Python release: v1.0.23 (Mar 2021). Announcements ============= diff --git a/setup.py b/setup.py index 38aa263..f994a2b 100644 --- a/setup.py +++ b/setup.py @@ -22,7 +22,7 @@ MAJOR = 1 REVISION = 0 -PATCH = 22 +PATCH = 23 DEV = False # NOTE: also update version at: README.rst