Skip to content

Commit

Permalink
Merge 8cad82e into 84bdc11
Browse files Browse the repository at this point in the history
  • Loading branch information
tkf committed Feb 13, 2020
2 parents 84bdc11 + 8cad82e commit 86b7d51
Show file tree
Hide file tree
Showing 4 changed files with 15 additions and 7 deletions.
2 changes: 1 addition & 1 deletion Project.toml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ ConstructionBase = "0.1, 1.0"
InitialValues = "0.2"
Requires = "0.5, 1.0"
Setfield = "0.5.1, 0.6"
Tables = "0.2"
Tables = "0.2, 1.0"
ZygoteRules = "0.1, 0.2"
julia = "1.0"

Expand Down
4 changes: 4 additions & 0 deletions src/NoBang/singletoncontainers.jl
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,10 @@ Tables.rowaccess(::Type{<:SingletonVector{<:NamedTuple{names}}}) where {names} =
Tables.columnaccess(::Type{<:SingletonVector{<:NamedTuple{names}}}) where {names} =
@isdefined(names)

# For backward compatibility (these were automatically `false` in Tables 0.2):
Tables.istable(::Type{SingletonVector{NamedTuple}}) = false
Tables.istable(::Type{SingletonVector{<:NamedTuple}}) = false

Tables.rows(x::SingletonVector{<:NamedTuple}) = [x.value]
Tables.columns(x::SingletonVector{<:NamedTuple{names}}) where {names} =
NamedTuple{names}(map(x -> [x], Tuple(x.value)))
Expand Down
8 changes: 5 additions & 3 deletions test/environments/jl10/Manifest.toml
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,9 @@ version = "1.1.0"

[[DataFrames]]
deps = ["CategoricalArrays", "Compat", "DataAPI", "Future", "InvertedIndices", "IteratorInterfaceExtensions", "Missings", "PooledArrays", "Printf", "REPL", "Reexport", "SortingAlgorithms", "Statistics", "TableTraits", "Tables", "Unicode"]
git-tree-sha1 = "00136fcd39d503e66ab1b2eab800c47deaf7ca04"
git-tree-sha1 = "2c57e2076f1830f1475ce77e0509460096b8431b"
repo-rev = "master"
repo-url = "https://github.com/JuliaData/DataFrames.jl.git"
uuid = "a93c6f00-e57d-5684-b7b6-d8193f3e46c0"
version = "0.20.0"

Expand Down Expand Up @@ -350,9 +352,9 @@ version = "1.0.0"

[[Tables]]
deps = ["DataAPI", "DataValueInterfaces", "IteratorInterfaceExtensions", "LinearAlgebra", "TableTraits", "Test"]
git-tree-sha1 = "aaed7b3b00248ff6a794375ad6adf30f30ca5591"
git-tree-sha1 = "f2a8dae52736dd30921b2aea384551a2f982bce2"
uuid = "bd369af6-aec1-5ad0-b16a-f7cc5008161c"
version = "0.2.11"
version = "1.0.0"

[[Test]]
deps = ["Distributed", "InteractiveUtils", "Logging", "Random"]
Expand Down
8 changes: 5 additions & 3 deletions test/environments/main/Manifest.toml
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,9 @@ version = "1.1.0"

[[DataFrames]]
deps = ["CategoricalArrays", "Compat", "DataAPI", "Future", "InvertedIndices", "IteratorInterfaceExtensions", "Missings", "PooledArrays", "Printf", "REPL", "Reexport", "SortingAlgorithms", "Statistics", "TableTraits", "Tables", "Unicode"]
git-tree-sha1 = "00136fcd39d503e66ab1b2eab800c47deaf7ca04"
git-tree-sha1 = "2c57e2076f1830f1475ce77e0509460096b8431b"
repo-rev = "master"
repo-url = "https://github.com/JuliaData/DataFrames.jl.git"
uuid = "a93c6f00-e57d-5684-b7b6-d8193f3e46c0"
version = "0.20.0"

Expand Down Expand Up @@ -364,9 +366,9 @@ version = "1.0.0"

[[Tables]]
deps = ["DataAPI", "DataValueInterfaces", "IteratorInterfaceExtensions", "LinearAlgebra", "TableTraits", "Test"]
git-tree-sha1 = "aaed7b3b00248ff6a794375ad6adf30f30ca5591"
git-tree-sha1 = "f2a8dae52736dd30921b2aea384551a2f982bce2"
uuid = "bd369af6-aec1-5ad0-b16a-f7cc5008161c"
version = "0.2.11"
version = "1.0.0"

[[Test]]
deps = ["Distributed", "InteractiveUtils", "Logging", "Random"]
Expand Down

0 comments on commit 86b7d51

Please sign in to comment.