Skip to content

Commit b9496fc

Browse files
mtfishmangithub-actions[bot]
authored andcommitted
Format .jl files (ITensorFormatter)
1 parent 995052f commit b9496fc

File tree

9 files changed

+145
-127
lines changed

9 files changed

+145
-127
lines changed

Project.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
name = "VisualizationBase"
22
uuid = "19e8930c-b694-45c7-b48f-ae1a17da5712"
3+
version = "0.1.1"
34
authors = ["ITensor developers <support@itensor.org> and contributors"]
4-
version = "0.1.0"
55

66
[deps]
77
BackendSelection = "680c2d7c-f67a-4cc9-ae9c-da132b1447a5"

docs/make.jl

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,25 @@
1-
using VisualizationBase: VisualizationBase
21
using Documenter: Documenter, DocMeta, deploydocs, makedocs
2+
using VisualizationBase: VisualizationBase
33

44
DocMeta.setdocmeta!(
5-
VisualizationBase, :DocTestSetup, :(using VisualizationBase); recursive=true
5+
VisualizationBase, :DocTestSetup, :(using VisualizationBase); recursive = true,
66
)
77

88
include("make_index.jl")
99

1010
makedocs(;
11-
modules=[VisualizationBase],
12-
authors="ITensor developers <support@itensor.org> and contributors",
13-
sitename="VisualizationBase.jl",
14-
format=Documenter.HTML(;
15-
canonical="https://itensor.github.io/VisualizationBase.jl",
16-
edit_link="main",
17-
assets=["assets/favicon.ico", "assets/extras.css"],
18-
),
19-
pages=["Home" => "index.md", "Reference" => "reference.md"],
11+
modules = [VisualizationBase],
12+
authors = "ITensor developers <support@itensor.org> and contributors",
13+
sitename = "VisualizationBase.jl",
14+
format = Documenter.HTML(;
15+
canonical = "https://itensor.github.io/VisualizationBase.jl",
16+
edit_link = "main",
17+
assets = ["assets/favicon.ico", "assets/extras.css"],
18+
),
19+
pages = ["Home" => "index.md", "Reference" => "reference.md"],
2020
)
2121

2222
deploydocs(;
23-
repo="github.com/ITensor/VisualizationBase.jl", devbranch="main", push_preview=true
23+
repo = "github.com/ITensor/VisualizationBase.jl", devbranch = "main",
24+
push_preview = true,
2425
)

docs/make_index.jl

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,20 +2,20 @@ using Literate: Literate
22
using VisualizationBase: VisualizationBase
33

44
function ccq_logo(content)
5-
include_ccq_logo = """
5+
include_ccq_logo = """
66
```@raw html
77
<img class="display-light-only" src="assets/CCQ.png" width="20%" alt="Flatiron Center for Computational Quantum Physics logo."/>
88
<img class="display-dark-only" src="assets/CCQ-dark.png" width="20%" alt="Flatiron Center for Computational Quantum Physics logo."/>
99
```
1010
"""
11-
content = replace(content, "{CCQ_LOGO}" => include_ccq_logo)
12-
return content
11+
content = replace(content, "{CCQ_LOGO}" => include_ccq_logo)
12+
return content
1313
end
1414

1515
Literate.markdown(
16-
joinpath(pkgdir(VisualizationBase), "examples", "README.jl"),
17-
joinpath(pkgdir(VisualizationBase), "docs", "src");
18-
flavor=Literate.DocumenterFlavor(),
19-
name="index",
20-
postprocess=ccq_logo,
16+
joinpath(pkgdir(VisualizationBase), "examples", "README.jl"),
17+
joinpath(pkgdir(VisualizationBase), "docs", "src");
18+
flavor = Literate.DocumenterFlavor(),
19+
name = "index",
20+
postprocess = ccq_logo,
2121
)

docs/make_readme.jl

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,20 +2,20 @@ using Literate: Literate
22
using VisualizationBase: VisualizationBase
33

44
function ccq_logo(content)
5-
include_ccq_logo = """
5+
include_ccq_logo = """
66
<picture>
77
<source media="(prefers-color-scheme: dark)" width="20%" srcset="docs/src/assets/CCQ-dark.png">
88
<img alt="Flatiron Center for Computational Quantum Physics logo." width="20%" src="docs/src/assets/CCQ.png">
99
</picture>
1010
"""
11-
content = replace(content, "{CCQ_LOGO}" => include_ccq_logo)
12-
return content
11+
content = replace(content, "{CCQ_LOGO}" => include_ccq_logo)
12+
return content
1313
end
1414

1515
Literate.markdown(
16-
joinpath(pkgdir(VisualizationBase), "examples", "README.jl"),
17-
joinpath(pkgdir(VisualizationBase));
18-
flavor=Literate.CommonMarkFlavor(),
19-
name="README",
20-
postprocess=ccq_logo,
16+
joinpath(pkgdir(VisualizationBase), "examples", "README.jl"),
17+
joinpath(pkgdir(VisualizationBase));
18+
flavor = Literate.CommonMarkFlavor(),
19+
name = "README",
20+
postprocess = ccq_logo,
2121
)

examples/README.jl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# # VisualizationBase.jl
2-
#
2+
#
33
# [![Stable](https://img.shields.io/badge/docs-stable-blue.svg)](https://itensor.github.io/VisualizationBase.jl/stable/)
44
# [![Dev](https://img.shields.io/badge/docs-dev-blue.svg)](https://itensor.github.io/VisualizationBase.jl/dev/)
55
# [![Build Status](https://github.com/ITensor/VisualizationBase.jl/actions/workflows/Tests.yml/badge.svg?branch=main)](https://github.com/ITensor/VisualizationBase.jl/actions/workflows/Tests.yml?query=branch%3Amain)
@@ -43,8 +43,8 @@ julia> Pkg.add("VisualizationBase")
4343

4444
# ## Examples
4545

46-
using VisualizationBase: @visualize
4746
using Test: @test
47+
using VisualizationBase: @visualize
4848

4949
x = [2, 3]
5050
y = @visualize x

src/VisualizationBase.jl

Lines changed: 52 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -5,71 +5,81 @@ using BackendSelection: @Backend_str, AbstractBackend, Backend
55
export @visualize, visualize
66

77
macro visualize(x, kwargs...)
8-
all(kwarg -> Meta.isexpr(kwarg, :(=)), kwargs) ||
9-
throw(ArgumentError("All keyword arguments must be of the form `kw=value`."))
10-
kwargs′ = if all(kwarg -> kwarg.args[1] :name, kwargs)
11-
(kwargs..., :(name=$(string(x))))
12-
else
13-
kwargs
14-
end
15-
return :(visualize($(esc(x)); $(esc.(kwargs′)...)); $(esc(x)))
8+
all(kwarg -> Meta.isexpr(kwarg, :(=)), kwargs) ||
9+
throw(ArgumentError("All keyword arguments must be of the form `kw=value`."))
10+
kwargs′ = if all(kwarg -> kwarg.args[1] :name, kwargs)
11+
(kwargs..., :(name = $(string(x))))
12+
else
13+
kwargs
14+
end
15+
return :(visualize($(esc(x)); $(esc.(kwargs′)...)); $(esc(x)))
1616
end
1717

18-
function visualize(io::IO, x; backend=Backend"Default", name=nothing, kwargs...)
19-
return visualize(io, to_backend(backend; kwargs...), x; name)
18+
function visualize(io::IO, x; backend = Backend"Default", name = nothing, kwargs...)
19+
return visualize(io, to_backend(backend; kwargs...), x; name)
2020
end
2121

22-
function visualize(x; backend=Backend"Default", name=nothing, io::IO=stdout, kwargs...)
23-
return visualize(io, to_backend(backend; kwargs...), x; name)
22+
function visualize(
23+
x;
24+
backend = Backend"Default",
25+
name = nothing,
26+
io::IO = stdout,
27+
kwargs...,
28+
)
29+
return visualize(io, to_backend(backend; kwargs...), x; name)
2430
end
2531

26-
function visualize(io::IO, backend::AbstractBackend, x; name=nothing)
27-
name = get(backend, :name, name)
28-
if isnothing(name)
29-
visualize_unnamed(io, backend, x)
32+
function visualize(io::IO, backend::AbstractBackend, x; name = nothing)
33+
name = get(backend, :name, name)
34+
if isnothing(name)
35+
visualize_unnamed(io, backend, x)
36+
return nothing
37+
end
38+
visualize_named(io, backend, name, x)
3039
return nothing
31-
end
32-
visualize_named(io, backend, name, x)
33-
return nothing
3440
end
3541

36-
function visualize(backend::Backend"Default", x; name=nothing)
37-
io = get(backend, :io, stdout)
38-
visualize(io, backend, x; name)
39-
return nothing
42+
function visualize(backend::Backend"Default", x; name = nothing)
43+
io = get(backend, :io, stdout)
44+
visualize(io, backend, x; name)
45+
return nothing
4046
end
4147

4248
function visualize_named(io::IO, backend::Backend"Default", name, x)
43-
mime = get(backend, :mime, MIME"text/plain"())
44-
println(io, name, " = ")
45-
show_indented(io, mime, x)
46-
println(io)
47-
return nothing
49+
mime = get(backend, :mime, MIME"text/plain"())
50+
println(io, name, " = ")
51+
show_indented(io, mime, x)
52+
println(io)
53+
return nothing
4854
end
4955

5056
function visualize_unnamed(io::IO, ::Backend"Default", x)
51-
show(io, MIME"text/plain"(), x)
52-
println(io)
53-
return nothing
57+
show(io, MIME"text/plain"(), x)
58+
println(io)
59+
return nothing
5460
end
5561

56-
function show_indented(io::IO, mime::MIME, x; indent=" ")
57-
str = sprint(show, mime, x)
58-
str = join((indent * s for s in split(str, '\n')), '\n')
59-
print(io, str)
60-
return nothing
62+
function show_indented(io::IO, mime::MIME, x; indent = " ")
63+
str = sprint(show, mime, x)
64+
str = join((indent * s for s in split(str, '\n')), '\n')
65+
print(io, str)
66+
return nothing
6167
end
6268

6369
function to_backend(::Type{B}; kwargs...) where {B}
64-
return B(; kwargs...)
70+
return B(; kwargs...)
6571
end
66-
function to_backend(backend::Union{Symbol,String}; kwargs...)
67-
return Backend(backend; kwargs...)
72+
function to_backend(backend::Union{Symbol, String}; kwargs...)
73+
return Backend(backend; kwargs...)
6874
end
6975
function to_backend(backend::AbstractBackend; kwargs...)
70-
isempty(kwargs) ||
71-
throw(ArgumentError("Keyword arguments must be passed as part of the backend object."))
72-
return backend
76+
isempty(kwargs) ||
77+
throw(
78+
ArgumentError(
79+
"Keyword arguments must be passed as part of the backend object.",
80+
),
81+
)
82+
return backend
7383
end
7484

7585
end

test/runtests.jl

Lines changed: 48 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -6,60 +6,67 @@ using Suppressor: Suppressor
66
const pat = r"(?:--group=)(\w+)"
77
arg_id = findfirst(contains(pat), ARGS)
88
const GROUP = uppercase(
9-
if isnothing(arg_id)
10-
get(ENV, "GROUP", "ALL")
11-
else
12-
only(match(pat, ARGS[arg_id]).captures)
13-
end,
9+
if isnothing(arg_id)
10+
get(ENV, "GROUP", "ALL")
11+
else
12+
only(match(pat, ARGS[arg_id]).captures)
13+
end,
1414
)
1515

16-
"match files of the form `test_*.jl`, but exclude `*setup*.jl`"
16+
"""
17+
match files of the form `test_*.jl`, but exclude `*setup*.jl`
18+
"""
1719
function istestfile(fn)
18-
return endswith(fn, ".jl") && startswith(basename(fn), "test_") && !contains(fn, "setup")
20+
return endswith(fn, ".jl") && startswith(basename(fn), "test_") &&
21+
!contains(fn, "setup")
1922
end
20-
"match files of the form `*.jl`, but exclude `*_notest.jl` and `*setup*.jl`"
23+
"""
24+
match files of the form `*.jl`, but exclude `*_notest.jl` and `*setup*.jl`
25+
"""
2126
function isexamplefile(fn)
22-
return endswith(fn, ".jl") && !endswith(fn, "_notest.jl") && !contains(fn, "setup")
27+
return endswith(fn, ".jl") && !endswith(fn, "_notest.jl") && !contains(fn, "setup")
2328
end
2429

2530
@time begin
26-
# tests in groups based on folder structure
27-
for testgroup in filter(isdir, readdir(@__DIR__))
28-
if GROUP == "ALL" || GROUP == uppercase(testgroup)
29-
groupdir = joinpath(@__DIR__, testgroup)
30-
for file in filter(istestfile, readdir(groupdir))
31-
filename = joinpath(groupdir, file)
32-
@eval @safetestset $file begin
33-
include($filename)
31+
# tests in groups based on folder structure
32+
for testgroup in filter(isdir, readdir(@__DIR__))
33+
if GROUP == "ALL" || GROUP == uppercase(testgroup)
34+
groupdir = joinpath(@__DIR__, testgroup)
35+
for file in filter(istestfile, readdir(groupdir))
36+
filename = joinpath(groupdir, file)
37+
@eval @safetestset $file begin
38+
include($filename)
39+
end
40+
end
3441
end
35-
end
3642
end
37-
end
3843

39-
# single files in top folder
40-
for file in filter(istestfile, readdir(@__DIR__))
41-
(file == basename(@__FILE__)) && continue # exclude this file to avoid infinite recursion
42-
@eval @safetestset $file begin
43-
include($file)
44+
# single files in top folder
45+
for file in filter(istestfile, readdir(@__DIR__))
46+
(file == basename(@__FILE__)) && continue # exclude this file to avoid infinite recursion
47+
@eval @safetestset $file begin
48+
include($file)
49+
end
4450
end
45-
end
4651

47-
# test examples
48-
examplepath = joinpath(@__DIR__, "..", "examples")
49-
for (root, _, files) in walkdir(examplepath)
50-
contains(chopprefix(root, @__DIR__), "setup") && continue
51-
for file in filter(isexamplefile, files)
52-
filename = joinpath(root, file)
53-
@eval begin
54-
@safetestset $file begin
55-
$(Expr(
56-
:macrocall,
57-
GlobalRef(Suppressor, Symbol("@suppress")),
58-
LineNumberNode(@__LINE__, @__FILE__),
59-
:(include($filename)),
60-
))
52+
# test examples
53+
examplepath = joinpath(@__DIR__, "..", "examples")
54+
for (root, _, files) in walkdir(examplepath)
55+
contains(chopprefix(root, @__DIR__), "setup") && continue
56+
for file in filter(isexamplefile, files)
57+
filename = joinpath(root, file)
58+
@eval begin
59+
@safetestset $file begin
60+
$(
61+
Expr(
62+
:macrocall,
63+
GlobalRef(Suppressor, Symbol("@suppress")),
64+
LineNumberNode(@__LINE__, @__FILE__),
65+
:(include($filename)),
66+
)
67+
)
68+
end
69+
end
6170
end
62-
end
6371
end
64-
end
6572
end

test/test_aqua.jl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
using VisualizationBase: VisualizationBase
21
using Aqua: Aqua
32
using Test: @testset
3+
using VisualizationBase: VisualizationBase
44

55
@testset "Code quality (Aqua.jl)" begin
6-
Aqua.test_all(VisualizationBase)
6+
Aqua.test_all(VisualizationBase)
77
end

test/test_basics.jl

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
1-
using VisualizationBase: VisualizationBase, @visualize, visualize
21
using Test: @test, @testset
2+
using VisualizationBase: VisualizationBase, @visualize, visualize
33

44
@testset "VisualizationBase" begin
5-
x = [2, 3]
6-
@test sprint(visualize, x) ==
7-
"2-element Vector{Int64}:\n 2\n 3\n" ==
8-
sprint((io, x) -> display(TextDisplay(io), x), x)
9-
@test sprint((io, x) -> visualize(io, x; name="y"), x) ==
10-
"y = \n 2-element Vector{Int64}:\n 2\n 3\n"
11-
@test sprint((io, x) -> @visualize(x, io=io), x) ==
12-
"x = \n 2-element Vector{Int64}:\n 2\n 3\n"
13-
@test sprint((io, x) -> @visualize(x, io=io, name="y"), x) ==
14-
"y = \n 2-element Vector{Int64}:\n 2\n 3\n"
5+
x = [2, 3]
6+
@test sprint(visualize, x) ==
7+
"2-element Vector{Int64}:\n 2\n 3\n" ==
8+
sprint((io, x) -> display(TextDisplay(io), x), x)
9+
@test sprint((io, x) -> visualize(io, x; name = "y"), x) ==
10+
"y = \n 2-element Vector{Int64}:\n 2\n 3\n"
11+
@test sprint((io, x) -> @visualize(x, io = io), x) ==
12+
"x = \n 2-element Vector{Int64}:\n 2\n 3\n"
13+
@test sprint((io, x) -> @visualize(x, io = io, name = "y"), x) ==
14+
"y = \n 2-element Vector{Int64}:\n 2\n 3\n"
1515
end

0 commit comments

Comments
 (0)