Skip to content

Commit bdc6ae7

Browse files
authored
Merge branch 'main' into datatype
2 parents b0a1f3a + 3d5ef0c commit bdc6ae7

4 files changed

Lines changed: 6 additions & 14 deletions

File tree

.github/workflows/CI.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,7 @@ jobs:
99
strategy:
1010
matrix:
1111
version:
12-
# TODO: Put back after https://github.com/JuliaIO/FileIO.jl/pull/427
13-
#- "min"
12+
- "min"
1413
- "1"
1514
- "pre"
1615
os:

Project.toml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,6 @@ PkgVersion = "eebad327-c553-4316-9ea0-9fa01ccd7688"
2121
StridedViews = "4db3bf67-4bd7-4b4e-b153-31dc3fb37143"
2222
YAML = "ddb6d928-2868-570f-bddf-ab3f9cf99eb6"
2323

24-
# TODO: Remove after https://github.com/JuliaIO/FileIO.jl/pull/427
25-
[sources]
26-
FileIO = {url = "https://github.com/JuliaIO/FileIO.jl", rev = "master"}
27-
2824
[compat]
2925
AbstractTrees = "0.4.5"
3026
ChunkCodecLibBlosc = "0.2.0, 0.3"

docs/src/intro.md

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -218,12 +218,8 @@ intro_compressed.asdf
218218
Using `NDArrayWrapper` allows for the wrapped data to be lazily accessed as a strided view. To access the underlying data, use the `[]` (dereference) syntax:
219219

220220
```jldoctest intro
221-
julia> af["data"][]
222-
4-element reshape(reinterpret(Int64, ::StridedViews.StridedView{UInt8, 2, Memory{UInt8}, typeof(identity)}), 4) with eltype Int64:
223-
1
224-
2
225-
3
226-
4
221+
julia> af["data"][] == [1, 2, 3, 4]
222+
true
227223
```
228224

229225
## Tagged objects

src/ASDF.jl

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1090,15 +1090,15 @@ long.asdf
10901090
├─ field_17::Vector{Float64} | shape = (10,)
10911091
├─ field_18::Vector{Float64} | shape = (10,)
10921092
├─ field_19::Vector{Float64} | shape = (10,)
1093-
⋮ (7) more rows
1093+
⋮ (11) more rows
10941094
10951095
julia> ASDF.info(af; max_rows = 5)
10961096
long.asdf
10971097
├─ field_1::Vector{Float64} | shape = (10,)
10981098
├─ field_2::Vector{Float64} | shape = (10,)
10991099
├─ field_3::Vector{Float64} | shape = (10,)
11001100
├─ field_4::Vector{Float64} | shape = (10,)
1101-
⋮ (22) more rows
1101+
⋮ (26) more rows
11021102
11031103
julia> ASDF.info(af; max_rows = Inf)
11041104
long.asdf
@@ -1132,6 +1132,7 @@ long.asdf
11321132
├─ homepage::String | https://github.com/JuliaAstro/ASDF.jl
11331133
├─ name::String | ASDF.jl
11341134
└─ version::String | 2.0.0
1135+
```
11351136
"""
11361137
function info(io::IO, af::ASDFFile; max_rows = 20)
11371138
root = ASDFTreeNode(nothing, af)

0 commit comments

Comments
 (0)