Skip to content

Commit 2812793

Browse files
authored
Merge branch 'master' into dependabot/github_actions/codecov/codecov-action-6
2 parents f353397 + aa0355d commit 2812793

5 files changed

Lines changed: 30 additions & 10 deletions

File tree

.github/workflows/Documenter.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
with:
2222
version: '1.10'
2323
show-versioninfo: true # this causes versioninfo to be printed to the action log
24-
- uses: julia-actions/cache@v2
24+
- uses: julia-actions/cache@v3
2525
- uses: julia-actions/julia-buildpkg@latest
2626
- uses: julia-actions/julia-docdeploy@latest
2727
env:

.github/workflows/Invalidations.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
with:
2121
version: '1.10'
2222
- uses: actions/checkout@v6
23-
- uses: julia-actions/cache@v2
23+
- uses: julia-actions/cache@v3
2424
- uses: julia-actions/julia-buildpkg@v1
2525
- uses: julia-actions/julia-invalidations@v1
2626
id: invs_pr

.github/workflows/test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ jobs:
5959
arch: ${{ matrix.arch }}
6060
version: ${{ matrix.version }}
6161
show-versioninfo: true
62-
- uses: julia-actions/cache@v2
62+
- uses: julia-actions/cache@v3
6363
- uses: julia-actions/julia-runtest@latest
6464
env:
6565
JULIA_NUM_THREADS: 2

src/registry.jl

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -525,7 +525,12 @@ add_format(format"FITS",
525525
[:FITSIO => UUID("525bcba6-941b-5504-bd06-fd0dc1a4d2eb")],
526526
[:AstroImages => UUID("fe3fc30c-9b16-11e9-1c73-17dabf39f4ad")])
527527

528-
528+
add_format(format"ASDF",
529+
# See https://www.asdf-format.org/projects/asdf-standard/en/latest/file_layout.html#header
530+
# #ASDF == ([0x23,0x41,0x53,0x44,0x46])
531+
[0x23,0x41,0x53,0x44,0x46],
532+
[".asdf"],
533+
[:ASDF => UUID("686f71d1-807d-59a4-a860-28280ea06d7b")])
529534

530535
function detect_gadget2(io)
531536
pos = position(io)

test/query.jl

Lines changed: 21 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -405,17 +405,32 @@ let file_dir = joinpath(@__DIR__, "files"), file_path = Path(file_dir)
405405
# q = query(f)
406406
# @test typeof(q) <: File{format"MP4"}
407407
end
408+
function try_download(url)
409+
try
410+
return Downloads.download(url)
411+
catch
412+
return nothing
413+
end
414+
end
408415
if Base.VERSION >= v"1.6" || !Sys.iswindows()
409416
# FIXME: Windows fails to download the files on Julia 1.0
410417
@testset "OGG detection" begin
411-
f = Downloads.download("https://upload.wikimedia.org/wikipedia/commons/8/87/Annie_Oakley_shooting_glass_balls%2C_1894.ogv")
412-
q = query(f)
413-
@test typeof(q) <: File{format"OGG"}
418+
tmpfile = try_download("https://upload.wikimedia.org/wikipedia/commons/8/87/Annie_Oakley_shooting_glass_balls%2C_1894.ogv")
419+
if tmpfile == nothing
420+
@test_skip "Skipped: network unavailable (download failed)"
421+
else
422+
q = query(tmpfile)
423+
@test typeof(q) <: File{format"OGG"}
424+
end
414425
end
415426
@testset "MATROSKA detection" begin
416-
f = Downloads.download("https://upload.wikimedia.org/wikipedia/commons/1/13/Artist%E2%80%99s_impression_of_the_black_hole_inside_NGC_300_X-1_%28ESO_1004c%29.webm")
417-
q = query(f)
418-
@test typeof(q) <: File{format"MATROSKA"}
427+
tmpfile = try_download("https://upload.wikimedia.org/wikipedia/commons/1/13/Artist%E2%80%99s_impression_of_the_black_hole_inside_NGC_300_X-1_%28ESO_1004c%29.webm")
428+
if tmpfile == nothing
429+
@test_skip "Skipped: network unavailable (download failed)"
430+
else
431+
q = query(tmpfile)
432+
@test typeof(q) <: File{format"MATROSKA"}
433+
end
419434
end
420435
end
421436
@testset "WAV detection" begin

0 commit comments

Comments
 (0)