Merge branch 'develop' into glpk4.63

VERSION.txt

@@ -1 +1 @@
-SageMath version 8.1.beta1, Release Date: 2017-08-04
+SageMath version 8.1.beta2, Release Date: 2017-08-13

build/pkgs/configure/checksums.ini

@@ -1,4 +1,4 @@
 tarball=configure-VERSION.tar.gz
-sha1=15364988812ace7a0293646fded1f3c0a372ae71
-md5=398aaa4217d841d6353ebf230003902e
-cksum=2273414518
+sha1=0f56bbb0118c834fec6c7adbe6276245f856092b
+md5=993b6a1f19eafc160cad2a67f17aad8b
+cksum=3308302982

build/pkgs/configure/package-version.txt

@@ -1 +1 @@
-232
+233

build/pkgs/deformation/spkg-check

@@ -1,4 +1,2 @@
-#!/usr/bin/env bash
-
 cd src
 $MAKE check

build/pkgs/deformation/spkg-install

@@ -1,5 +1,3 @@
-#!/usr/bin/env bash
-
 cd src
 
 ./configure --disable-static --prefix="$SAGE_LOCAL" \

build/pkgs/pari/checksums.ini

@@ -1,4 +1,4 @@
 tarball=pari-VERSION.tar.gz
-sha1=6e5f9b227bb1afe9a8fb67fe1239211714601142
-md5=fec030cfa01fa1815552c7aa362d8bf9
-cksum=3798015133
+sha1=99a8ecd47ee6cdd22098d8585db183e357fb7b71
+md5=ae178b3c984af32f2008d147e901aa76
+cksum=4215303198

build/pkgs/pari/package-version.txt

@@ -1 +1 @@
-2.9.2.p2
+2.9.3.p0

build/pkgs/polytopes_db/SPKG.txt

@@ -19,21 +19,3 @@ GPL
 == Dependencies ==
 
 None
-
-== Changelog ==
-
-=== polytopes_db-20120220 (Volker Braun 2012 Feb 20) ===
-* #12553: Added PALP binary data file version. In the future,
-  this will be the only data file format.
-
-=== polytopes_db-20100210.p2 (R. Andrew Ohana, 2012-05-17) ===
-* #13123: Move SAGE_DATA to SAGE_LOCAL/share
-
-=== polytopes_db-20100210.p1 (Keshav Kini, 2012-03-18) ===
-* #12694: Normalize directory structure
-
-=== polytopes_db-20100210 (?, ?) ===
-* Binary files replaced by text ones.
-
-=== polytopes_db-20080430 (?, ?) ===
-* 2008-04-30 Original version.

build/pkgs/polytopes_db/checksums.ini

@@ -1,4 +1,4 @@
 tarball=polytopes_db-VERSION.tar.bz2
-sha1=4d83146f9739e1c907b8592f620f97b7eb02bb3d
-md5=99bd633f4dfcdfef33c22b0b1b33919a
-cksum=3316537984
+sha1=6a9d12740588ea5c0efc0e82776d8386e7887b47
+md5=64c5fba9568891a2dbde5d433ce668e2
+cksum=3276110922

build/pkgs/polytopes_db/package-version.txt

@@ -1 +1 @@
-20120220
+20170220

build/pkgs/psutil/patches/cygwin-support.patch

@@ -819,7 +819,7 @@ index 0000000..ffba639
 +            raise
 +        # Process name is between parentheses. It can contain spaces and
 +        # other parentheses. This is taken into account by looking for
-+        # the first occurrence of "(" and the last occurence of ")".
++        # the first occurrence of "(" and the last occurrence of ")".
 +        rpar = data.rfind(b')')
 +        name = data[data.find(b'(') + 1:rpar]
 +        fields_after_name = data[rpar + 2:].split()

build/pkgs/rpy2/SPKG.txt

@@ -26,7 +26,7 @@ Website: http://rpy.sourceforge.net/rpy2.html
 
 === rpy2-2.7.4 (Emmanuel Charpentier, December 1st, 2015) ===
  * Trac #19638 : upgrade to allow interaction with Jupyter notebook
- * Updated cygwin.patch to add "|| #defined(__CyGWIN__)" to ALL occurences
+ * Updated cygwin.patch to add "|| #defined(__CyGWIN__)" to ALL occurrences
    of "#defined(Win32) || #defined(Win64)". This should be reviewed by
    someone who knows what (he|she)'s doing with Cygwin (I don't).
  * Removed setup.patch, which as no target now.

src/bin/sage-banner

@@ -1,5 +1,5 @@
 ┌────────────────────────────────────────────────────────────────────┐
-│ SageMath version 8.1.beta1, Release Date: 2017-08-04               │
+│ SageMath version 8.1.beta2, Release Date: 2017-08-13               │
 │ Type "notebook()" for the browser-based notebook interface.        │
 │ Type "help()" for help.                                            │
 └────────────────────────────────────────────────────────────────────┘

src/bin/sage-version.sh

@@ -1,4 +1,4 @@
 # Sage version information for shell scripts
 # This file is auto-generated by the sage-update-version script, do not edit!
-SAGE_VERSION='8.1.beta1'
-SAGE_RELEASE_DATE='2017-08-04'
+SAGE_VERSION='8.1.beta2'
+SAGE_RELEASE_DATE='2017-08-13'

src/doc/en/constructions/interface_issues.rst

@@ -228,7 +228,7 @@ Command-line Sage help
 If you know only part of the name of a Sage command and want to
 know where it occurs in Sage, a new option for 0.10.11 has been
 added to make it easier to hunt it down. Just type
-``sage -grep <string>`` to find all occurences of ``<string>`` in the
+``sage -grep <string>`` to find all occurrences of ``<string>`` in the
 Sage source code. For example,
 
 ::

src/doc/en/developer/coding_basics.rst

@@ -862,6 +862,18 @@ written.
       5
       7
 
+- **Python3 print:** even if Python2 syntax for print can still be
+  used in your own code for the moment, Python3 syntax for print must
+  be used in Sage code and doctests. If you use an old-style print in
+  doctests, it will raise a SyntaxError::
+
+      sage: print "not like that"
+      Traceback (most recent call last):
+      ...
+      SyntaxError: invalid syntax
+      sage: print("but like this")
+      but like this
+
 - **Split long lines:** You may want to split long lines of code with a
   backslash. Note: this syntax is non-standard and may be removed in the
   future::

src/doc/en/developer/git_trac.rst

@@ -486,7 +486,7 @@ The file now looks like this::
     <<<<<<< HEAD
         if i > 1:
             return fibonacci(i-1) * fibonacci(i-2)
-        return i
+        return [0, 1][i]
     =======
         return fibonacci(i-1) + fibonacci(i-2)
     >>>>>>> 41675dfaedbfb89dcff0a47e520be4aa2b6c5d1b

src/doc/en/prep/Quickstarts/NumAnalysis.rst

@@ -34,29 +34,26 @@ Basic Analysis
     sage: ring=RealField(3)
 
 To print the actual number (without rounding off the last few imprecise
-digits to only display correct digits), call the ``.str()`` method with
-the option ``truncate=False``.
-
-::
+digits to only display correct digits), call the ``.str()`` method::
 
     sage: print(ring('1').nextabove())
     1.2
 
 ::
 
-    sage: print(ring('1').nextabove().str(truncate=False))
+    sage: print(ring('1').nextabove().str())
     1.2
-    sage: print(ring('1').nextbelow().str(truncate=False))
+    sage: print(ring('1').nextbelow().str())
     0.88
 
 Let's change our precision.
 
 ::
 
     sage: ring=RealField(20)
-    sage: print(ring('1').nextabove().str(truncate=False))
+    sage: print(ring('1').nextabove().str())
     1.0000019
-    sage: print(ring('1').nextbelow().str(truncate=False))
+    sage: print(ring('1').nextbelow().str())
     0.99999905
 
 You can also specify the rounding mode.
@@ -68,17 +65,17 @@ You can also specify the rounding mode.
 
 ::
 
-    sage: ring(1/9).str(truncate=False)
+    sage: ring(1/9).str()
     '0.11111116'
 
 ::
 
-    sage: ringup(1/9).str(truncate=False)
+    sage: ringup(1/9).str()
     '0.13'
 
 ::
 
-    sage: ringdown(1/9).str(truncate=False)
+    sage: ringdown(1/9).str()
     '0.10'
 
 ::

src/doc/en/reference/manifolds/diff_map.rst

@@ -9,3 +9,5 @@ Differentiable Maps and Curves
    sage/manifolds/differentiable/diff_map
 
    sage/manifolds/differentiable/curve
+
+   sage/manifolds/differentiable/integrated_curve

src/doc/en/reference/plot3d/threejs_examples/helix.html

@@ -15,8 +15,8 @@
 
 <body>
 
-<script src=&quot;/Users/Masson/Downloads/GitHub/sage/local/share/threejs/three.min.js&quot;></script>
-<script src=&quot;/Users/Masson/Downloads/GitHub/sage/local/share/threejs/OrbitControls.js&quot;></script>
+<script src=&quot;https://cdn.rawgit.com/mrdoob/three.js/r80/build/three.min.js&quot;></script>
+<script src=&quot;https://cdn.rawgit.com/mrdoob/three.js/r80/examples/js/controls/OrbitControls.js&quot;></script>
                 
 <script>
 

src/doc/en/reference/plot3d/threejs_examples/spheres.html

@@ -15,8 +15,8 @@
 
 <body>
 
-<script src=&quot;/Users/Masson/Downloads/GitHub/sage/local/share/threejs/three.min.js&quot;></script>
-<script src=&quot;/Users/Masson/Downloads/GitHub/sage/local/share/threejs/OrbitControls.js&quot;></script>
+<script src=&quot;https://cdn.rawgit.com/mrdoob/three.js/r80/build/three.min.js&quot;></script>
+<script src=&quot;https://cdn.rawgit.com/mrdoob/three.js/r80/examples/js/controls/OrbitControls.js&quot;></script>
                 
 <script>