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

Use @include_deprecated_bindings from upstream #3662

Merged
merged 2 commits into from
May 1, 2024
Merged

Use @include_deprecated_bindings from upstream #3662

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c9882b0
Use `@include_deprecated_bindings` from upstream
lgoettgens Apr 30, 2024
1161d98
Move imports out of `aliases.jl`
lgoettgens Apr 30, 2024
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
4 changes: 2 additions & 2 deletions Project.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,11 +30,11 @@ AlgebraicSolving = "0.4.11"
Distributed = "1.6"
DocStringExtensions = "0.8, 0.9"
GAP = "0.10.2"
Hecke = "0.30.10"
Hecke = "0.30.11"
JSON = "^0.20, ^0.21"
JSON3 = "1.13.2"
LazyArtifacts = "1.6"
Nemo = "0.43.0"
Nemo = "0.43.3"
Pkg = "1.6"
Polymake = "0.11.14"
Random = "1.6"
Expand Down
4 changes: 4 additions & 0 deletions src/Oscar.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,10 @@ using LazyArtifacts

include("imports.jl")

AbstractAlgebra.@include_deprecated_bindings()
Nemo.@include_deprecated_bindings()
Hecke.@include_deprecated_bindings()

include("utils/utils.jl")

# More helpful error message for users on Windows.
Expand Down
20 changes: 1 addition & 19 deletions src/aliases.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,25 +1,7 @@
include(joinpath(pathof(AbstractAlgebra), "..", "Aliases.jl"))

# HACK/FIXME: remove these aliases once we have them in AA/Nemo/Hecke
# HACK/FIXME: remove these aliases once https://github.com/Nemocas/AbstractAlgebra.jl/pull/1696 is available
@alias characteristic_polynomial charpoly # FIXME
@alias minimal_polynomial minpoly # FIXME

import Nemo: is_cyclo_type
import Nemo: is_maxreal_type
import Nemo: ZZModRing # FIXME: remove if/once Nemo exports this
import Nemo: zzModRing # FIXME: remove if/once Nemo exports this
import Nemo: FpField # FIXME: remove if/once Nemo exports this
import Nemo: fpField # FIXME: remove if/once Nemo exports this
include(joinpath(pathof(Nemo), "..", "Aliases.jl"))

#import Hecke: quadratic_genera
#import Hecke: has_algebra
#import Hecke: has_embedding
#import Hecke: has_matrix_action
#import Hecke: has_root
#import Hecke: ...
#include(joinpath(pathof(Hecke), "..", "Aliases.jl"))

# make some Julia names compatible with our naming conventions
@alias is_subset issubset
@alias is_valid isvalid
Expand Down
7 changes: 7 additions & 0 deletions src/imports.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -202,3 +202,10 @@ if !isdefined(Hecke, :torsion_free_rank)
end

import cohomCalg_jll

import Nemo: is_cyclo_type
import Nemo: is_maxreal_type
import Nemo: ZZModRing # FIXME: remove if/once Nemo exports this
import Nemo: zzModRing # FIXME: remove if/once Nemo exports this
import Nemo: FpField # FIXME: remove if/once Nemo exports this
import Nemo: fpField # FIXME: remove if/once Nemo exports this
Loading