Skip to content

Commit

Permalink
Bump GAP.jl to 0.13 (#4421)
Browse files Browse the repository at this point in the history
and adjust loading / installation of GAP packages

---------
Co-authored-by: Max Horn <max@quendi.de>
  • Loading branch information
lgoettgens authored Jan 14, 2025
1 parent ed7278d commit e993383
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 23 deletions.
2 changes: 1 addition & 1 deletion Project.toml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ cohomCalg_jll = "5558cf25-a90e-53b0-b813-cadaa3ae7ade"
AbstractAlgebra = "0.44.0"
AlgebraicSolving = "0.8.0"
Distributed = "1.6"
GAP = "0.12.0"
GAP = "0.13.0"
Hecke = "0.35.0"
JSON = "^0.20, ^0.21"
JSON3 = "1.13.2"
Expand Down
23 changes: 1 addition & 22 deletions src/Oscar.jl
Original file line number Diff line number Diff line change
Expand Up @@ -87,22 +87,6 @@ function __init__()
# `Julia.Oscar` if Oscar is loaded indirectly as a package dependency)
GAP.Globals.BindGlobal(GapObj("Oscar"), Oscar)

# Up to now, hopefully the GAP packages listed below have not been loaded.
# We want newer versions of some GAP packages than the distributed ones.
# (But we do not complain if the installation fails.)
for (pkg, version) in [
("recog", "1.4.2"),
("repsn", "3.1.1"),
]
# Avoid downloading something if the requested version is already loaded.
#TODO: Remove this check as soon as GAP.jl contains it,
# see https://github.com/oscar-system/GAP.jl/pull/1019.
info = GAP.Globals.GAPInfo.PackagesLoaded
if !(hasproperty(info, pkg) && version == string(getproperty(info, pkg)[2]))
GAP.Packages.install(pkg, version, interactive = false, quiet = true)
end
end

withenv("TERMINFO_DIRS" => joinpath(GAP.GAP_jll.Readline_jll.Ncurses_jll.find_artifact_dir(), "share", "terminfo")) do
GAP.Packages.load("browse"; install=true) # needed for all_character_table_names doctest
end
Expand All @@ -111,6 +95,7 @@ function __init__()
"atlasrep",
"ctbllib", # character tables
"crisp", # faster normal subgroups, socles, p-socles for finite solvable groups
"ferret", # backtrack in permutation groups
"fga", # dealing with free groups
"forms", # bilinear/sesquilinear/quadratic forms
"packagemanager", # has been loaded already by GAP.jl
Expand All @@ -124,12 +109,6 @@ function __init__()
]
GAP.Packages.load(pkg) || error("cannot load the GAP package $pkg")
end
# We want some GAP packages. (It is no error if they cannot be loaded.)
for pkg in [
"ferret", # backtrack in permutation groups
]
GAP.Packages.load(pkg)
end
# Load the OscarInterface package in the end.
# It needs some other GAP packages,
# and is not needed by packages that can be loaded before Oscar.
Expand Down

0 comments on commit e993383

Please sign in to comment.