Skip to content

1.0.x #43

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Mar 23, 2021
Merged

1.0.x #43

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a8c9e11
fix spark typo in addmethods function
mbaak Mar 23, 2021
8889d8b
working tests in docker setup
mbaak Mar 23, 2021
66b011f
bump up version to 1.0.22
mbaak Mar 23, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion README.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
=============
Expand Down
2 changes: 1 addition & 1 deletion histogrammar/dfinterface/addmethods.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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=''):
Expand Down
2 changes: 1 addition & 1 deletion setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@

MAJOR = 1
REVISION = 0
PATCH = 22
PATCH = 23
DEV = False
# NOTE: also update version at: README.rst

Expand Down
10 changes: 5 additions & 5 deletions tests/test_pandas_histogrammar.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -121,23 +121,23 @@ 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"
for f, bs in bin_specs.items():
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

# test get_bin_specs 1
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

Expand All @@ -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

Expand Down