diff --git a/Project.toml b/Project.toml index 9b427ce8..624daf13 100644 --- a/Project.toml +++ b/Project.toml @@ -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" diff --git a/src/NoBang/singletoncontainers.jl b/src/NoBang/singletoncontainers.jl index 84d11796..68eec012 100644 --- a/src/NoBang/singletoncontainers.jl +++ b/src/NoBang/singletoncontainers.jl @@ -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))) diff --git a/test/environments/jl10/Manifest.toml b/test/environments/jl10/Manifest.toml index cbc6fde4..903cfec4 100644 --- a/test/environments/jl10/Manifest.toml +++ b/test/environments/jl10/Manifest.toml @@ -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" @@ -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"] diff --git a/test/environments/main/Manifest.toml b/test/environments/main/Manifest.toml index 29360d11..f1ad3d6a 100644 --- a/test/environments/main/Manifest.toml +++ b/test/environments/main/Manifest.toml @@ -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" @@ -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"]