Skip to content

doc/test: Consolidate julia package utility dependencies #58574

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Keno merged 1 commit into from
May 30, 2025
Merged

doc/test: Consolidate julia package utility dependencies #58574

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
/usr-staging
/Make.user
/julia-*
/deps/jlutilities/depot
/source-dist.tmp
/source-dist.tmp1
/test/results_*.json
Expand Down
4 changes: 2 additions & 2 deletions doc/Manifest.toml → deps/jlutilities/documenter/Manifest.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ uuid = "e37daf67-58a4-590a-8e99-b0245dd2ffc5"
version = "1.9.0+0"

[[deps.LibSSH2_jll]]
deps = ["Artifacts", "Libdl", "OpenSSL_jll"]
deps = ["Artifacts", "Libdl", "OpenSSL_jll", "Zlib_jll"]
uuid = "29816b5a-b9ab-546f-933c-edad1886dfa8"
version = "1.11.3+1"

Expand Down Expand Up @@ -164,7 +164,7 @@ version = "1.11.0"

[[deps.MozillaCACerts_jll]]
uuid = "14a3606d-f60d-562e-9121-12d972cd8159"
version = "2025.2.25"
version = "2025.5.20"

[[deps.NetworkOptions]]
uuid = "ca575930-c2e3-43a9-ace4-1e988b2c1908"
Expand Down
0 doc/Project.toml → deps/jlutilities/documenter/Project.toml
View file
Open in desktop
File renamed without changes.
0 test/deps/Manifest.toml → deps/jlutilities/revise/Manifest.toml
View file
Open in desktop
File renamed without changes.
0 test/deps/Project.toml → deps/jlutilities/revise/Project.toml
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion doc/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,4 +70,4 @@ deploy: deps

update-documenter:
@echo "Updating Documenter."
JULIA_PKG_PRECOMPILE_AUTO=0 $(JULIA_EXECUTABLE) --project --color=yes -e 'using Pkg; Pkg.update("Documenter")'
JULIA_PKG_PRECOMPILE_AUTO=0 $(JULIA_EXECUTABLE) --project=$(call cygpath_w,$(SRCDIR)/../deps/jlutilities/documenter/) --color=yes -e 'using Pkg; Pkg.update("Documenter")'
15 changes: 5 additions & 10 deletions doc/make.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,12 @@ let r = r"stdlibdir=(.+)", i = findfirst(x -> occursin(r, x), ARGS)
end

# Install dependencies needed to build the documentation.
Base.ACTIVE_PROJECT[] = nothing
empty!(LOAD_PATH)
push!(LOAD_PATH, @__DIR__, "@stdlib")
documenter_project_dir = joinpath(@__DIR__, "..", "deps", "jlutilities", "documenter")
empty!(DEPOT_PATH)
push!(DEPOT_PATH, joinpath(buildrootdoc, "deps"))
push!(DEPOT_PATH, joinpath(buildroot, "deps", "jlutilities", "depot"))
push!(DEPOT_PATH, abspath(Sys.BINDIR, "..", "share", "julia"))
using Pkg
Pkg.activate(documenter_project_dir)
Pkg.instantiate()

if "deps" in ARGS
Expand Down Expand Up @@ -314,12 +313,8 @@ end

const use_revise = "revise=true" in ARGS
if use_revise
let revise_env = joinpath(buildrootdoc, "deps", "revise")
Pkg.activate(revise_env)
Pkg.add("Revise"; preserve=Pkg.PRESERVE_NONE)
Base.ACTIVE_PROJECT[] = nothing
pushfirst!(LOAD_PATH, revise_env)
end
Pkg.activate(joinpath(@__DIR__, "..", "deps", "jlutilities", "revise"))
Pkg.instantiate()
end
function maybe_revise(ex)
use_revise || return ex
Expand Down
4 changes: 2 additions & 2 deletions test/runtests.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,9 @@ end
if use_revise
# First put this at the top of the DEPOT PATH to install revise if necessary.
# Once it's loaded, we swizzle it to the end, to avoid confusing any tests.
pushfirst!(DEPOT_PATH, joinpath(buildroot, "test", "deps"))
pushfirst!(DEPOT_PATH, joinpath(buildroot, "deps", "jlutilities", "depot"))
using Pkg
Pkg.activate(joinpath(@__DIR__, "deps"))
Pkg.activate(joinpath(@__DIR__, "..", "deps", "jlutilities", "revise"))
Pkg.instantiate()
using Revise
union!(Revise.stdlib_names, Symbol.(STDLIBS))
Expand Down