Skip to content

Commit

Permalink
Bump Nemo and AA compat (#829)
Browse files Browse the repository at this point in the history 
* Bump Nemo and AA compat

* Adapt to `addeq!` deprecation
  • Loading branch information
@lgoettgens
lgoettgens committed Sep 19, 2024
1 parent 91cb5d4 commit 4d42ee1
Show file tree
Hide file tree
Showing 18 changed files with 21 additions and 21 deletions.
6 changes: 3 additions & 3 deletions Project.toml
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name = "Singular"
uuid = "bcd08a7b-43d2-5ff7-b6d4-c458787f915c"
version = "0.23.5"
version = "0.23.6"

[deps]
AbstractAlgebra = "c3fe647b-3220-5bb0-a1ea-a7954cac585d"
Expand All @@ -19,12 +19,12 @@ lib4ti2_jll = "1493ae25-0f90-5c0e-a06c-8c5077d6d66f"
libsingular_julia_jll = "ae4fbd8f-ecdb-54f8-bbce-35570499b30e"

[compat]
AbstractAlgebra = "0.41, 0.42"
AbstractAlgebra = "0.43.1"
BinaryWrappers = "~0.1.1"
CxxWrap = "0.14"
Libdl = "1.6"
LinearAlgebra = "1.6"
Nemo = "0.45, 0.46"
Nemo = "0.47"
Pidfile = "1.3"
Pkg = "1.6"
Random = "1.6"
Expand Down
2 changes: 1 addition & 1 deletion src/Singular.jl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ import AbstractAlgebra: AbstractAlgebra, diagonal_matrix, factor,

import AbstractAlgebra: pretty, Lowercase, LowercaseOff, Indent, Dedent, terse, is_terse

import Nemo: add!, addeq!, base_ring, canonical_unit,
import Nemo: add!, base_ring, canonical_unit,
change_base_ring, characteristic, check_parent, codomain,
coeff, coefficients, compose, constant_coefficient,
contains, content, crt,
Expand Down
2 changes: 1 addition & 1 deletion src/libsingular/antic/nf_elem.jl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ function nf_elemInpAdd(a::Ptr{Ptr{Cvoid}}, b::Ptr{Cvoid}, cf::Ptr{Cvoid})
r = unsafe_load(a)
aa = julia(r)::Nemo.AbsSimpleNumFieldElem
bb = julia(b)::Nemo.AbsSimpleNumFieldElem
Nemo.addeq!(aa, bb)
Nemo.add!(aa, bb)
nothing
end

Expand Down
2 changes: 1 addition & 1 deletion src/libsingular/flint/fmpq.jl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ function fmpqInpAdd(a::Ptr{Ptr{Cvoid}}, b::Ptr{Cvoid}, cf::Ptr{Cvoid})
r = unsafe_load(a)
aa = julia(r)::Nemo.QQFieldElem
bb = julia(b)::Nemo.QQFieldElem
Nemo.addeq!(aa, bb)
Nemo.add!(aa, bb)
nothing
end

Expand Down
2 changes: 1 addition & 1 deletion src/libsingular/flint/fmpz.jl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ function fmpzInpAdd(a::Ptr{Ptr{Cvoid}}, b::Ptr{Cvoid}, cf::Ptr{Cvoid})
r = unsafe_load(a)
aa = julia(r)::Nemo.ZZRingElem
bb = julia(b)::Nemo.ZZRingElem
Nemo.addeq!(aa, bb)
Nemo.add!(aa, bb)
nothing
end

Expand Down
2 changes: 1 addition & 1 deletion src/libsingular/flint/fq.jl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ function fqInpAdd(a::Ptr{Ptr{Cvoid}}, b::Ptr{Cvoid}, cf::Ptr{Cvoid})
r = unsafe_load(a)
aa = julia(r)::Nemo.FqPolyRepFieldElem
bb = julia(b)::Nemo.FqPolyRepFieldElem
Nemo.addeq!(aa, bb)
Nemo.add!(aa, bb)
nothing
end

Expand Down
2 changes: 1 addition & 1 deletion src/libsingular/flint/fq_nmod.jl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ function fq_nmodInpAdd(a::Ptr{Ptr{Cvoid}}, b::Ptr{Cvoid}, cf::Ptr{Cvoid})
r = unsafe_load(a)
aa = julia(r)::Nemo.fqPolyRepFieldElem
bb = julia(b)::Nemo.fqPolyRepFieldElem
Nemo.addeq!(aa, bb)
Nemo.add!(aa, bb)
nothing
end

Expand Down
2 changes: 1 addition & 1 deletion src/libsingular/nemo/Fields.jl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ function nemoFieldInpAdd(a::Ptr{Ptr{Cvoid}}, b::Ptr{Cvoid}, cf::Ptr{Cvoid})
r = unsafe_load(a)
aa = julia(r)
bb = julia(b)
cc = Nemo.addeq!(aa, bb)
cc = Nemo.add!(aa, bb)
n = number(cc, aa)
setindex_internal_void(reinterpret(Ptr{Cvoid},a), n)
nothing
Expand Down
2 changes: 1 addition & 1 deletion src/libsingular/nemo/Rings.jl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ function nemoRingInpAdd(a::Ptr{Ptr{Cvoid}}, b::Ptr{Cvoid}, cf::Ptr{Cvoid})
r = unsafe_load(a)
aa = julia(r)
bb = julia(b)
cc = Nemo.addeq!(aa, bb)
cc = Nemo.add!(aa, bb)
n = number(cc, aa)
setindex_internal_void(reinterpret(Ptr{Cvoid},a), n)
nothing
Expand Down
2 changes: 1 addition & 1 deletion src/number/n_GF.jl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -242,7 +242,7 @@ end
#
###############################################################################

function addeq!(x::n_GF, y::n_GF)
function add!(x::n_GF, y::n_GF)
x.ptr = GC.@preserve x y libSingular.n_InpAdd(x.ptr, y.ptr, parent(x).ptr)
return x
end
Expand Down
2 changes: 1 addition & 1 deletion src/number/n_Q.jl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -291,7 +291,7 @@ reconstruct(x::Integer, y::n_Z) = reconstruct(ZZ(x), y)
#
###############################################################################

function addeq!(x::n_Q, y::n_Q)
function add!(x::n_Q, y::n_Q)
c = parent(x)
GC.@preserve x y c begin
x.ptr = libSingular.n_InpAdd(x.ptr, y.ptr, c.ptr)
Expand Down
2 changes: 1 addition & 1 deletion src/number/n_Z.jl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -314,7 +314,7 @@ end
#
###############################################################################

function addeq!(x::n_Z, y::n_Z)
function add!(x::n_Z, y::n_Z)
c = parent(x)
x.ptr = GC.@preserve x y c libSingular.n_InpAdd(x.ptr, y.ptr, c.ptr)
return x
Expand Down
2 changes: 1 addition & 1 deletion src/number/n_Zn.jl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -225,7 +225,7 @@ end
#
###############################################################################

function addeq!(x::n_Zn, y::n_Zn)
function add!(x::n_Zn, y::n_Zn)
c = parent(x)
x.ptr = GC.@preserve x y c libSingular.n_InpAdd(x.ptr, y.ptr, c.ptr)
return x
Expand Down
2 changes: 1 addition & 1 deletion src/number/n_Zp.jl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -203,7 +203,7 @@ end
#
###############################################################################

function addeq!(x::n_Zp, y::n_Zp)
function add!(x::n_Zp, y::n_Zp)
c = parent(x)
x.ptr = GC.@preserve x y c libSingular.n_InpAdd(x.ptr, y.ptr, c.ptr)
return x
Expand Down
2 changes: 1 addition & 1 deletion src/number/n_algExt.jl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -235,7 +235,7 @@ end
#
###############################################################################

function addeq!(x::n_algExt, y::n_algExt)
function add!(x::n_algExt, y::n_algExt)
R = parent(x)
x.ptr = GC.@preserve x y R libSingular.n_InpAdd(x.ptr, y.ptr, R.ptr)
return x
Expand Down
2 changes: 1 addition & 1 deletion src/number/n_transExt.jl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -284,7 +284,7 @@ end
#
###############################################################################

function addeq!(x::n_transExt, y::n_transExt)
function add!(x::n_transExt, y::n_transExt)
c = parent(x)
x.ptr = GC.@preserve x y c libSingular.n_InpAdd(x.ptr, y.ptr, c.ptr)
return x
Expand Down
4 changes: 2 additions & 2 deletions src/number/n_unknown.jl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -417,8 +417,8 @@ for (rw, rew) in [(:RingWrapper, :RingElemWrapper),
return ($rew){S, T}(one(R.data), R)
end

function addeq!(z::($rew){S, T}, a::($rew){S, T}) where {S, T}
z.data = addeq!(z.data, a.data)
function add!(z::($rew){S, T}, a::($rew){S, T}) where {S, T}
z.data = add!(z.data, a.data)
return z
end

Expand Down
2 changes: 1 addition & 1 deletion src/poly/poly.jl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1358,7 +1358,7 @@ function sort_terms!(x::SPolyUnion)
return x
end

function addeq!(x::SPolyUnion, y::SPolyUnion)
function add!(x::SPolyUnion, y::SPolyUnion)
R = parent(x)
GC.@preserve x y R begin
if y.ptr == C_NULL
Expand Down

2 comments on commit 4d42ee1

@thofma
Copy link
Collaborator

@thofma thofma commented on 4d42ee1 Sep 19, 2024

Choose a reason for hiding this comment

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

@JuliaRegistrator register

@JuliaRegistrator
Copy link

Choose a reason for hiding this comment

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

Registration pull request created: JuliaRegistries/General/115482

Tip: Release Notes

Did you know you can add release notes too? Just add markdown formatted text underneath the comment after the text
"Release notes:" and it will be added to the registry PR, and if TagBot is installed it will also be added to the
release that TagBot creates. i.e.

@JuliaRegistrator register

Release notes:

## Breaking changes

- blah

To add them here just re-invoke and the PR will be updated.

Tagging

After the above pull request is merged, it is recommended that a tag is created on this repository for the registered package version.

This will be done automatically if the Julia TagBot GitHub Action is installed, or can be done manually through the github interface, or via:

git tag -a v0.23.6 -m "<description of version>" 4d42ee1ef3d3d9f48226d19b83a8bcc89b7d1b21
git push origin v0.23.6

Please sign in to comment.