Skip to content

Commit

Permalink
sagemathgh-39368: fix doctests for singular 4.4.1
Browse files Browse the repository at this point in the history 
Only output changes. Should work with singular 4.4.1 without breaking
older singular.

### 📝 Checklist

- [x] The title is concise and informative.
- [x] The description explains in detail what this PR is about.

URL: sagemath#39368
Reported by: Gonzalo Tornaría
Reviewer(s): Antonio Rojas
  • Loading branch information
Release Manager committed Jan 25, 2025
2 parents 9ad9462 + a044237 commit da999db
Show file tree
Hide file tree
Showing 24 changed files with 151 additions and 153 deletions.
4 changes: 2 additions & 2 deletions build/pkgs/configure/checksums.ini
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
tarball=configure-VERSION.tar.gz
sha1=f9c1bea6113a6a09430ee1f1aca16c75ed427d48
sha256=c1e0826fb54dd60e78f19e6fcad0b0ef90b33e1771fbbc2165a54c9297a89557
sha1=8aa6b3246bc80da0ba1b7bd3d677e9a5c970c28c
sha256=58c3f89c21495b588fe9863ffc9390fbf87e1e34e1ab6379464d3b304a23a673
2 changes: 1 addition & 1 deletion build/pkgs/configure/package-version.txt
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
5eb37241946a9ef9130ce36eff7e4f135d980eaf
70a716d755b794bb115210520aebafe5bb9decb4
4 changes: 2 additions & 2 deletions src/doc/de/tutorial/interfaces.rst
View file
Original file line number Diff line number Diff line change
Expand Up @@ -198,8 +198,8 @@ Sages Singular-Schnittstelle (ohne die ``....:``):
sage: R1 = singular.ring(0, '(x,y)', 'dp')
sage: R1
polynomial ring, over a field, global ordering
// coefficients: QQ
// number of vars : 2
// coefficients: QQ...
// number of vars : 2
// block 1 : ordering dp
// : names x y
// block 2 : ordering C
Expand Down
18 changes: 8 additions & 10 deletions src/doc/en/constructions/algebraic_geometry.rst
View file
Original file line number Diff line number Diff line change
Expand Up @@ -162,14 +162,12 @@ Other methods

sage: singular.LIB("brnoeth.lib")
sage: s = singular.ring(2,'(x,y)','lp')
...
sage: f = singular.poly('x3y+y3+x')
...
sage: klein1 = f.Adj_div(); print(klein1)
[1]:
[1]:
// coefficients: ZZ/2
// number of vars : 2
// coefficients: ZZ/2...
// number of vars : 2
// block 1 : ordering lp
// : names x y
// block 2 : ordering C
Expand All @@ -191,14 +189,14 @@ Other methods
sage: print(klein1)
[1]:
[1]:
// coefficients: ZZ/2
// number of vars : 2
// coefficients: ZZ/2...
// number of vars : 2
// block 1 : ordering lp
// : names x y
// block 2 : ordering C
[2]:
// coefficients: ZZ/2
// number of vars : 3
// coefficients: ZZ/2...
// number of vars : 3
// block 1 : ordering lp
// : names x y z
// block 2 : ordering C
Expand All @@ -214,8 +212,8 @@ Other methods
[5]:
[1]:
[1]:
// coefficients: ZZ/2
// number of vars : 3
// coefficients: ZZ/2...
// number of vars : 3
// block 1 : ordering ls
// : names x y t
// block 2 : ordering C
Expand Down
4 changes: 2 additions & 2 deletions src/doc/en/constructions/rings.rst
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,8 +57,8 @@ Here's an example using the Singular interface:
sage: I = singular.ideal(['a+b+c+d', 'ab+ad+bc+cd', 'abc+abd+acd+bcd', 'abcd-1'])
sage: R
polynomial ring, over a field, global ordering
// coefficients: ZZ/97
// number of vars : 4
// coefficients: ZZ/97...
// number of vars : 4
// block 1 : ordering lp
// : names a b c d
// block 2 : ordering C
Expand Down
4 changes: 2 additions & 2 deletions src/doc/en/developer/coding_in_other.rst
View file
Original file line number Diff line number Diff line change
Expand Up @@ -403,8 +403,8 @@ interface to Singular::
sage: singular.LIB("brnoeth.lib")
sage: singular.ring(5,'(x,y)','lp')
polynomial ring, over a field, global ordering
// coefficients: ZZ/5
// number of vars : 2
// coefficients: ZZ/5...
// number of vars : 2
// block 1 : ordering lp
// : names x y
// block 2 : ordering C
Expand Down
4 changes: 2 additions & 2 deletions src/doc/en/tutorial/interfaces.rst
View file
Original file line number Diff line number Diff line change
Expand Up @@ -195,8 +195,8 @@ Singular (do not type the ``....:``):
sage: R1 = singular.ring(0, '(x,y)', 'dp')
sage: R1
polynomial ring, over a field, global ordering
// coefficients: QQ
// number of vars : 2
// coefficients: QQ...
// number of vars : 2
// block 1 : ordering dp
// : names x y
// block 2 : ordering C
Expand Down
4 changes: 2 additions & 2 deletions src/doc/fr/tutorial/interfaces.rst
View file
Original file line number Diff line number Diff line change
Expand Up @@ -199,8 +199,8 @@ fournie par Sage (n'entrez pas les ``....:``) :
sage: R1 = singular.ring(0, '(x,y)', 'dp')
sage: R1
polynomial ring, over a field, global ordering
// coefficients: QQ
// number of vars : 2
// coefficients: QQ...
// number of vars : 2
// block 1 : ordering dp
// : names x y
// block 2 : ordering C
Expand Down
4 changes: 2 additions & 2 deletions src/doc/ja/tutorial/interfaces.rst
View file
Original file line number Diff line number Diff line change
Expand Up @@ -171,8 +171,8 @@ Singularは，グレブナー基底，多変数多項式のgcd，平面曲線の
sage: R1 = singular.ring(0, '(x,y)', 'dp')
sage: R1
polynomial ring, over a field, global ordering
// coefficients: QQ
// number of vars : 2
// coefficients: QQ...
// number of vars : 2
// block 1 : ordering dp
// : names x y
// block 2 : ordering C
Expand Down
4 changes: 2 additions & 2 deletions src/doc/pt/tutorial/interfaces.rst
View file
Original file line number Diff line number Diff line change
Expand Up @@ -197,8 +197,8 @@ digite ``...``):
sage: R1 = singular.ring(0, '(x,y)', 'dp')
sage: R1
polynomial ring, over a field, global ordering
// coefficients: QQ
// number of vars : 2
// coefficients: QQ...
// number of vars : 2
// block 1 : ordering dp
// : names x y
// block 2 : ordering C
Expand Down
4 changes: 2 additions & 2 deletions src/doc/ru/tutorial/interfaces.rst
View file
Original file line number Diff line number Diff line change
Expand Up @@ -190,8 +190,8 @@ Singular предоставляет массивную и продуманную
sage: R1 = singular.ring(0, '(x,y)', 'dp')
sage: R1
polynomial ring, over a field, global ordering
// coefficients: QQ
// number of vars : 2
// coefficients: QQ...
// number of vars : 2
// block 1 : ordering dp
// : names x y
// block 2 : ordering C
Expand Down
4 changes: 2 additions & 2 deletions src/sage/categories/pushout.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3925,8 +3925,8 @@ class BlackBoxConstructionFunctor(ConstructionFunctor):
sage: FS = BlackBoxConstructionFunctor(singular)
sage: FS(QQ['t']) # needs sage.libs.singular
polynomial ring, over a field, global ordering
// coefficients: QQ
// number of vars : 1
// coefficients: QQ...
// number of vars : 1
// block 1 : ordering lp
// : names t
// block 2 : ordering C
Expand Down
4 changes: 2 additions & 2 deletions src/sage/interfaces/expect.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1328,8 +1328,8 @@ def _synchronize(self, cmd='1+%s;\n'):
sage: R.<x> = QQ[]; f = x^3 + x + 1; g = x^3 - x - 1; r = f.resultant(g); gap(ZZ); singular(R)
Integers
polynomial ring, over a field, global ordering
// coefficients: QQ
// number of vars : 1
// coefficients: QQ...
// number of vars : 1
// block 1 : ordering lp
// : names x
// block 2 : ordering C
Expand Down
4 changes: 2 additions & 2 deletions src/sage/interfaces/interface.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -817,8 +817,8 @@ def __reduce__(self):
sage: S = singular.ring(0, ('x'))
sage: loads(dumps(S))
polynomial ring, over a field, global ordering
// coefficients: QQ
// number of vars : 1
// coefficients: QQ...
// number of vars : 1
// block 1 : ordering lp
// : names x
// block 2 : ordering C
Expand Down
52 changes: 26 additions & 26 deletions src/sage/interfaces/singular.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,8 @@
sage: R1 = singular.ring(0, '(x,y)', 'dp')
sage: R1
polynomial ring, over a field, global ordering
// coefficients: QQ
// number of vars : 2
// coefficients: QQ...
// number of vars : 2
// block 1 : ordering dp
// : names x y
// block 2 : ordering C
Expand Down Expand Up @@ -220,12 +220,12 @@
sage: singular.lib('polylib.lib')
sage: singular.ring(32003, '(a,b,c,d,e,f)', 'lp')
polynomial ring, over a field, global ordering
// coefficients: ZZ/32003
// number of vars : 6
// block 1 : ordering lp
// : names a b c d e f
// block 2 : ordering C
polynomial ring, over a field, global ordering
// coefficients: ZZ/32003...
// number of vars : 6
// block 1 : ordering lp
// : names a b c d e f
// block 2 : ordering C
sage: I = singular.ideal('cyclic(6)')
sage: g = singular('groebner(I)')
Traceback (most recent call last):
Expand Down Expand Up @@ -1074,8 +1074,8 @@ def ring(self, char=0, vars='(x)', order='lp', check=None):
sage: R = singular.ring(0, '(x,y,z)', 'dp')
sage: R
polynomial ring, over a field, global ordering
// coefficients: QQ
// number of vars : 3
// coefficients: QQ...
// number of vars : 3
// block 1 : ordering dp
// : names x y z
// block 2 : ordering C
Expand Down Expand Up @@ -1153,16 +1153,16 @@ def set_ring(self, R):
sage: S = singular.ring('real', '(a,b)', 'lp')
sage: singular.current_ring()
polynomial ring, over a field, global ordering
// coefficients: Float()
// number of vars : 2
// coefficients: Float()...
// number of vars : 2
// block 1 : ordering lp
// : names a b
// block 2 : ordering C
sage: singular.set_ring(R)
sage: singular.current_ring()
polynomial ring, over a field, local ordering
// coefficients: ZZ/7
// number of vars : 2
// coefficients: ZZ/7...
// number of vars : 2
// block 1 : ordering ds
// : names a b
// block 2 : ordering C
Expand Down Expand Up @@ -1203,15 +1203,15 @@ def current_ring(self):
sage: r = PolynomialRing(GF(127),3,'xyz', order='invlex')
sage: r._singular_()
polynomial ring, over a field, global ordering
// coefficients: ZZ/127
// number of vars : 3
// coefficients: ZZ/127...
// number of vars : 3
// block 1 : ordering ip
// : names x y z
// block 2 : ordering C
sage: singular.current_ring()
polynomial ring, over a field, global ordering
// coefficients: ZZ/127
// number of vars : 3
// coefficients: ZZ/127...
// number of vars : 3
// block 1 : ordering ip
// : names x y z
// block 2 : ordering C
Expand Down Expand Up @@ -1430,8 +1430,8 @@ def __copy__(self):
sage: cpQ.set_ring()
sage: cpQ
polynomial ring, over a field, global ordering
// coefficients: QQ
// number of vars : 2
// coefficients: QQ...
// number of vars : 2
// block 1 : ordering dp
// : names x y
// block 2 : ordering C
Expand Down Expand Up @@ -1996,8 +1996,8 @@ def _sage_(self, R=None):
sage: singular('basering')
polynomial ring, over a domain, global ordering
// coefficients: ZZ
// number of vars : 3
// coefficients: ZZ...
// number of vars : 3
// block 1 : ordering lp
// : names x y z
// block 2 : ordering C
Expand Down Expand Up @@ -2087,16 +2087,16 @@ def set_ring(self):
sage: S = singular.ring('real', '(a,b)', 'lp')
sage: singular.current_ring()
polynomial ring, over a field, global ordering
// coefficients: Float()
// number of vars : 2
// coefficients: Float()...
// number of vars : 2
// block 1 : ordering lp
// : names a b
// block 2 : ordering C
sage: R.set_ring()
sage: singular.current_ring()
polynomial ring, over a field, local ordering
// coefficients: ZZ/7
// number of vars : 2
// coefficients: ZZ/7...
// number of vars : 2
// block 1 : ordering ds
// : names a b
// block 2 : ordering C
Expand Down
4 changes: 2 additions & 2 deletions src/sage/libs/singular/function.pyx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -276,8 +276,8 @@ cdef class RingWrap:
sage: l = ringlist(P)
sage: ring = singular_function("ring")
sage: ring(l, ring=P)._output()
// coefficients: QQ
// number of vars : 3
// coefficients: QQ...
// number of vars : 3
// block 1 : ordering dp
// : names x y z
// block 2 : ordering C
Expand Down
Loading

0 comments on commit da999db

Please sign in to comment.