From b24944a8d73ee5db4bfb1bcae9d0d1481ec68099 Mon Sep 17 00:00:00 2001 From: Morten Piibeleht Date: Sat, 8 Oct 2022 20:06:01 +1300 Subject: [PATCH 01/25] Use Documenter#master --- doc/Manifest.toml | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/doc/Manifest.toml b/doc/Manifest.toml index cf50a1d41ddbd..5cf8b2eeed66e 100644 --- a/doc/Manifest.toml +++ b/doc/Manifest.toml @@ -9,6 +9,11 @@ git-tree-sha1 = "574baf8110975760d391c710b6341da1afa48d8c" uuid = "a4c015fc-c6ff-483c-b24f-f7ea428134e9" version = "0.0.1" +[[deps.AbstractTrees]] +git-tree-sha1 = "5c0b629df8a5566a06f5fef5100b53ea56e465a0" +uuid = "1520ce14-60c1-5f80-bbc7-55ef81b5835c" +version = "0.4.2" + [[deps.Base64]] uuid = "2a0f44e3-6c83-55bd-87e4-b1978d98bd5f" @@ -23,10 +28,12 @@ uuid = "ffbed154-4ef7-542d-bbb7-c09d3a79fcae" version = "0.9.1" [[deps.Documenter]] -deps = ["ANSIColoredPrinters", "Base64", "Dates", "DocStringExtensions", "IOCapture", "InteractiveUtils", "JSON", "LibGit2", "Logging", "Markdown", "REPL", "Test", "Unicode"] -git-tree-sha1 = "6030186b00a38e9d0434518627426570aac2ef95" +deps = ["ANSIColoredPrinters", "AbstractTrees", "Base64", "Dates", "DocStringExtensions", "IOCapture", "InteractiveUtils", "JSON", "LibGit2", "Logging", "Markdown", "MarkdownAST", "REPL", "Test", "Unicode"] +git-tree-sha1 = "540cb30edf31561e99df05a502c1922107d50ae1" +repo-rev = "master" +repo-url = "https://github.com/JuliaDocs/Documenter.jl.git" uuid = "e30172f5-a6a5-5a46-863b-614d45cd2de4" -version = "0.27.23" +version = "0.28.0-DEV" [[deps.IOCapture]] deps = ["Logging", "Random"] @@ -55,6 +62,12 @@ uuid = "56ddb016-857b-54e1-b83d-db4d58db5568" deps = ["Base64"] uuid = "d6f4376e-aef5-505a-96c1-9c027394607a" +[[deps.MarkdownAST]] +deps = ["AbstractTrees", "Markdown"] +git-tree-sha1 = "1dfa364acc47225afdc57c8998c988bc107ff0d2" +uuid = "d0879d2d-cac2-40c8-9cee-1863dc0c7391" +version = "0.1.0" + [[deps.Mmap]] uuid = "a63ad114-7e13-5084-954f-fe012c677804" From d64539ff14b75f94ecca22e0988b1b1cbd8d8b4b Mon Sep 17 00:00:00 2001 From: Morten Piibeleht Date: Sat, 8 Oct 2022 20:12:26 +1300 Subject: [PATCH 02/25] use mp/fix-source-url branch --- doc/Manifest.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/Manifest.toml b/doc/Manifest.toml index 5cf8b2eeed66e..ad6851bdd37eb 100644 --- a/doc/Manifest.toml +++ b/doc/Manifest.toml @@ -29,8 +29,8 @@ version = "0.9.1" [[deps.Documenter]] deps = ["ANSIColoredPrinters", "AbstractTrees", "Base64", "Dates", "DocStringExtensions", "IOCapture", "InteractiveUtils", "JSON", "LibGit2", "Logging", "Markdown", "MarkdownAST", "REPL", "Test", "Unicode"] -git-tree-sha1 = "540cb30edf31561e99df05a502c1922107d50ae1" -repo-rev = "master" +git-tree-sha1 = "24533a5543423c7399a33caaa16f11a3b8643be6" +repo-rev = "mp/fix-source-url" repo-url = "https://github.com/JuliaDocs/Documenter.jl.git" uuid = "e30172f5-a6a5-5a46-863b-614d45cd2de4" version = "0.28.0-DEV" From 44d2b51e9a0d5a837538a31843106ae1dfd60329 Mon Sep 17 00:00:00 2001 From: Morten Piibeleht Date: Sun, 9 Oct 2022 18:31:03 +1300 Subject: [PATCH 03/25] use Documenter#master again --- doc/Manifest.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/Manifest.toml b/doc/Manifest.toml index ad6851bdd37eb..21d19537fa838 100644 --- a/doc/Manifest.toml +++ b/doc/Manifest.toml @@ -29,8 +29,8 @@ version = "0.9.1" [[deps.Documenter]] deps = ["ANSIColoredPrinters", "AbstractTrees", "Base64", "Dates", "DocStringExtensions", "IOCapture", "InteractiveUtils", "JSON", "LibGit2", "Logging", "Markdown", "MarkdownAST", "REPL", "Test", "Unicode"] -git-tree-sha1 = "24533a5543423c7399a33caaa16f11a3b8643be6" -repo-rev = "mp/fix-source-url" +git-tree-sha1 = "32cfcaf350301148a947a94deacd823c93990653" +repo-rev = "master" repo-url = "https://github.com/JuliaDocs/Documenter.jl.git" uuid = "e30172f5-a6a5-5a46-863b-614d45cd2de4" version = "0.28.0-DEV" From 260b5430aa28bba88061b193056b3f7976e7e979 Mon Sep 17 00:00:00 2001 From: Morten Piibeleht Date: Tue, 3 Jan 2023 00:51:31 +0200 Subject: [PATCH 04/25] wip: documenter 0.28 fix stdlib source links --- doc/Manifest.toml | 19 +++++++++++++++---- doc/make.jl | 38 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 53 insertions(+), 4 deletions(-) diff --git a/doc/Manifest.toml b/doc/Manifest.toml index cf50a1d41ddbd..1bcd5b98e6bdf 100644 --- a/doc/Manifest.toml +++ b/doc/Manifest.toml @@ -1,6 +1,6 @@ # This file is machine-generated - editing it directly is not advised -julia_version = "1.9.0-DEV" +julia_version = "1.8.4" manifest_format = "2.0" project_hash = "e0c77beb18dc1f6cce661ebd60658c0c1a77390f" @@ -9,6 +9,11 @@ git-tree-sha1 = "574baf8110975760d391c710b6341da1afa48d8c" uuid = "a4c015fc-c6ff-483c-b24f-f7ea428134e9" version = "0.0.1" +[[deps.AbstractTrees]] +git-tree-sha1 = "52b3b436f8f73133d7bc3a6c71ee7ed6ab2ab754" +uuid = "1520ce14-60c1-5f80-bbc7-55ef81b5835c" +version = "0.4.3" + [[deps.Base64]] uuid = "2a0f44e3-6c83-55bd-87e4-b1978d98bd5f" @@ -23,10 +28,10 @@ uuid = "ffbed154-4ef7-542d-bbb7-c09d3a79fcae" version = "0.9.1" [[deps.Documenter]] -deps = ["ANSIColoredPrinters", "Base64", "Dates", "DocStringExtensions", "IOCapture", "InteractiveUtils", "JSON", "LibGit2", "Logging", "Markdown", "REPL", "Test", "Unicode"] -git-tree-sha1 = "6030186b00a38e9d0434518627426570aac2ef95" +deps = ["ANSIColoredPrinters", "AbstractTrees", "Base64", "Dates", "DocStringExtensions", "IOCapture", "InteractiveUtils", "JSON", "LibGit2", "Logging", "Markdown", "MarkdownAST", "REPL", "Test", "Unicode"] +path = "../../Documenter" uuid = "e30172f5-a6a5-5a46-863b-614d45cd2de4" -version = "0.27.23" +version = "0.28.0-DEV" [[deps.IOCapture]] deps = ["Logging", "Random"] @@ -55,6 +60,12 @@ uuid = "56ddb016-857b-54e1-b83d-db4d58db5568" deps = ["Base64"] uuid = "d6f4376e-aef5-505a-96c1-9c027394607a" +[[deps.MarkdownAST]] +deps = ["AbstractTrees", "Markdown"] +git-tree-sha1 = "1dfa364acc47225afdc57c8998c988bc107ff0d2" +uuid = "d0879d2d-cac2-40c8-9cee-1863dc0c7391" +version = "0.1.0" + [[deps.Mmap]] uuid = "a63ad114-7e13-5084-954f-fe012c677804" diff --git a/doc/make.jl b/doc/make.jl index 04b8af595e58f..f0be4c50d9003 100644 --- a/doc/make.jl +++ b/doc/make.jl @@ -8,6 +8,7 @@ using Pkg Pkg.instantiate() using Documenter +import LibGit2 baremodule GenStdLib end @@ -42,6 +43,42 @@ cd(joinpath(@__DIR__, "src")) do end end +function parse_stdlib_version_file(path) + values = Dict{String,String}() + for line in readlines(path) + m = match(r"^([A-Z0-9_]+)\s+:?=\s+(\S+)\s?$", line) + if isnothing(m) + @warn "Unable to parse line in $(path)" line + else + values[m[1]] = m[2] + end + end + return values +end +documenter_stdlib_remotes = let stdlib_dir = realpath(joinpath(@__DIR__, "..", "stdlib")) + version_files = filter(readdir(stdlib_dir)) do fname + endswith(fname, ".version") && isfile(joinpath(stdlib_dir, fname)) + end + map(version_files) do version_fname + package = match(r"(.+)\.version", version_fname)[1] + versionfile = parse_stdlib_version_file(joinpath(stdlib_dir, version_fname)) + remote = let git_url_key = "$(uppercase(package))_GIT_URL" + haskey(versionfile, git_url_key) || error("Missing $(git_url_key) in $version_fname") + m = match(LibGit2.GITHUB_REGEX, versionfile[git_url_key]) + isnothing(m) && error("Unable to parse $(git_url_key)='$(versionfile[git_url_key])' in $version_fname") + Documenter.Remotes.GitHub(m[2], m[3]) + end + package_sha = let sha_key = "$(uppercase(package))_SHA1" + haskey(versionfile, sha_key) || error("Missing $(sha_key) in $version_fname") + versionfile[sha_key] + end + package_root_dir = joinpath(stdlib_dir, "$(package)-$(package_sha)") + isdir(package_root_dir) || error("Missing stdlib: $(package_root_dir)") + package_root_dir => (remote, package_sha) + end +end +@show documenter_stdlib_remotes + # Check if we are building a PDF const render_pdf = "pdf" in ARGS @@ -308,6 +345,7 @@ makedocs( sitename = "The Julia Language", authors = "The Julia Project", pages = PAGES, + remotes = documenter_stdlib_remotes, ) # Update URLs to external stdlibs (JuliaLang/julia#43199) From 3a4bbc05a56c753041db3a88997f480a6cce8df2 Mon Sep 17 00:00:00 2001 From: Morten Piibeleht Date: Tue, 27 Jun 2023 19:52:52 +1200 Subject: [PATCH 05/25] fix --- doc/make.jl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/make.jl b/doc/make.jl index 67338aa3aacec..c8b66c580f51e 100644 --- a/doc/make.jl +++ b/doc/make.jl @@ -75,7 +75,7 @@ documenter_stdlib_remotes = let stdlib_dir = realpath(joinpath(@__DIR__, "..", " package_root_dir = joinpath(stdlib_dir, "$(package)-$(package_sha)") isdir(package_root_dir) || error("Missing stdlib: $(package_root_dir)") package_root_dir => (remote, package_sha) - end + end |> Dict end @show documenter_stdlib_remotes From 6adff0fede17701a8e55ba511adab35677b7dfeb Mon Sep 17 00:00:00 2001 From: Morten Piibeleht Date: Wed, 28 Jun 2023 15:41:44 +1200 Subject: [PATCH 06/25] Clean up doc/make.jl --- doc/make.jl | 28 ++++++++++++++++++++++++---- 1 file changed, 24 insertions(+), 4 deletions(-) diff --git a/doc/make.jl b/doc/make.jl index c8b66c580f51e..4b683a239450b 100644 --- a/doc/make.jl +++ b/doc/make.jl @@ -43,6 +43,14 @@ cd(joinpath(@__DIR__, "src")) do end end +# Because we have standard libraries that are hosted outside of the julia repo, +# but their docs are included in the manual, we need to populate the remotes argument +# of makedocs(), to make sure that Documenter knows how to resolve the directories +# in stdlib/ to the correct remote Git repositories (for source and edit links). +# +# This function parses the *.version files in stdlib/, returning a dictionary with +# all the key-value pairs from those files. *_GIT_URL and *_SHA1 fields are the ones +# we will actually be interested in. function parse_stdlib_version_file(path) values = Dict{String,String}() for line in readlines(path) @@ -55,13 +63,24 @@ function parse_stdlib_version_file(path) end return values end +# This generates the value that will be passed to the `remotes` argument of makedocs(), +# by looking through all *.version files in stdlib/. documenter_stdlib_remotes = let stdlib_dir = realpath(joinpath(@__DIR__, "..", "stdlib")) + # Get a list of all *.version files in stdlib/.. version_files = filter(readdir(stdlib_dir)) do fname - endswith(fname, ".version") && isfile(joinpath(stdlib_dir, fname)) + isfile(joinpath(stdlib_dir, fname)) && endswith(fname, ".version") end - map(version_files) do version_fname + # .. and then parse them, each becoming an entry for makedocs's remotes. + # The values for each are of the form path => (remote, sha1), where + # - path: the path to the stdlib package's root directory, i.e. "stdlib/$PACKAGE" + # - remote: a Documenter.Remote object, pointing to the Git repository where package is hosted + # - sha1: the SHA1 of the commit that is included with the current Julia version + remotes_list = map(version_files) do version_fname package = match(r"(.+)\.version", version_fname)[1] versionfile = parse_stdlib_version_file(joinpath(stdlib_dir, version_fname)) + # From the (all uppercase) $(package)_GIT_URL and $(package)_SHA1 fields, we'll determine + # the necessary information. If this logic happens to fail for some reason for any of the + # standard libraries, we'll crash the documentation build, so that it could be fixed. remote = let git_url_key = "$(uppercase(package))_GIT_URL" haskey(versionfile, git_url_key) || error("Missing $(git_url_key) in $version_fname") m = match(LibGit2.GITHUB_REGEX, versionfile[git_url_key]) @@ -72,12 +91,13 @@ documenter_stdlib_remotes = let stdlib_dir = realpath(joinpath(@__DIR__, "..", " haskey(versionfile, sha_key) || error("Missing $(sha_key) in $version_fname") versionfile[sha_key] end + # Construct the absolute (local) path to the stdlib package's root directory package_root_dir = joinpath(stdlib_dir, "$(package)-$(package_sha)") isdir(package_root_dir) || error("Missing stdlib: $(package_root_dir)") package_root_dir => (remote, package_sha) - end |> Dict + end + Dict(remotes_list) end -@show documenter_stdlib_remotes # Check if we are building a PDF const render_pdf = "pdf" in ARGS From 8b92c6621d34dac853e62100c0567054c08747ac Mon Sep 17 00:00:00 2001 From: Morten Piibeleht Date: Fri, 15 Sep 2023 14:29:11 +1200 Subject: [PATCH 07/25] update Documenter --- doc/Manifest.toml | 140 ++++++++++++++++++++++++++++++++++++++++------ doc/make.jl | 2 +- 2 files changed, 123 insertions(+), 19 deletions(-) diff --git a/doc/Manifest.toml b/doc/Manifest.toml index 21d19537fa838..6bbe6f43de4bc 100644 --- a/doc/Manifest.toml +++ b/doc/Manifest.toml @@ -1,6 +1,6 @@ # This file is machine-generated - editing it directly is not advised -julia_version = "1.9.0-DEV" +julia_version = "1.11.0-DEV" manifest_format = "2.0" project_hash = "e0c77beb18dc1f6cce661ebd60658c0c1a77390f" @@ -10,9 +10,16 @@ uuid = "a4c015fc-c6ff-483c-b24f-f7ea428134e9" version = "0.0.1" [[deps.AbstractTrees]] -git-tree-sha1 = "5c0b629df8a5566a06f5fef5100b53ea56e465a0" +git-tree-sha1 = "faa260e4cb5aba097a73fab382dd4b5819d8ec8c" uuid = "1520ce14-60c1-5f80-bbc7-55ef81b5835c" -version = "0.4.2" +version = "0.4.4" + +[[deps.ArgTools]] +uuid = "0dad84c5-d112-42e6-8d28-ef12dabb789f" +version = "1.1.1" + +[[deps.Artifacts]] +uuid = "56f22d72-fd6d-98f1-02f0-08ddc0907c33" [[deps.Base64]] uuid = "2a0f44e3-6c83-55bd-87e4-b1978d98bd5f" @@ -23,23 +30,31 @@ uuid = "ade2ca70-3891-5945-98fb-dc099432e06a" [[deps.DocStringExtensions]] deps = ["LibGit2"] -git-tree-sha1 = "5158c2b41018c5f7eb1470d558127ac274eca0c9" +git-tree-sha1 = "2fb1e02f2b635d0845df5d7c167fec4dd739b00d" uuid = "ffbed154-4ef7-542d-bbb7-c09d3a79fcae" -version = "0.9.1" +version = "0.9.3" [[deps.Documenter]] -deps = ["ANSIColoredPrinters", "AbstractTrees", "Base64", "Dates", "DocStringExtensions", "IOCapture", "InteractiveUtils", "JSON", "LibGit2", "Logging", "Markdown", "MarkdownAST", "REPL", "Test", "Unicode"] -git-tree-sha1 = "32cfcaf350301148a947a94deacd823c93990653" +deps = ["ANSIColoredPrinters", "AbstractTrees", "Base64", "Dates", "DocStringExtensions", "Downloads", "IOCapture", "InteractiveUtils", "JSON", "LibGit2", "Logging", "Markdown", "MarkdownAST", "Pkg", "PrecompileTools", "REPL", "RegistryInstances", "SHA", "Test", "Unicode"] +git-tree-sha1 = "38a020a88f467625fcdccd7f6221cf91ef8163ea" repo-rev = "master" repo-url = "https://github.com/JuliaDocs/Documenter.jl.git" uuid = "e30172f5-a6a5-5a46-863b-614d45cd2de4" version = "0.28.0-DEV" +[[deps.Downloads]] +deps = ["ArgTools", "FileWatching", "LibCURL", "NetworkOptions"] +uuid = "f43a241f-c20a-4ad4-852c-f6b1247861c6" +version = "1.6.0" + +[[deps.FileWatching]] +uuid = "7b1f6079-737a-58dc-b8bc-7a2ca5c1b5ee" + [[deps.IOCapture]] deps = ["Logging", "Random"] -git-tree-sha1 = "f7be53659ab06ddc986428d3a9dcc95f6fa6705a" +git-tree-sha1 = "d75853a0bdbfb1ac815478bacd89cd27b550ace6" uuid = "b5f81e59-6552-4d32-b1f0-c071b021bf89" -version = "0.2.2" +version = "0.2.3" [[deps.InteractiveUtils]] deps = ["Markdown"] @@ -47,14 +62,42 @@ uuid = "b77e0a4c-d291-57a0-90e8-8db25a27a240" [[deps.JSON]] deps = ["Dates", "Mmap", "Parsers", "Unicode"] -git-tree-sha1 = "3c837543ddb02250ef42f4738347454f95079d4e" +git-tree-sha1 = "31e996f0a15c7b280ba9f76636b3ff9e2ae58c9a" uuid = "682c06a0-de6a-54ab-a142-c8b1cf79cde6" -version = "0.21.3" +version = "0.21.4" + +[[deps.LazilyInitializedFields]] +git-tree-sha1 = "410fe4739a4b092f2ffe36fcb0dcc3ab12648ce1" +uuid = "0e77f7df-68c5-4e49-93ce-4cd80f5598bf" +version = "1.2.1" + +[[deps.LibCURL]] +deps = ["LibCURL_jll", "MozillaCACerts_jll"] +uuid = "b27032c2-a3e7-50c8-80cd-2d36dbcbfd21" +version = "0.6.4" + +[[deps.LibCURL_jll]] +deps = ["Artifacts", "LibSSH2_jll", "Libdl", "MbedTLS_jll", "Zlib_jll", "nghttp2_jll"] +uuid = "deac9b47-8bc7-5906-a0fe-35ac56dc84c0" +version = "8.0.1+1" [[deps.LibGit2]] -deps = ["Base64", "NetworkOptions", "Printf", "SHA"] +deps = ["Base64", "LibGit2_jll", "NetworkOptions", "Printf", "SHA"] uuid = "76f85450-5226-5b5a-8eaa-529ad045b433" +[[deps.LibGit2_jll]] +deps = ["Artifacts", "LibSSH2_jll", "Libdl", "MbedTLS_jll"] +uuid = "e37daf67-58a4-590a-8e99-b0245dd2ffc5" +version = "1.6.4+0" + +[[deps.LibSSH2_jll]] +deps = ["Artifacts", "Libdl", "MbedTLS_jll"] +uuid = "29816b5a-b9ab-546f-933c-edad1886dfa8" +version = "1.11.0+1" + +[[deps.Libdl]] +uuid = "8f399da3-3557-5675-b5ff-fb832c97cbdb" + [[deps.Logging]] uuid = "56ddb016-857b-54e1-b83d-db4d58db5568" @@ -64,22 +107,48 @@ uuid = "d6f4376e-aef5-505a-96c1-9c027394607a" [[deps.MarkdownAST]] deps = ["AbstractTrees", "Markdown"] -git-tree-sha1 = "1dfa364acc47225afdc57c8998c988bc107ff0d2" +git-tree-sha1 = "e8513266815200c0c8f522d6d44ffb5e9b366ae4" uuid = "d0879d2d-cac2-40c8-9cee-1863dc0c7391" -version = "0.1.0" +version = "0.1.1" + +[[deps.MbedTLS_jll]] +deps = ["Artifacts", "Libdl"] +uuid = "c8ffd9c3-330d-5841-b78e-0817d7145fa1" +version = "2.28.2+1" [[deps.Mmap]] uuid = "a63ad114-7e13-5084-954f-fe012c677804" +[[deps.MozillaCACerts_jll]] +uuid = "14a3606d-f60d-562e-9121-12d972cd8159" +version = "2023.1.10" + [[deps.NetworkOptions]] uuid = "ca575930-c2e3-43a9-ace4-1e988b2c1908" version = "1.2.0" [[deps.Parsers]] -deps = ["Dates"] -git-tree-sha1 = "3d5bf43e3e8b412656404ed9466f1dcbf7c50269" +deps = ["Dates", "PrecompileTools", "UUIDs"] +git-tree-sha1 = "716e24b21538abc91f6205fd1d8363f39b442851" uuid = "69de0a69-1ddd-5017-9359-2bf0b02dc9f0" -version = "2.4.0" +version = "2.7.2" + +[[deps.Pkg]] +deps = ["Artifacts", "Dates", "Downloads", "FileWatching", "LibGit2", "Libdl", "Logging", "Markdown", "Printf", "REPL", "Random", "SHA", "Serialization", "TOML", "Tar", "UUIDs", "p7zip_jll"] +uuid = "44cfe95a-1eb2-52ea-b672-e2afdf69b78f" +version = "1.11.0" + +[[deps.PrecompileTools]] +deps = ["Preferences"] +git-tree-sha1 = "03b4c25b43cb84cee5c90aa9b5ea0a78fd848d2f" +uuid = "aea7be01-6a6a-4083-8856-8a6e6704d82a" +version = "1.2.0" + +[[deps.Preferences]] +deps = ["TOML"] +git-tree-sha1 = "7eb1686b4f04b82f96ed7a4ea5890a4f0c7a09f1" +uuid = "21216c6a-2e73-6563-6e65-726566657250" +version = "1.4.0" [[deps.Printf]] deps = ["Unicode"] @@ -90,9 +159,15 @@ deps = ["InteractiveUtils", "Markdown", "Sockets", "Unicode"] uuid = "3fa0cd96-eef1-5676-8a61-b3b8758bbffb" [[deps.Random]] -deps = ["SHA", "Serialization"] +deps = ["SHA"] uuid = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c" +[[deps.RegistryInstances]] +deps = ["LazilyInitializedFields", "Pkg", "TOML", "Tar"] +git-tree-sha1 = "ffd19052caf598b8653b99404058fce14828be51" +uuid = "2792f1a3-b283-48e8-9a74-f99dce5104f3" +version = "0.1.0" + [[deps.SHA]] uuid = "ea8e919c-243c-51af-8825-aaa63cd721ce" version = "0.7.0" @@ -103,9 +178,38 @@ uuid = "9e88b42a-f829-5b0c-bbe9-9e923198166b" [[deps.Sockets]] uuid = "6462fe0b-24de-5631-8697-dd941f90decc" +[[deps.TOML]] +deps = ["Dates"] +uuid = "fa267f1f-6049-4f14-aa54-33bafae1ed76" +version = "1.0.3" + +[[deps.Tar]] +deps = ["ArgTools", "SHA"] +uuid = "a4e569a6-e804-4fa4-b0f3-eef7a1d5b13e" +version = "1.10.0" + [[deps.Test]] deps = ["InteractiveUtils", "Logging", "Random", "Serialization"] uuid = "8dfed614-e22c-5e08-85e1-65c5234f0b40" +[[deps.UUIDs]] +deps = ["Random", "SHA"] +uuid = "cf7118a7-6976-5b1a-9a39-7adc72f591a4" + [[deps.Unicode]] uuid = "4ec0a83e-493e-50e2-b9ac-8f72acf5a8f5" + +[[deps.Zlib_jll]] +deps = ["Libdl"] +uuid = "83775a58-1f1d-513f-b197-d71354ab007a" +version = "1.2.13+1" + +[[deps.nghttp2_jll]] +deps = ["Artifacts", "Libdl"] +uuid = "8e850ede-7688-5339-a07c-302acd2aaf8d" +version = "1.52.0+1" + +[[deps.p7zip_jll]] +deps = ["Artifacts", "Libdl"] +uuid = "3f19e933-33d8-53b3-aaab-bd5110c3b7a0" +version = "17.4.0+2" diff --git a/doc/make.jl b/doc/make.jl index 087b033fcf79c..c1bf5c4e8f9e1 100644 --- a/doc/make.jl +++ b/doc/make.jl @@ -289,6 +289,7 @@ else collapselevel = 1, sidebar_sitename = false, ansicolor = true, + size_threshold = 800 * 2^10, # 800 KiB ) end @@ -300,7 +301,6 @@ makedocs( doctest = ("doctest=fix" in ARGS) ? (:fix) : ("doctest=only" in ARGS) ? (:only) : ("doctest=true" in ARGS) ? true : false, linkcheck = "linkcheck=true" in ARGS, linkcheck_ignore = ["https://bugs.kde.org/show_bug.cgi?id=136779"], # fails to load from nanosoldier? - strict = true, checkdocs = :none, format = format, sitename = "The Julia Language", From d26fa712e1bb14361b3c638979b35a7d231a7f51 Mon Sep 17 00:00:00 2001 From: Morten Piibeleht Date: Fri, 15 Sep 2023 14:30:58 +1200 Subject: [PATCH 08/25] doc: correct unicode-input table generation --- doc/src/manual/unicode-input.md | 24 +++++++++++++++++------- 1 file changed, 17 insertions(+), 7 deletions(-) diff --git a/doc/src/manual/unicode-input.md b/doc/src/manual/unicode-input.md index 7539e75bb4f24..db1bd69c2e480 100644 --- a/doc/src/manual/unicode-input.md +++ b/doc/src/manual/unicode-input.md @@ -52,11 +52,12 @@ function fix_combining_chars(char) return cat == 6 || cat == 8 ? "$NBSP$char$NBSP" : "$char" end - function table_entries(completions, unicode_dict) - entries = [[ - "Code point(s)", "Character(s)", - "Tab completion sequence(s)", "Unicode name(s)" + entries = Any[Any[ + ["Code point(s)"], + ["Character(s)"], + ["Tab completion sequence(s)"], + ["Unicode name(s)"], ]] for (chars, inputs) in sort!(collect(completions), by = first) code_points, unicode_names, characters = String[], String[], String[] @@ -65,12 +66,21 @@ function table_entries(completions, unicode_dict) push!(unicode_names, get(unicode_dict, UInt32(char), "(No Unicode name)")) push!(characters, isempty(characters) ? fix_combining_chars(char) : "$char") end + inputs_md = [] + for (i, input) in enumerate(inputs) + i > 1 && push!(inputs_md, ", ") + push!(inputs_md, Markdown.Code("", input)) + end push!(entries, [ - join(code_points, " + "), join(characters), - join(inputs, ", "), join(unicode_names, " + ") + [join(code_points, " + ")], + [join(characters)], + inputs_md, + [join(unicode_names, " + ")], ]) end - return Markdown.Table(entries, [:l, :l, :l, :l]) + table = Markdown.Table(entries, [:l, :c, :l, :l]) + # We also need to wrap the Table in a Markdown.MD "document" + return Markdown.MD([table]) end table_entries( From 3cfa052e17437e63dc79f7358eae5602bb4f64f3 Mon Sep 17 00:00:00 2001 From: Morten Piibeleht Date: Fri, 15 Sep 2023 23:37:23 +1200 Subject: [PATCH 09/25] size threshold --- doc/make.jl | 1 + 1 file changed, 1 insertion(+) diff --git a/doc/make.jl b/doc/make.jl index c1bf5c4e8f9e1..1f1f2cdd8fdc3 100644 --- a/doc/make.jl +++ b/doc/make.jl @@ -290,6 +290,7 @@ else sidebar_sitename = false, ansicolor = true, size_threshold = 800 * 2^10, # 800 KiB + size_threshold_warn = 200 * 2^10, # the manual has quite a few large pages, so we warn at 200+ KiB only ) end From 1b1e3c0197ceedbcbe5ec7d73c5a192f7c8600f7 Mon Sep 17 00:00:00 2001 From: Morten Piibeleht Date: Fri, 15 Sep 2023 23:40:28 +1200 Subject: [PATCH 10/25] use Documenter 1.0.0 --- doc/Manifest.toml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/doc/Manifest.toml b/doc/Manifest.toml index 6bbe6f43de4bc..404245661a9ae 100644 --- a/doc/Manifest.toml +++ b/doc/Manifest.toml @@ -36,11 +36,9 @@ version = "0.9.3" [[deps.Documenter]] deps = ["ANSIColoredPrinters", "AbstractTrees", "Base64", "Dates", "DocStringExtensions", "Downloads", "IOCapture", "InteractiveUtils", "JSON", "LibGit2", "Logging", "Markdown", "MarkdownAST", "Pkg", "PrecompileTools", "REPL", "RegistryInstances", "SHA", "Test", "Unicode"] -git-tree-sha1 = "38a020a88f467625fcdccd7f6221cf91ef8163ea" -repo-rev = "master" -repo-url = "https://github.com/JuliaDocs/Documenter.jl.git" +git-tree-sha1 = "43a76dfac223a3a0d7d33443f7c9154fe75bb264" uuid = "e30172f5-a6a5-5a46-863b-614d45cd2de4" -version = "0.28.0-DEV" +version = "1.0.0" [[deps.Downloads]] deps = ["ArgTools", "FileWatching", "LibCURL", "NetworkOptions"] From 64cb40f693f48bd15d93f2f57d9bf63c86002a8c Mon Sep 17 00:00:00 2001 From: Morten Piibeleht Date: Tue, 19 Sep 2023 10:12:58 +1200 Subject: [PATCH 11/25] Revert #48814 as it's no longer necessary --- stdlib/Dates/docs/src/index.md | 4 ---- 1 file changed, 4 deletions(-) diff --git a/stdlib/Dates/docs/src/index.md b/stdlib/Dates/docs/src/index.md index aa46f7b827f10..e0e09a919a085 100644 --- a/stdlib/Dates/docs/src/index.md +++ b/stdlib/Dates/docs/src/index.md @@ -1,7 +1,3 @@ -```@meta -EditURL = "https://github.com/JuliaLang/julia/blob/master/stdlib/Dates/docs/src/index.md" -``` - # Dates ```@meta From 816b5b56cd17b8a6774fe691ea626003ef628367 Mon Sep 17 00:00:00 2001 From: Morten Piibeleht Date: Sun, 12 Nov 2023 19:00:15 +1300 Subject: [PATCH 12/25] update Documenter --- doc/Manifest.toml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/doc/Manifest.toml b/doc/Manifest.toml index 404245661a9ae..c69e1d9e44503 100644 --- a/doc/Manifest.toml +++ b/doc/Manifest.toml @@ -36,9 +36,9 @@ version = "0.9.3" [[deps.Documenter]] deps = ["ANSIColoredPrinters", "AbstractTrees", "Base64", "Dates", "DocStringExtensions", "Downloads", "IOCapture", "InteractiveUtils", "JSON", "LibGit2", "Logging", "Markdown", "MarkdownAST", "Pkg", "PrecompileTools", "REPL", "RegistryInstances", "SHA", "Test", "Unicode"] -git-tree-sha1 = "43a76dfac223a3a0d7d33443f7c9154fe75bb264" +git-tree-sha1 = "662fb21ae7fad33e044c2b59ece832fdce32c171" uuid = "e30172f5-a6a5-5a46-863b-614d45cd2de4" -version = "1.0.0" +version = "1.1.2" [[deps.Downloads]] deps = ["ArgTools", "FileWatching", "LibCURL", "NetworkOptions"] @@ -86,7 +86,7 @@ uuid = "76f85450-5226-5b5a-8eaa-529ad045b433" [[deps.LibGit2_jll]] deps = ["Artifacts", "LibSSH2_jll", "Libdl", "MbedTLS_jll"] uuid = "e37daf67-58a4-590a-8e99-b0245dd2ffc5" -version = "1.6.4+0" +version = "1.7.1+0" [[deps.LibSSH2_jll]] deps = ["Artifacts", "Libdl", "MbedTLS_jll"] @@ -105,9 +105,9 @@ uuid = "d6f4376e-aef5-505a-96c1-9c027394607a" [[deps.MarkdownAST]] deps = ["AbstractTrees", "Markdown"] -git-tree-sha1 = "e8513266815200c0c8f522d6d44ffb5e9b366ae4" +git-tree-sha1 = "465a70f0fc7d443a00dcdc3267a497397b8a3899" uuid = "d0879d2d-cac2-40c8-9cee-1863dc0c7391" -version = "0.1.1" +version = "0.1.2" [[deps.MbedTLS_jll]] deps = ["Artifacts", "Libdl"] @@ -127,9 +127,9 @@ version = "1.2.0" [[deps.Parsers]] deps = ["Dates", "PrecompileTools", "UUIDs"] -git-tree-sha1 = "716e24b21538abc91f6205fd1d8363f39b442851" +git-tree-sha1 = "a935806434c9d4c506ba941871b327b96d41f2bf" uuid = "69de0a69-1ddd-5017-9359-2bf0b02dc9f0" -version = "2.7.2" +version = "2.8.0" [[deps.Pkg]] deps = ["Artifacts", "Dates", "Downloads", "FileWatching", "LibGit2", "Libdl", "Logging", "Markdown", "Printf", "REPL", "Random", "SHA", "Serialization", "TOML", "Tar", "UUIDs", "p7zip_jll"] @@ -144,9 +144,9 @@ version = "1.2.0" [[deps.Preferences]] deps = ["TOML"] -git-tree-sha1 = "7eb1686b4f04b82f96ed7a4ea5890a4f0c7a09f1" +git-tree-sha1 = "00805cd429dcb4870060ff49ef443486c262e38e" uuid = "21216c6a-2e73-6563-6e65-726566657250" -version = "1.4.0" +version = "1.4.1" [[deps.Printf]] deps = ["Unicode"] From c407135d71e91cf11efa46b1037f486e177b4075 Mon Sep 17 00:00:00 2001 From: Morten Piibeleht Date: Sun, 12 Nov 2023 20:21:33 +1300 Subject: [PATCH 13/25] fix :fingers_crossed: --- doc/make.jl | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/doc/make.jl b/doc/make.jl index 8df6b947fe207..481076af3bf5b 100644 --- a/doc/make.jl +++ b/doc/make.jl @@ -93,7 +93,13 @@ documenter_stdlib_remotes = let stdlib_dir = realpath(joinpath(@__DIR__, "..", " end # Construct the absolute (local) path to the stdlib package's root directory package_root_dir = joinpath(stdlib_dir, "$(package)-$(package_sha)") - isdir(package_root_dir) || error("Missing stdlib: $(package_root_dir)") + # Documenter needs package_root_dir to exist --- it's just a sanity check it does on the remotes= keyword. + # In normal (local) builds, this will be the case, since the Makefiles will have unpacked the standard + # libraries. However, on CI we do this thing where we actually build docs in a clean worktree, just + # unpacking the `usr/` directory from the main build, and the unpacked stdlibs will be missing, and this + # will cause Documenter to throw an error. However, we don't _actually_ need the source files of the standard + # libraries to be present, so we just generate empty root directories to satisfy the check in Documenter. + isdir(package_root_dir) || mkpath(package_root_dir) package_root_dir => (remote, package_sha) end Dict(remotes_list) From a78d2dde51820668c014eba93898b6a8c1aa444a Mon Sep 17 00:00:00 2001 From: Morten Piibeleht Date: Mon, 13 Nov 2023 11:33:24 +1300 Subject: [PATCH 14/25] revertme: test prints --- doc/Manifest.toml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/doc/Manifest.toml b/doc/Manifest.toml index c69e1d9e44503..e680133eef326 100644 --- a/doc/Manifest.toml +++ b/doc/Manifest.toml @@ -36,7 +36,9 @@ version = "0.9.3" [[deps.Documenter]] deps = ["ANSIColoredPrinters", "AbstractTrees", "Base64", "Dates", "DocStringExtensions", "Downloads", "IOCapture", "InteractiveUtils", "JSON", "LibGit2", "Logging", "Markdown", "MarkdownAST", "Pkg", "PrecompileTools", "REPL", "RegistryInstances", "SHA", "Test", "Unicode"] -git-tree-sha1 = "662fb21ae7fad33e044c2b59ece832fdce32c171" +git-tree-sha1 = "fd5563e75926caa000bd07aa141162661e291780" +repo-rev = "mp/julia-debug" +repo-url = "https://github.com/JuliaDocs/Documenter.jl.git" uuid = "e30172f5-a6a5-5a46-863b-614d45cd2de4" version = "1.1.2" @@ -86,7 +88,7 @@ uuid = "76f85450-5226-5b5a-8eaa-529ad045b433" [[deps.LibGit2_jll]] deps = ["Artifacts", "LibSSH2_jll", "Libdl", "MbedTLS_jll"] uuid = "e37daf67-58a4-590a-8e99-b0245dd2ffc5" -version = "1.7.1+0" +version = "1.6.4+0" [[deps.LibSSH2_jll]] deps = ["Artifacts", "Libdl", "MbedTLS_jll"] From 4532811aa0e5ef9861010c82e11d1a26c5293bd9 Mon Sep 17 00:00:00 2001 From: Morten Piibeleht Date: Mon, 13 Nov 2023 14:37:53 +1300 Subject: [PATCH 15/25] asdsad --- doc/Manifest.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/Manifest.toml b/doc/Manifest.toml index e680133eef326..dec8fb337a58f 100644 --- a/doc/Manifest.toml +++ b/doc/Manifest.toml @@ -36,7 +36,7 @@ version = "0.9.3" [[deps.Documenter]] deps = ["ANSIColoredPrinters", "AbstractTrees", "Base64", "Dates", "DocStringExtensions", "Downloads", "IOCapture", "InteractiveUtils", "JSON", "LibGit2", "Logging", "Markdown", "MarkdownAST", "Pkg", "PrecompileTools", "REPL", "RegistryInstances", "SHA", "Test", "Unicode"] -git-tree-sha1 = "fd5563e75926caa000bd07aa141162661e291780" +git-tree-sha1 = "b2efc751c94c707006f7dda13886544556fac7e1" repo-rev = "mp/julia-debug" repo-url = "https://github.com/JuliaDocs/Documenter.jl.git" uuid = "e30172f5-a6a5-5a46-863b-614d45cd2de4" From 81a3f813bcda2408bdb605c6810fc6e7005e5755 Mon Sep 17 00:00:00 2001 From: Morten Piibeleht Date: Mon, 13 Nov 2023 18:02:25 +1300 Subject: [PATCH 16/25] ... From 305c51d7dd8a172cedd9a35ce407d6058a7c03e6 Mon Sep 17 00:00:00 2001 From: Morten Piibeleht Date: Mon, 13 Nov 2023 23:23:23 +1300 Subject: [PATCH 17/25] ... --- doc/Manifest.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/Manifest.toml b/doc/Manifest.toml index dec8fb337a58f..647dfb31d0fca 100644 --- a/doc/Manifest.toml +++ b/doc/Manifest.toml @@ -36,7 +36,7 @@ version = "0.9.3" [[deps.Documenter]] deps = ["ANSIColoredPrinters", "AbstractTrees", "Base64", "Dates", "DocStringExtensions", "Downloads", "IOCapture", "InteractiveUtils", "JSON", "LibGit2", "Logging", "Markdown", "MarkdownAST", "Pkg", "PrecompileTools", "REPL", "RegistryInstances", "SHA", "Test", "Unicode"] -git-tree-sha1 = "b2efc751c94c707006f7dda13886544556fac7e1" +git-tree-sha1 = "5cfd0b2372c8429b56cfb56ba80653a56c4e83bf" repo-rev = "mp/julia-debug" repo-url = "https://github.com/JuliaDocs/Documenter.jl.git" uuid = "e30172f5-a6a5-5a46-863b-614d45cd2de4" From 2b621dec305a4bcffcb8ce0e9096128fe197de58 Mon Sep 17 00:00:00 2001 From: Morten Piibeleht Date: Mon, 13 Nov 2023 23:56:30 +1300 Subject: [PATCH 18/25] print Git version --- doc/make.jl | 1 + 1 file changed, 1 insertion(+) diff --git a/doc/make.jl b/doc/make.jl index 481076af3bf5b..91e26d455a410 100644 --- a/doc/make.jl +++ b/doc/make.jl @@ -365,6 +365,7 @@ else ) end +@info read(`$(Sys.which("git")) --version`, String) const output_path = joinpath(buildroot, "doc", "_build", (render_pdf ? "pdf" : "html"), "en") makedocs( build = output_path, From a9018b4289aa0ef7651abab109c6893a28567c3d Mon Sep 17 00:00:00 2001 From: Morten Piibeleht Date: Tue, 14 Nov 2023 13:53:36 +1300 Subject: [PATCH 19/25] .. --- doc/Manifest.toml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/doc/Manifest.toml b/doc/Manifest.toml index 647dfb31d0fca..b0ab0e9355a0c 100644 --- a/doc/Manifest.toml +++ b/doc/Manifest.toml @@ -36,7 +36,7 @@ version = "0.9.3" [[deps.Documenter]] deps = ["ANSIColoredPrinters", "AbstractTrees", "Base64", "Dates", "DocStringExtensions", "Downloads", "IOCapture", "InteractiveUtils", "JSON", "LibGit2", "Logging", "Markdown", "MarkdownAST", "Pkg", "PrecompileTools", "REPL", "RegistryInstances", "SHA", "Test", "Unicode"] -git-tree-sha1 = "5cfd0b2372c8429b56cfb56ba80653a56c4e83bf" +git-tree-sha1 = "fd5563e75926caa000bd07aa141162661e291780" repo-rev = "mp/julia-debug" repo-url = "https://github.com/JuliaDocs/Documenter.jl.git" uuid = "e30172f5-a6a5-5a46-863b-614d45cd2de4" @@ -67,9 +67,9 @@ uuid = "682c06a0-de6a-54ab-a142-c8b1cf79cde6" version = "0.21.4" [[deps.LazilyInitializedFields]] -git-tree-sha1 = "410fe4739a4b092f2ffe36fcb0dcc3ab12648ce1" +git-tree-sha1 = "8f7f3cabab0fd1800699663533b6d5cb3fc0e612" uuid = "0e77f7df-68c5-4e49-93ce-4cd80f5598bf" -version = "1.2.1" +version = "1.2.2" [[deps.LibCURL]] deps = ["LibCURL_jll", "MozillaCACerts_jll"] From e433597f8fcca02d98027cb1750f3ad174dee2f1 Mon Sep 17 00:00:00 2001 From: Morten Piibeleht Date: Wed, 15 Nov 2023 19:28:39 +1300 Subject: [PATCH 20/25] Git_jll --- doc/Manifest.toml | 45 +++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 43 insertions(+), 2 deletions(-) diff --git a/doc/Manifest.toml b/doc/Manifest.toml index b0ab0e9355a0c..36e6e8695994f 100644 --- a/doc/Manifest.toml +++ b/doc/Manifest.toml @@ -35,8 +35,8 @@ uuid = "ffbed154-4ef7-542d-bbb7-c09d3a79fcae" version = "0.9.3" [[deps.Documenter]] -deps = ["ANSIColoredPrinters", "AbstractTrees", "Base64", "Dates", "DocStringExtensions", "Downloads", "IOCapture", "InteractiveUtils", "JSON", "LibGit2", "Logging", "Markdown", "MarkdownAST", "Pkg", "PrecompileTools", "REPL", "RegistryInstances", "SHA", "Test", "Unicode"] -git-tree-sha1 = "fd5563e75926caa000bd07aa141162661e291780" +deps = ["ANSIColoredPrinters", "AbstractTrees", "Base64", "Dates", "DocStringExtensions", "Downloads", "Git", "IOCapture", "InteractiveUtils", "JSON", "LibGit2", "Logging", "Markdown", "MarkdownAST", "Pkg", "PrecompileTools", "REPL", "RegistryInstances", "SHA", "Test", "Unicode"] +git-tree-sha1 = "99df964980b7773c512721c32bce0ada088cccb9" repo-rev = "mp/julia-debug" repo-url = "https://github.com/JuliaDocs/Documenter.jl.git" uuid = "e30172f5-a6a5-5a46-863b-614d45cd2de4" @@ -47,9 +47,27 @@ deps = ["ArgTools", "FileWatching", "LibCURL", "NetworkOptions"] uuid = "f43a241f-c20a-4ad4-852c-f6b1247861c6" version = "1.6.0" +[[deps.Expat_jll]] +deps = ["Artifacts", "JLLWrappers", "Libdl"] +git-tree-sha1 = "4558ab818dcceaab612d1bb8c19cee87eda2b83c" +uuid = "2e619515-83b5-522b-bb60-26c02a35a201" +version = "2.5.0+0" + [[deps.FileWatching]] uuid = "7b1f6079-737a-58dc-b8bc-7a2ca5c1b5ee" +[[deps.Git]] +deps = ["Git_jll"] +git-tree-sha1 = "51764e6c2e84c37055e846c516e9015b4a291c7d" +uuid = "d7ba0133-e1db-5d97-8f8c-041e4b3a1eb2" +version = "1.3.0" + +[[deps.Git_jll]] +deps = ["Artifacts", "Expat_jll", "JLLWrappers", "LibCURL_jll", "Libdl", "Libiconv_jll", "OpenSSL_jll", "PCRE2_jll", "Zlib_jll"] +git-tree-sha1 = "bb8f7cc77ec1152414b2af6db533d9471cfbb2d1" +uuid = "f8c6e375-362e-5223-8a59-34ff63f689eb" +version = "2.42.0+0" + [[deps.IOCapture]] deps = ["Logging", "Random"] git-tree-sha1 = "d75853a0bdbfb1ac815478bacd89cd27b550ace6" @@ -60,6 +78,12 @@ version = "0.2.3" deps = ["Markdown"] uuid = "b77e0a4c-d291-57a0-90e8-8db25a27a240" +[[deps.JLLWrappers]] +deps = ["Artifacts", "Preferences"] +git-tree-sha1 = "7e5d6779a1e09a36db2a7b6cff50942a0a7d0fca" +uuid = "692b3bcd-3c85-4b1f-b108-f13ce0eb3210" +version = "1.5.0" + [[deps.JSON]] deps = ["Dates", "Mmap", "Parsers", "Unicode"] git-tree-sha1 = "31e996f0a15c7b280ba9f76636b3ff9e2ae58c9a" @@ -98,6 +122,12 @@ version = "1.11.0+1" [[deps.Libdl]] uuid = "8f399da3-3557-5675-b5ff-fb832c97cbdb" +[[deps.Libiconv_jll]] +deps = ["Artifacts", "JLLWrappers", "Libdl"] +git-tree-sha1 = "f9557a255370125b405568f9767d6d195822a175" +uuid = "94ce4f54-9a6c-5748-9c1c-f9c7231a4531" +version = "1.17.0+0" + [[deps.Logging]] uuid = "56ddb016-857b-54e1-b83d-db4d58db5568" @@ -127,6 +157,17 @@ version = "2023.1.10" uuid = "ca575930-c2e3-43a9-ace4-1e988b2c1908" version = "1.2.0" +[[deps.OpenSSL_jll]] +deps = ["Artifacts", "JLLWrappers", "Libdl"] +git-tree-sha1 = "cc6e1927ac521b659af340e0ca45828a3ffc748f" +uuid = "458c3c95-2e84-50aa-8efc-19380b2a3a95" +version = "3.0.12+0" + +[[deps.PCRE2_jll]] +deps = ["Artifacts", "Libdl"] +uuid = "efcefdf7-47ab-520b-bdef-62a2eaa19f15" +version = "10.42.0+1" + [[deps.Parsers]] deps = ["Dates", "PrecompileTools", "UUIDs"] git-tree-sha1 = "a935806434c9d4c506ba941871b327b96d41f2bf" From 3da55b32278118b42d700ae0c82bd58716ba0809 Mon Sep 17 00:00:00 2001 From: Morten Piibeleht Date: Sun, 26 Nov 2023 21:16:33 +1300 Subject: [PATCH 21/25] update documenter branch --- doc/Manifest.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/Manifest.toml b/doc/Manifest.toml index 36e6e8695994f..77a51344e5f4e 100644 --- a/doc/Manifest.toml +++ b/doc/Manifest.toml @@ -36,7 +36,7 @@ version = "0.9.3" [[deps.Documenter]] deps = ["ANSIColoredPrinters", "AbstractTrees", "Base64", "Dates", "DocStringExtensions", "Downloads", "Git", "IOCapture", "InteractiveUtils", "JSON", "LibGit2", "Logging", "Markdown", "MarkdownAST", "Pkg", "PrecompileTools", "REPL", "RegistryInstances", "SHA", "Test", "Unicode"] -git-tree-sha1 = "99df964980b7773c512721c32bce0ada088cccb9" +git-tree-sha1 = "463925bb005754f6a4b866e9d13709ebcb631499" repo-rev = "mp/julia-debug" repo-url = "https://github.com/JuliaDocs/Documenter.jl.git" uuid = "e30172f5-a6a5-5a46-863b-614d45cd2de4" From ff0da645c2e2e44b7b53a5065a437b6b31d5004f Mon Sep 17 00:00:00 2001 From: Morten Piibeleht Date: Mon, 27 Nov 2023 12:02:10 +1300 Subject: [PATCH 22/25] Update doc/make.jl Co-authored-by: Lilith Orion Hafner --- doc/make.jl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/make.jl b/doc/make.jl index d032e69114af9..41924d6133e0e 100644 --- a/doc/make.jl +++ b/doc/make.jl @@ -54,7 +54,7 @@ end function parse_stdlib_version_file(path) values = Dict{String,String}() for line in readlines(path) - m = match(r"^([A-Z0-9_]+)\s+:?=\s+(\S+)\s?$", line) + m = match(r"^([A-Z0-9_]+)\s+:?=\s+(\S+)$", line) if isnothing(m) @warn "Unable to parse line in $(path)" line else From 369685e23d67d0a32cc44edf78a2126e8d161c8f Mon Sep 17 00:00:00 2001 From: Morten Piibeleht Date: Wed, 29 Nov 2023 15:46:50 +1300 Subject: [PATCH 23/25] switch to Documenter 1.2.0 --- doc/Manifest.toml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/doc/Manifest.toml b/doc/Manifest.toml index 77a51344e5f4e..67441b6d816a3 100644 --- a/doc/Manifest.toml +++ b/doc/Manifest.toml @@ -36,11 +36,9 @@ version = "0.9.3" [[deps.Documenter]] deps = ["ANSIColoredPrinters", "AbstractTrees", "Base64", "Dates", "DocStringExtensions", "Downloads", "Git", "IOCapture", "InteractiveUtils", "JSON", "LibGit2", "Logging", "Markdown", "MarkdownAST", "Pkg", "PrecompileTools", "REPL", "RegistryInstances", "SHA", "Test", "Unicode"] -git-tree-sha1 = "463925bb005754f6a4b866e9d13709ebcb631499" -repo-rev = "mp/julia-debug" -repo-url = "https://github.com/JuliaDocs/Documenter.jl.git" +git-tree-sha1 = "43aa88b72dffff46b1b19f66483ea3e2f907c4fa" uuid = "e30172f5-a6a5-5a46-863b-614d45cd2de4" -version = "1.1.2" +version = "1.2.0" [[deps.Downloads]] deps = ["ArgTools", "FileWatching", "LibCURL", "NetworkOptions"] From 012cf2188b0fb8b3ef06f0edb738fadbfd365444 Mon Sep 17 00:00:00 2001 From: Morten Piibeleht Date: Wed, 29 Nov 2023 15:51:18 +1300 Subject: [PATCH 24/25] remove debug print --- doc/make.jl | 1 - 1 file changed, 1 deletion(-) diff --git a/doc/make.jl b/doc/make.jl index 41924d6133e0e..cf266370acb01 100644 --- a/doc/make.jl +++ b/doc/make.jl @@ -367,7 +367,6 @@ else ) end -@info read(`$(Sys.which("git")) --version`, String) const output_path = joinpath(buildroot, "doc", "_build", (render_pdf ? "pdf" : "html"), "en") makedocs( build = output_path, From d272c96f094d2805e031da45716044a588f498bd Mon Sep 17 00:00:00 2001 From: Morten Piibeleht Date: Tue, 5 Dec 2023 11:23:12 +1300 Subject: [PATCH 25/25] use 1.2.1 --- doc/Manifest.toml | 28 +++++++++++++++++++++++----- 1 file changed, 23 insertions(+), 5 deletions(-) diff --git a/doc/Manifest.toml b/doc/Manifest.toml index 67441b6d816a3..3e973e043f60a 100644 --- a/doc/Manifest.toml +++ b/doc/Manifest.toml @@ -20,13 +20,16 @@ version = "1.1.1" [[deps.Artifacts]] uuid = "56f22d72-fd6d-98f1-02f0-08ddc0907c33" +version = "1.11.0" [[deps.Base64]] uuid = "2a0f44e3-6c83-55bd-87e4-b1978d98bd5f" +version = "1.11.0" [[deps.Dates]] deps = ["Printf"] uuid = "ade2ca70-3891-5945-98fb-dc099432e06a" +version = "1.11.0" [[deps.DocStringExtensions]] deps = ["LibGit2"] @@ -36,9 +39,9 @@ version = "0.9.3" [[deps.Documenter]] deps = ["ANSIColoredPrinters", "AbstractTrees", "Base64", "Dates", "DocStringExtensions", "Downloads", "Git", "IOCapture", "InteractiveUtils", "JSON", "LibGit2", "Logging", "Markdown", "MarkdownAST", "Pkg", "PrecompileTools", "REPL", "RegistryInstances", "SHA", "Test", "Unicode"] -git-tree-sha1 = "43aa88b72dffff46b1b19f66483ea3e2f907c4fa" +git-tree-sha1 = "2613dbec8f4748273bbe30ba71fd5cb369966bac" uuid = "e30172f5-a6a5-5a46-863b-614d45cd2de4" -version = "1.2.0" +version = "1.2.1" [[deps.Downloads]] deps = ["ArgTools", "FileWatching", "LibCURL", "NetworkOptions"] @@ -53,6 +56,7 @@ version = "2.5.0+0" [[deps.FileWatching]] uuid = "7b1f6079-737a-58dc-b8bc-7a2ca5c1b5ee" +version = "1.11.0" [[deps.Git]] deps = ["Git_jll"] @@ -75,6 +79,7 @@ version = "0.2.3" [[deps.InteractiveUtils]] deps = ["Markdown"] uuid = "b77e0a4c-d291-57a0-90e8-8db25a27a240" +version = "1.11.0" [[deps.JLLWrappers]] deps = ["Artifacts", "Preferences"] @@ -101,16 +106,17 @@ version = "0.6.4" [[deps.LibCURL_jll]] deps = ["Artifacts", "LibSSH2_jll", "Libdl", "MbedTLS_jll", "Zlib_jll", "nghttp2_jll"] uuid = "deac9b47-8bc7-5906-a0fe-35ac56dc84c0" -version = "8.0.1+1" +version = "8.4.0+0" [[deps.LibGit2]] deps = ["Base64", "LibGit2_jll", "NetworkOptions", "Printf", "SHA"] uuid = "76f85450-5226-5b5a-8eaa-529ad045b433" +version = "1.11.0" [[deps.LibGit2_jll]] deps = ["Artifacts", "LibSSH2_jll", "Libdl", "MbedTLS_jll"] uuid = "e37daf67-58a4-590a-8e99-b0245dd2ffc5" -version = "1.6.4+0" +version = "1.7.1+0" [[deps.LibSSH2_jll]] deps = ["Artifacts", "Libdl", "MbedTLS_jll"] @@ -119,6 +125,7 @@ version = "1.11.0+1" [[deps.Libdl]] uuid = "8f399da3-3557-5675-b5ff-fb832c97cbdb" +version = "1.11.0" [[deps.Libiconv_jll]] deps = ["Artifacts", "JLLWrappers", "Libdl"] @@ -128,10 +135,12 @@ version = "1.17.0+0" [[deps.Logging]] uuid = "56ddb016-857b-54e1-b83d-db4d58db5568" +version = "1.11.0" [[deps.Markdown]] deps = ["Base64"] uuid = "d6f4376e-aef5-505a-96c1-9c027394607a" +version = "1.11.0" [[deps.MarkdownAST]] deps = ["AbstractTrees", "Markdown"] @@ -146,6 +155,7 @@ version = "2.28.2+1" [[deps.Mmap]] uuid = "a63ad114-7e13-5084-954f-fe012c677804" +version = "1.11.0" [[deps.MozillaCACerts_jll]] uuid = "14a3606d-f60d-562e-9121-12d972cd8159" @@ -192,14 +202,17 @@ version = "1.4.1" [[deps.Printf]] deps = ["Unicode"] uuid = "de0858da-6303-5e67-8744-51eddeeeb8d7" +version = "1.11.0" [[deps.REPL]] deps = ["InteractiveUtils", "Markdown", "Sockets", "Unicode"] uuid = "3fa0cd96-eef1-5676-8a61-b3b8758bbffb" +version = "1.11.0" [[deps.Random]] deps = ["SHA"] uuid = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c" +version = "1.11.0" [[deps.RegistryInstances]] deps = ["LazilyInitializedFields", "Pkg", "TOML", "Tar"] @@ -213,9 +226,11 @@ version = "0.7.0" [[deps.Serialization]] uuid = "9e88b42a-f829-5b0c-bbe9-9e923198166b" +version = "1.11.0" [[deps.Sockets]] uuid = "6462fe0b-24de-5631-8697-dd941f90decc" +version = "1.11.0" [[deps.TOML]] deps = ["Dates"] @@ -230,13 +245,16 @@ version = "1.10.0" [[deps.Test]] deps = ["InteractiveUtils", "Logging", "Random", "Serialization"] uuid = "8dfed614-e22c-5e08-85e1-65c5234f0b40" +version = "1.11.0" [[deps.UUIDs]] deps = ["Random", "SHA"] uuid = "cf7118a7-6976-5b1a-9a39-7adc72f591a4" +version = "1.11.0" [[deps.Unicode]] uuid = "4ec0a83e-493e-50e2-b9ac-8f72acf5a8f5" +version = "1.11.0" [[deps.Zlib_jll]] deps = ["Libdl"] @@ -246,7 +264,7 @@ version = "1.2.13+1" [[deps.nghttp2_jll]] deps = ["Artifacts", "Libdl"] uuid = "8e850ede-7688-5339-a07c-302acd2aaf8d" -version = "1.52.0+1" +version = "1.58.0+0" [[deps.p7zip_jll]] deps = ["Artifacts", "Libdl"]