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.

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

Bump GAP.jl to 0.13 #4421

Draft
wants to merge 4 commits into
base: master
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from 3 commits
Commits
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
14 changes: 14 additions & 0 deletions .github/workflows/CI.yml
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,11 @@ jobs:
with:
cache-name: julia-cache;workflow=${{ github.workflow }};julia=${{ matrix.julia-version }};arch=${{ runner.arch }}
include-matrix: false
- name: "HACK: Use GAP.jl master"
run: julia --project=. -e 'using Pkg; Pkg.add([
PackageSpec(url="https://github.com/lgoettgens/Hecke.jl", rev="lg/bump-GAP"),
PackageSpec(url="https://github.com/oscar-system/GAP.jl", rev="master"),
])'
- name: "Build package"
uses: julia-actions/julia-buildpkg@v1
- name: "limit OpenMP threads"
Expand Down Expand Up @@ -157,6 +162,11 @@ jobs:
with:
cache-name: julia-cache;workflow=${{ github.workflow }};julia=${{ matrix.julia-version }};arch=${{ runner.arch }}
include-matrix: false
- name: "HACK: Use GAP.jl master"
run: julia --project=. -e 'using Pkg; Pkg.add([
PackageSpec(url="https://github.com/lgoettgens/Hecke.jl", rev="lg/bump-GAP"),
PackageSpec(url="https://github.com/oscar-system/GAP.jl", rev="master"),
])'
- name: "Build package"
uses: julia-actions/julia-buildpkg@v1
- name: "limit OpenMP threads"
Expand All @@ -167,6 +177,10 @@ jobs:
run: |
julia --project=docs --color=yes -e '
using Pkg
Pkg.add([
PackageSpec(url="https://github.com/lgoettgens/Hecke.jl", rev="lg/bump-GAP"),
PackageSpec(url="https://github.com/oscar-system/GAP.jl", rev="master"),
])
Pkg.develop(PackageSpec(path=pwd()))
Pkg.instantiate()'
- name: "Run doctests"
Expand Down
19 changes: 19 additions & 0 deletions .github/workflows/NoExperimental.yml
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,11 @@ jobs:
include-matrix: false
- name: "Symlink NoExperimental_whitelist.jl"
run: ln -s NoExperimental_whitelist_.jl experimental/NoExperimental_whitelist.jl
- name: "HACK: Use GAP.jl master"
run: julia --project=. -e 'using Pkg; Pkg.add([
PackageSpec(url="https://github.com/lgoettgens/Hecke.jl", rev="lg/bump-GAP"),
PackageSpec(url="https://github.com/oscar-system/GAP.jl", rev="master"),
])'
- name: "Set test subgroup"
if: ${{ matrix.group }} != ''
run: echo "OSCAR_TEST_SUBSET=${{matrix.group}}" >> $GITHUB_ENV
Expand All @@ -68,12 +73,21 @@ jobs:
include-matrix: false
- name: "Symlink NoExperimental_whitelist.jl"
run: ln -s NoExperimental_whitelist_.jl experimental/NoExperimental_whitelist.jl
- name: "HACK: Use GAP.jl master"
run: julia --project=. -e 'using Pkg; Pkg.add([
PackageSpec(url="https://github.com/lgoettgens/Hecke.jl", rev="lg/bump-GAP"),
PackageSpec(url="https://github.com/oscar-system/GAP.jl", rev="master"),
])'
- name: "Build package"
uses: julia-actions/julia-buildpkg@v1
- name: "Setup package"
run: |
julia --project=docs --color=yes -e '
using Pkg
Pkg.add([
PackageSpec(url="https://github.com/lgoettgens/Hecke.jl", rev="lg/bump-GAP"),
PackageSpec(url="https://github.com/oscar-system/GAP.jl", rev="master"),
])
Pkg.develop(PackageSpec(path=pwd()))
Pkg.instantiate()'
- name: "Run doctests"
Expand All @@ -95,6 +109,11 @@ jobs:
version: '1.10'
- name: "Symlink NoExperimental_whitelist.jl"
run: ln -s NoExperimental_whitelist_.jl experimental/NoExperimental_whitelist.jl
- name: "HACK: Use GAP.jl master"
run: julia --project=. -e 'using Pkg; Pkg.add([
PackageSpec(url="https://github.com/lgoettgens/Hecke.jl", rev="lg/bump-GAP"),
PackageSpec(url="https://github.com/oscar-system/GAP.jl", rev="master"),
])'
- name: Build package
uses: julia-actions/julia-buildpkg@v1
- name: Install dependencies
Expand Down
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
22 changes: 1 addition & 21 deletions src/Oscar.jl
Original file line number Diff line number Diff line change
Expand Up @@ -86,21 +86,6 @@ function __init__()
# make Oscar module accessible from GAP (it may not be available as
# `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
lgoettgens marked this conversation as resolved.
Show resolved Hide resolved

withenv("TERMINFO_DIRS" => joinpath(GAP.GAP_jll.Readline_jll.Ncurses_jll.find_artifact_dir(), "share", "terminfo")) do
Expand All @@ -111,6 +96,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 +110,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
2 changes: 1 addition & 1 deletion test/Aqua.jl
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ using Aqua
piracies=false, # TODO: check the reported methods to be moved upstream
# Aqua persistent task does not work properly with developed dependencies
# thus we disable these tests when running in OscarCI:
persistent_tasks=!haskey(ENV, "oscar_run_tests"),
persistent_tasks=false,
)
@test length(Aqua.detect_unbound_args_recursively(Oscar)) <= 16
end
Loading