Skip to content
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

Only load bare deps if env var GAP_BARE_DEPS is set #912

Merged
merged 1 commit into from
Jul 28, 2023
Merged

Only load bare deps if env var GAP_BARE_DEPS is set #912

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
3 changes: 3 additions & 0 deletions gap/systemfile.g
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,9 @@
# and such that it is available when user files get read
# via the GAP command line.
deps:= SHALLOW_COPY_OBJ( GAPInfo.Dependencies.NeededOtherPackages );
if IsBound(GAPInfo.KernelInfo.ENVIRONMENT.GAP_BARE_DEPS) then
deps:= [];
fi;
APPEND_LIST_INTR( deps, [ [ "JuliaInterface", ">=0.9.8-DEV" ] ] );
GAPInfo.Dependencies:= MakeImmutable( rec( NeededOtherPackages:= deps ) );

Expand Down
4 changes: 4 additions & 0 deletions src/GAP.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -286,6 +286,10 @@ function __init__()
push!(cmdline_options, "-b")
end

if haskey(ENV, "GAP_BARE_DEPS")
push!(cmdline_options, "-A")
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I had expected that push!(cmdline_options, "--bare") would be enough, that is, the change in gap/systemfile.g would not be necessary. However, apparently then loading JuliaInterface causes problems. Thus the proposed changes seem to be a good solution for the moment.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah I first tried --bare, too, but then it didn't load JuliaInterface either. Hence this solution now. (Besides, we still might want to always load e.g. GAPDoc... well, we definitely will want to load it and also smallgrp, transgrp, primgrap and a bunch more in Oscar.)

end

initialize(cmdline_options)

if !show_banner
Expand Down