Skip to content
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

Jump to bottom

fix tests on nightly and 32-bit #3463

Merged
merged 2 commits into from
Sep 8, 2024
Merged

fix tests on nightly and 32-bit #3463

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
72c90a7
fix tests on nightly and 32-bit
bkamins Sep 7, 2024
faa224a
additional test fix
bkamins Sep 7, 2024
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
8 changes: 6 additions & 2 deletions src/groupeddataframe/complextransforms.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -269,8 +269,12 @@ function _combine_rows_with_first!((firstrow,)::Ref{Any},
# Create up to one task per thread
# This has lower overhead than creating one task per group,
# but is optimal only if operations take roughly the same time for all groups
basesize = max(1, cld(len - 1, Threads.nthreads()))
partitions = Iterators.partition(2:len, basesize)
if isthreadsafe(outcols, incols)
basesize = max(1, cld(len - 1, Threads.nthreads()))
partitions = Iterators.partition(2:len, basesize)
else
partitions = (2:len,)
end
widen_type_lock = ReentrantLock()
outcolsref = Ref{NTuple{<:Any, AbstractVector}}(outcols)
type_widened = fill(false, length(partitions))
Expand Down
6 changes: 3 additions & 3 deletions test/io.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -760,7 +760,7 @@ end
df = DataFrame(
A=Int64[1,4,9,16,25,36,49,64],
B = [
md"[DataFrames.jl](http://juliadata.github.io/DataFrames.jl)",
md"ABC",
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

handling of links in MD changed in nightly. But since it is unable I propose just not to test it.

md"``\frac{x^2}{x^2+y^2}``",
md"`Header`",
md"This is *very*, **very**, very, very, very, very, very, very, very long line" ,
Expand All @@ -781,7 +781,7 @@ end
Row │ A B
│ Int64 MD
─────┼──────────────────────────────────────────
1 │ 1 DataFrames.jl (http://juliadat…
1 │ 1 ABC
2 │ 4 \\frac{x^2}{x^2+y^2}
3 │ 9 Header
4 │ 16 This is very, very, very, very…
Expand All @@ -793,7 +793,7 @@ end
@test sprint(show, "text/csv", df) ==
"""
\"A\",\"B\"
1,\"[DataFrames.jl](http://juliadata.github.io/DataFrames.jl)\"
1,\"ABC\"
4,\"\$\\\\frac{x^2}{x^2+y^2}\$\"
9,\"`Header`\"
16,\"This is *very*, **very**, very, very, very, very, very, very, very long line\"
Expand Down
2 changes: 1 addition & 1 deletion test/select.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3039,7 +3039,7 @@ end
@test size(combine(df, :a => (x -> Any[]) => AsTable)) == (0, 0)
df2 = combine(df, :a => (x -> NamedTuple{(:x,),Tuple{Int64}}[]) => AsTable)
@test size(df2) == (0, 1)
@test eltype(df2.x) === Int
@test eltype(df2.x) === Int64
end

end # module
Loading