From b7eeabe2b376fad7ee7399ced3e52fe5b34be893 Mon Sep 17 00:00:00 2001 From: mtfishman Date: Tue, 3 Mar 2026 23:03:57 -0500 Subject: [PATCH] Apply shared_docs_and_tests_workflows patch --- Project.toml | 2 +- docs/Project.toml | 2 ++ docs/make.jl | 3 +- docs/make_index.jl | 21 ------------- docs/make_readme.jl | 17 ---------- test/Project.toml | 2 ++ test/runtests.jl | 76 ++------------------------------------------- 7 files changed, 9 insertions(+), 114 deletions(-) delete mode 100644 docs/make_index.jl delete mode 100644 docs/make_readme.jl diff --git a/Project.toml b/Project.toml index dbbd33d..c302f28 100644 --- a/Project.toml +++ b/Project.toml @@ -1,6 +1,6 @@ name = "DiagonalArrays" uuid = "74fd4be6-21e2-4f6f-823a-4360d37c7a77" -version = "0.3.46" +version = "0.3.47" authors = ["ITensor developers and contributors"] [workspace] diff --git a/docs/Project.toml b/docs/Project.toml index 92141e3..ea09a6f 100644 --- a/docs/Project.toml +++ b/docs/Project.toml @@ -1,6 +1,7 @@ [deps] DiagonalArrays = "74fd4be6-21e2-4f6f-823a-4360d37c7a77" Documenter = "e30172f5-a6a5-5a46-863b-614d45cd2de4" +ITensorFormatter = "b6bf39f1-c9d3-4bad-aad8-593d802f65fd" Literate = "98b081ad-f1c9-55d3-8b20-4c87d4299306" [sources.DiagonalArrays] @@ -9,4 +10,5 @@ path = ".." [compat] DiagonalArrays = "0.3" Documenter = "1" +ITensorFormatter = "0.2.27" Literate = "2" diff --git a/docs/make.jl b/docs/make.jl index 56df60a..6cede1d 100644 --- a/docs/make.jl +++ b/docs/make.jl @@ -1,5 +1,6 @@ using DiagonalArrays: DiagonalArrays using Documenter: Documenter, DocMeta, deploydocs, makedocs +using ITensorFormatter: ITensorFormatter DocMeta.setdocmeta!( DiagonalArrays, @@ -8,7 +9,7 @@ DocMeta.setdocmeta!( recursive = true ) -include("make_index.jl") +ITensorFormatter.make_index!(pkgdir(DiagonalArrays)) makedocs(; modules = [DiagonalArrays], diff --git a/docs/make_index.jl b/docs/make_index.jl deleted file mode 100644 index e22cd1d..0000000 --- a/docs/make_index.jl +++ /dev/null @@ -1,21 +0,0 @@ -using DiagonalArrays: DiagonalArrays -using Literate: Literate - -function ccq_logo(content) - include_ccq_logo = """ - ```@raw html - Flatiron Center for Computational Quantum Physics logo. - Flatiron Center for Computational Quantum Physics logo. - ``` - """ - content = replace(content, "{CCQ_LOGO}" => include_ccq_logo) - return content -end - -Literate.markdown( - joinpath(pkgdir(DiagonalArrays), "examples", "README.jl"), - joinpath(pkgdir(DiagonalArrays), "docs", "src"); - flavor = Literate.DocumenterFlavor(), - name = "index", - postprocess = ccq_logo -) diff --git a/docs/make_readme.jl b/docs/make_readme.jl deleted file mode 100644 index 02eed8b..0000000 --- a/docs/make_readme.jl +++ /dev/null @@ -1,17 +0,0 @@ -using Literate: Literate - -let inputfile = joinpath(@__DIR__, "..", "examples", "README.jl"), - outputdir = joinpath(@__DIR__, ".."), flavor = Literate.CommonMarkFlavor(), - name = "README" - - function postprocess(content) - include_ccq_logo = """ - - - Flatiron Center for Computational Quantum Physics logo. - - """ - return replace(content, "{CCQ_LOGO}" => include_ccq_logo) - end - Literate.markdown(inputfile, outputdir; flavor, name, postprocess) -end diff --git a/test/Project.toml b/test/Project.toml index c5062d3..622f959 100644 --- a/test/Project.toml +++ b/test/Project.toml @@ -4,6 +4,7 @@ Aqua = "4c88cf16-eb10-579e-8560-4a9242c79595" DiagonalArrays = "74fd4be6-21e2-4f6f-823a-4360d37c7a77" FillArrays = "1a297f60-69ca-5386-bcde-b61e274b549b" FunctionImplementations = "7c7cc465-9c6a-495f-bdd1-f42428e86d0c" +ITensorPkgSkeleton = "3d388ab1-018a-49f4-ae50-18094d5f71ea" JLArrays = "27aeb0d3-9eb9-45fb-866b-73c2ecf80fcb" LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e" MatrixAlgebraKit = "6c742aac-3347-4629-af66-fc926824e5e4" @@ -23,6 +24,7 @@ Aqua = "0.8.9" DiagonalArrays = "0.3" FillArrays = "1" FunctionImplementations = "0.4" +ITensorPkgSkeleton = "0.3.42" JLArrays = "0.3" LinearAlgebra = "1" MatrixAlgebraKit = "0.2.5, 0.3, 0.4, 0.5, 0.6" diff --git a/test/runtests.jl b/test/runtests.jl index e5afded..05baac8 100644 --- a/test/runtests.jl +++ b/test/runtests.jl @@ -1,75 +1,3 @@ -using SafeTestsets: @safetestset -using Suppressor: Suppressor +using ITensorPkgSkeleton: ITensorPkgSkeleton -# check for filtered groups -# either via `--group=ALL` or through ENV["GROUP"] -const pat = r"(?:--group=)(\w+)" -arg_id = findfirst(contains(pat), ARGS) -const GROUP = uppercase( - if isnothing(arg_id) - arg = get(ENV, "GROUP", "ALL") - # For some reason `ENV["GROUP"]` is set to `""` - # when running via GitHub Actions, so handle that case: - arg == "" ? "ALL" : arg - else - only(match(pat, ARGS[arg_id]).captures) - end -) - -""" -match files of the form `test_*.jl`, but exclude `*setup*.jl` -""" -function istestfile(path) - fn = basename(path) - return endswith(fn, ".jl") && startswith(basename(fn), "test_") && - !contains(fn, "setup") -end -""" -match files of the form `*.jl`, but exclude `*_notest.jl` and `*setup*.jl` -""" -function isexamplefile(path) - fn = basename(path) - return endswith(fn, ".jl") && !endswith(fn, "_notest.jl") && !contains(fn, "setup") -end - -@time begin - # tests in groups based on folder structure - for testgroup in filter(isdir, readdir(@__DIR__; join = true)) - if GROUP == "ALL" || GROUP == uppercase(basename(testgroup)) - for filename in filter(istestfile, readdir(testgroup; join = true)) - @eval @safetestset $(basename(filename)) begin - include($filename) - end - end - end - end - - # single files in top folder - for file in filter(istestfile, readdir(@__DIR__; join = true)) - (basename(file) == basename(@__FILE__)) && continue # exclude this file to avoid infinite recursion - @eval @safetestset $(basename(file)) begin - include($file) - end - end - - # test examples - examplepath = joinpath(@__DIR__, "..", "examples") - for (root, _, files) in walkdir(examplepath) - contains(chopprefix(root, @__DIR__), "setup") && continue - for file in filter(isexamplefile, files) - filename = joinpath(root, file) - @eval begin - @safetestset $file begin - $( - Expr( - :macrocall, - GlobalRef(Suppressor, Symbol("@suppress")), - LineNumberNode(@__LINE__, @__FILE__), - :(include($filename)) - ) - ) - end - end - end - end -end +ITensorPkgSkeleton.runtests(; testdir = @__DIR__)