summarylogtreecommitdiffstats
path: root/sagemath-singular-4.1.2.patch
diff options
context:
space:
mode:
Diffstat (limited to 'sagemath-singular-4.1.2.patch')
-rw-r--r--sagemath-singular-4.1.2.patch39
1 files changed, 0 insertions, 39 deletions
diff --git a/sagemath-singular-4.1.2.patch b/sagemath-singular-4.1.2.patch
index f3a0dc7092cf..88f55b14f14b 100644
--- a/sagemath-singular-4.1.2.patch
+++ b/sagemath-singular-4.1.2.patch
@@ -1,42 +1,3 @@
-diff --git a/src/sage/rings/polynomial/plural.pyx b/src/sage/rings/polynomial/plural.pyx
-index d2dec78..42001d4 100644
---- a/src/sage/rings/polynomial/plural.pyx
-+++ b/src/sage/rings/polynomial/plural.pyx
-@@ -126,7 +126,7 @@ from sage.rings.finite_rings.finite_field_prime_modn import FiniteField_prime_mo
- from sage.rings.integer cimport Integer
- from sage.rings.integer_ring import is_IntegerRing
-
--from sage.rings.polynomial.multi_polynomial_libsingular cimport MPolynomialRing_libsingular
-+from sage.rings.polynomial.multi_polynomial_libsingular cimport MPolynomialRing_libsingular, MPolynomial_libsingular, new_MP
- from sage.rings.polynomial.multi_polynomial_ideal import NCPolynomialIdeal
-
- from sage.rings.polynomial.polydict import ETuple
-@@ -2860,6 +2860,15 @@ cpdef MPolynomialRing_libsingular new_CRing(RingWrap rw, base_ring):
- sage: curcnt = ring_refcount_dict[currRing_wrapper()]
- sage: newR = new_CRing(W, H.base_ring())
- sage: ring_refcount_dict[currRing_wrapper()] - curcnt
-+ 2
-+
-+ Check that :trac:`29311` is fixed::
-+
-+ sage: R.<x,y,z> = QQ[]
-+ sage: from sage.libs.singular.function_factory import ff
-+ sage: W = ff.ring(ff.ringlist(R), ring=R)
-+ sage: C = sage.rings.polynomial.plural.new_CRing(W, R.base_ring())
-+ sage: C.one()
- 1
- """
- assert( rw.is_commutative() )
-@@ -2867,6 +2876,9 @@ cpdef MPolynomialRing_libsingular new_CRing(RingWrap rw, base_ring):
- cdef MPolynomialRing_libsingular self = <MPolynomialRing_libsingular>MPolynomialRing_libsingular.__new__(MPolynomialRing_libsingular)
-
- self._ring = rw._ring
-+ cdef MPolynomial_libsingular one = new_MP(self, p_ISet(1, self._ring))
-+ self._one_element = one
-+ self._one_element_poly = one._poly
-
- wrapped_ring = wrap_ring(self._ring)
- sage.libs.singular.ring.ring_refcount_dict[wrapped_ring] += 1diff --git a/src/doc/en/constructions/algebraic_geometry.rst b/src/doc/en/constructions/algebraic_geometry.rst
index a312548..d1c9c95 100644
--- a/src/doc/en/constructions/algebraic_geometry.rst
+++ b/src/doc/en/constructions/algebraic_geometry.rst