Trac #34222: polymake: Upgrade to 4.7, remove deprecated Polymake_exp…

…ect interface https://polymake.org/doku.php/news/release_4_7 `PolymakeExpect` was deprecated in #27745 Previous updates: #27745, #33251 URL: https://trac.sagemath.org/34222 Reported by: mkoeppe Ticket author(s): Matthias Koeppe Reviewer(s): Travis Scrimshaw
sagemath · Aug 29, 2022 · 86ae68f · 86ae68f
2 parents cba438f + cfe0108
commit 86ae68f
Show file tree

Hide file tree

Showing 18 changed files with 343 additions and 1,036 deletions.
diff --git a/build/pkgs/polymake/SPKG.rst b/build/pkgs/polymake/SPKG.rst
@@ -65,13 +65,10 @@ Information on missing Polymake prerequisites after installing polymake::
    (sage-sh) $ polymake
    polytope> show_unconfigured;
 
-It is strongly recommended to also install JuPyMake::
+In order to Polymake from Sage, you will need the JuPyMake::
 
   sage -i jupymake
 
-When JuPyMake is present, Sage is able to use a more robust interface
-to Polymake.
-
 
 Debugging polymake install problems
 -----------------------------------

diff --git a/build/pkgs/polymake/checksums.ini b/build/pkgs/polymake/checksums.ini
@@ -1,5 +1,5 @@
 tarball=polymake-VERSION-minimal.tar.bz2
-sha1=fe54e1e099e7e87a12d771c7ea5dd011d12ec8f8
-md5=732deb4a3cb83363448c59ec72b0e2cf
-cksum=1021474111
+sha1=a3903ef9438388e56a76cb04918c1fe9b2e2b563
+md5=9a451d56cfe8c6138b91558d6d369dbe
+cksum=1195315956
 upstream_url=https://polymake.org/lib/exe/fetch.php/download/polymake-VERSION-minimal.tar.bz2
diff --git a/build/pkgs/polymake/package-version.txt b/build/pkgs/polymake/package-version.txt
@@ -1 +1 @@
-4.6
+4.7
diff --git a/src/doc/en/thematic_tutorials/geometry/polyhedra_tutorial.rst b/src/doc/en/thematic_tutorials/geometry/polyhedra_tutorial.rst
@@ -646,7 +646,7 @@ for sage is installed.
 
 ::
 
-    sage: p = Polyhedron(vertices=[(0,0),(1,0),(0,1)],             # optional - polymake
+    sage: p = Polyhedron(vertices=[(0,0),(1,0),(0,1)],             # optional - jupymake
     ....:                rays=[(1,1)], lines=[],
     ....:                backend='polymake', base_ring=QQ)
 
@@ -657,7 +657,7 @@ An example with quadratic field:
 ::
 
     sage: V = polytopes.dodecahedron().vertices_list()                                    # optional - sage.rings.number_field
-    sage: Polyhedron(vertices=V, backend='polymake')               # optional - polymake  # optional - sage.rings.number_field
+    sage: Polyhedron(vertices=V, backend='polymake')               # optional - jupymake  # optional - sage.rings.number_field
     A 3-dimensional polyhedron
      in (Number Field in sqrt5 with defining polynomial x^2 - 5
      with sqrt5 = 2.236067977499790?)^3

diff --git a/src/sage/combinat/root_system/associahedron.py b/src/sage/combinat/root_system/associahedron.py
@@ -288,7 +288,7 @@ def Associahedra(base_ring, ambient_dim, backend='ppl'):
         <class 'sage.combinat.root_system.associahedron.Associahedra_ppl_with_category'>
         sage: Associahedra(QQ, 4, 'normaliz').parent() # optional - pynormaliz
         <class 'sage.combinat.root_system.associahedron.Associahedra_normaliz_with_category'>
-        sage: Associahedra(QQ, 4, 'polymake').parent() # optional - polymake
+        sage: Associahedra(QQ, 4, 'polymake').parent() # optional - jupymake
         <class 'sage.combinat.root_system.associahedron.Associahedra_polymake_with_category'>
         sage: Associahedra(QQ, 4, 'field').parent()
         <class 'sage.combinat.root_system.associahedron.Associahedra_field_with_category'>

diff --git a/src/sage/geometry/polyhedron/backend_polymake.py b/src/sage/geometry/polyhedron/backend_polymake.py
diff --git a/src/sage/geometry/polyhedron/base.py b/src/sage/geometry/polyhedron/base.py
@@ -1100,50 +1100,50 @@ def _polymake_init_(self):
         EXAMPLES::
 
             sage: P = polytopes.cube()
-            sage: PP = polymake(P)         # optional - polymake
-            sage: PP.N_VERTICES            # optional - polymake
+            sage: PP = polymake(P)         # optional - jupymake
+            sage: PP.N_VERTICES            # optional - jupymake
             8
 
         Lower-dimensional polyhedron::
 
             sage: P = Polyhedron(vertices=[[1, 0], [0, 1]])
-            sage: PP = polymake(P)         # optional - polymake
-            sage: PP.COMBINATORIAL_DIM     # optional - polymake
+            sage: PP = polymake(P)         # optional - jupymake
+            sage: PP.COMBINATORIAL_DIM     # optional - jupymake
             1
-            sage: PP.AFFINE_HULL           # optional - polymake
+            sage: PP.AFFINE_HULL           # optional - jupymake
             -1 1 1
 
         Empty polyhedron::
 
             sage: P = Polyhedron(ambient_dim=2, vertices=[])
-            sage: PP = polymake(P)         # optional - polymake
-            sage: PP.COMBINATORIAL_DIM     # optional - polymake
+            sage: PP = polymake(P)         # optional - jupymake
+            sage: PP.COMBINATORIAL_DIM     # optional - jupymake
             -1
 
         Pointed unbounded polyhedron::
 
             sage: P = Polyhedron(vertices=[[1, 0], [0, 1]], rays=[[1, 0]])
-            sage: PP = polymake(P)         # optional - polymake
-            sage: PP.VERTICES              # optional - polymake
+            sage: PP = polymake(P)         # optional - jupymake
+            sage: PP.VERTICES              # optional - jupymake
             1 0 1
             1 1 0
             0 1 0
-            sage: PP.FACETS                # optional - polymake
+            sage: PP.FACETS                # optional - jupymake
             1 0 -1
             -1 1 1
             0 0 1
 
         Non-pointed polyhedron::
 
             sage: P = Polyhedron(vertices=[[1, 0], [0, 1]], lines=[[1, 0]])
-            sage: PP = polymake(P)         # optional - polymake
-            sage: PP.VERTICES              # optional - polymake
+            sage: PP = polymake(P)         # optional - jupymake
+            sage: PP.VERTICES              # optional - jupymake
             1 0 1
             1 0 0
-            sage: PP.FACETS                # optional - polymake
+            sage: PP.FACETS                # optional - jupymake
             1 0 -1
             0 0 1
-            sage: PP.LINEALITY_SPACE       # optional - polymake
+            sage: PP.LINEALITY_SPACE       # optional - jupymake
             0 1 0
 
         Algebraic polyhedron::
@@ -1153,20 +1153,20 @@ def _polymake_init_(self):
              in (Number Field in sqrt5 with defining polynomial x^2 - 5
                  with sqrt5 = 2.236067977499790?)^3
              defined as the convex hull of 20 vertices
-            sage: print("There may be a recompilation warning"); PP = polymake(P); PP  # optional - polymake  # optional - sage.rings.number_field
+            sage: print("There may be a recompilation warning"); PP = polymake(P); PP  # optional - jupymake  # optional - sage.rings.number_field
             There may be a recompilation warning...
             Polytope<QuadraticExtension<Rational>>[...]
-            sage: sorted(PP.VERTICES[:], key=repr)[0]                                  # optional - polymake  # optional - sage.rings.number_field
+            sage: sorted(PP.VERTICES[:], key=repr)[0]                                  # optional - jupymake  # optional - sage.rings.number_field
             1 -1+1r5 -4+2r5 0
 
         Floating-point polyhedron::
 
             sage: P = polytopes.dodecahedron(exact=False); P
             A 3-dimensional polyhedron in RDF^3 defined as the convex hull of 20 vertices
-            sage: print("There may be a recompilation warning"); PP = polymake(P); PP # optional - polymake
+            sage: print("There may be a recompilation warning"); PP = polymake(P); PP # optional - jupymake
             There may be a recompilation warning...
             Polytope<Float>[...]
-            sage: sorted(PP.VERTICES[:], key=repr)[0] # optional - polymake
+            sage: sorted(PP.VERTICES[:], key=repr)[0] # optional - jupymake
             1 -0.472135955 0 -1.236067978
 
         """

diff --git a/src/sage/geometry/polyhedron/base0.py b/src/sage/geometry/polyhedron/base0.py
@@ -313,8 +313,8 @@ def _sage_input_(self, sib, coerced):
             sage: P = Polyhedron(vertices = [[1, 0], [0, 1]], rays = [[1, 1]], backend='normaliz') # optional - pynormaliz
             sage: sage_input(P)                                                                    # optional - pynormaliz
             Polyhedron(backend='normaliz', base_ring=QQ, rays=[(QQ(1), QQ(1))], vertices=[(QQ(0), QQ(1)), (QQ(1), QQ(0))])
-            sage: P = Polyhedron(vertices = [[1, 0], [0, 1]], rays = [[1, 1]], backend='polymake') # optional - polymake
-            sage: sage_input(P)                                                                    # optional - polymake
+            sage: P = Polyhedron(vertices = [[1, 0], [0, 1]], rays = [[1, 1]], backend='polymake') # optional - jupymake
+            sage: sage_input(P)                                                                    # optional - jupymake
             Polyhedron(backend='polymake', base_ring=QQ, rays=[(QQ(1), QQ(1))], vertices=[(QQ(1), QQ(0)), (QQ(0), QQ(1))])
        """
         kwds = dict()

diff --git a/src/sage/geometry/polyhedron/face.py b/src/sage/geometry/polyhedron/face.py
@@ -1056,7 +1056,7 @@ def combinatorial_face_to_polyhedral_face(polyhedron, combinatorial_face):
         4
         sage: polytopes.simplex(backend='normaliz').equations()[0].index() # optional - pynormaliz
         4
-        sage: polytopes.simplex(backend='polymake').equations()[0].index() # optional - polymake
+        sage: polytopes.simplex(backend='polymake').equations()[0].index() # optional - jupymake
         4
     """
     V_indices = combinatorial_face.ambient_V_indices()

diff --git a/src/sage/geometry/polyhedron/parent.py b/src/sage/geometry/polyhedron/parent.py
@@ -109,7 +109,7 @@ def Polyhedra(ambient_space_or_base_ring=None, ambient_dim=None, backend=None, *
         Traceback (most recent call last):
         ...
         ValueError: invalid base ring: Number Field in I with defining polynomial x^2 + 1 with I = 1*I cannot be coerced to a real field
-        sage: Polyhedra(AA, 3, backend='polymake')  # optional - polymake
+        sage: Polyhedra(AA, 3, backend='polymake')  # optional - jupymake
         Traceback (most recent call last):
         ...
         ValueError: the 'polymake' backend for polyhedron cannot be used with Algebraic Real Field