Skip to content

Equality tests won't throw errors. #96

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 2 commits into from
Jul 25, 2022
Merged

Equality tests won't throw errors. #96

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1f995bc
Equality tests won't throw errors.
malmaud Jul 23, 2022
b8a1a8a
Update tests
malmaud Jul 25, 2022
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
14 changes: 13 additions & 1 deletion src/Pandas.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -376,7 +376,6 @@ end

for (jl_op, py_op, py_opᵒ) in [(:+, :__add__, :__add__), (:*, :__mul__, :__mul__),
(:/, :__div__, :__rdiv__), (:-, :__sub__, :__rsub__),
(:(==), :__eq__, :__eq__), (:!=, :__ne__, :__ne__),
(:>, :__gt__, :__lt__), (:<, :__lt__, :__gt__),
(:>=, :__ge__, :__le__), (:<=, :__le__, :__ge__),
(:&, :__and__, :__and__), (:|, :__or__, :__or__)]
Expand All @@ -397,6 +396,19 @@ for (jl_op, py_op, py_opᵒ) in [(:+, :__add__, :__add__), (:*, :__mul__, :__mul
end
end

# Special-case the handling of equality-testing to always consider PandasWrapped
# objects as unequal to non-wrapped objects.
(==)(x::PandasWrapped, y) = false
(==)(x, y::PandasWrapped) = false
(!=)(x::PandasWrapped, y) = true
(!=)(x, y::PandasWrapped) = true
function (==)(x::PandasWrapped, y::PandasWrapped)
pandas_wrap(x.pyo.__eq__(y))
end
function (!=)(x::PandasWrapped, y::PandasWrapped)
pandas_wrap(x.pyo.__neq__(y))
end

for op in [(:-, :__neg__)]
@eval begin
$(op[1])(x::PandasWrapped) = pandas_wrap(x.pyo.$(quot(op[2]))())
Expand Down
8 changes: 8 additions & 0 deletions test/runtests.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,3 +73,11 @@ julia_df = DataFrames.DataFrame(py_df)
julia_df= DataFrames.DataFrame(C = 1:4, A = 5:8, B = 9:12)
py_df = Pandas.DataFrame(julia_df)
@test all(Pandas.columns(py_df) .== ["C","A","B"])

df1 = Pandas.Series(1:2)
df2 = Pandas.Series(1:2)
df3 = Pandas.Series(3:4)

@test all(df1 == df1)
@test all(df1 == df2)
@test df1 != [1, 2]