sagemath-7.3-3.parabola1: updating version

1 files changed, 28 insertions, 28 deletions

diff --git a/libre/sagemath/is-package-installed.patch b/libre/sagemath/is-package-installed.patch
index 3b6efc22b..0f1c59084 100644
--- a/libre/sagemath/is-package-installed.patch
+++ b/libre/sagemath/is-package-installed.patch
@@ -2,15 +2,15 @@ diff --git a/src/sage/databases/cremona.py b/src/sage/databases/cremona.py
 index 0a5f794..2969d92 100644
 --- a/src/sage/databases/cremona.py
 +++ b/src/sage/databases/cremona.py
-@@ -52,7 +52,6 @@ from sage.misc.prandom import randint
+@@ -53,7 +53,6 @@ from sage.misc.prandom import randint
  
  import sage.schemes.elliptic_curves.constructor as elliptic
- from sql_db import SQLDatabase, verify_column
+ from .sql_db import SQLDatabase, verify_column
 -from sage.misc.package import is_package_installed
  from sage.env import SAGE_SHARE
  from sage.misc.all import walltime
  
-@@ -827,7 +826,7 @@ class MiniCremonaDatabase(SQLDatabase):
+@@ -828,7 +827,7 @@ class MiniCremonaDatabase(SQLDatabase):
              if N < self.largest_conductor():
                  message = "There is no elliptic curve with label " + label \
                      + " in the database"
@@ -19,7 +19,7 @@ index 0a5f794..2969d92 100644
                  message = "There is no elliptic curve with label " + label \
                      + " in the currently available databases"
              else:
-@@ -1676,7 +1675,7 @@ def CremonaDatabase(name=None,mini=None,set_global=None):
+@@ -1677,7 +1676,7 @@ def CremonaDatabase(name=None,mini=None,set_global=None):
      if name is None and not set_global:
          return _db
      if set_global and name is None:
@@ -32,7 +32,7 @@ diff --git a/src/sage/game_theory/normal_form_game.py b/src/sage/game_theory/nor
 index b917d2a..80fb20c 100644
 --- a/src/sage/game_theory/normal_form_game.py
 +++ b/src/sage/game_theory/normal_form_game.py
-@@ -612,8 +612,9 @@ from sage.rings.all import QQ
+@@ -614,8 +614,9 @@ from sage.rings.all import QQ
  from sage.structure.sage_object import SageObject
  from sage.matrix.constructor import matrix
  from sage.matrix.constructor import vector
@@ -43,7 +43,7 @@ index b917d2a..80fb20c 100644
  
  try:
      from gambit import Game
-@@ -1315,13 +1316,13 @@ class NormalFormGame(SageObject, MutableMapping):
+@@ -1317,13 +1318,13 @@ class NormalFormGame(SageObject, MutableMapping):
              raise ValueError("utilities have not been populated")
  
          if not algorithm:
@@ -63,7 +63,7 @@ diff --git a/src/sage/geometry/polyhedron/base.py b/src/sage/geometry/polyhedron
 index 2f58d8b..eb519a2 100644
 --- a/src/sage/geometry/polyhedron/base.py
 +++ b/src/sage/geometry/polyhedron/base.py
-@@ -20,7 +20,6 @@ import six
+@@ -21,7 +21,6 @@ import six
  from sage.structure.element import Element, coerce_binop, is_Vector
  
  from sage.misc.all import cached_method, prod
@@ -71,7 +71,7 @@ index 2f58d8b..eb519a2 100644
  
  from sage.rings.all import QQ, ZZ
  from sage.rings.real_double import RDF
-@@ -3690,7 +3689,9 @@ class Polyhedron_base(Element):
+@@ -3691,7 +3690,9 @@ class Polyhedron_base(Element):
  
               David Avis's lrs program.
          """
@@ -103,7 +103,7 @@ diff --git a/src/sage/graphs/generic_graph.py b/src/sage/graphs/generic_graph.py
 index 252984f..ce19682 100644
 --- a/src/sage/graphs/generic_graph.py
 +++ b/src/sage/graphs/generic_graph.py
-@@ -7833,7 +7833,6 @@ class GenericGraph(GenericGraph_pyx):
+@@ -7856,7 +7856,6 @@ class GenericGraph(GenericGraph_pyx):
             sage: abs(flow_ff-flow_igraph) < 0.00001         # optional python_igraph
             True
          """
@@ -111,7 +111,7 @@ index 252984f..ce19682 100644
          self._scream_if_not_simple(allow_loops=True)
          if vertex_bound and algorithm in ["FF", "igraph"]:
              raise ValueError("This method does not support both " +
-@@ -7851,10 +7850,12 @@ class GenericGraph(GenericGraph_pyx):
+@@ -7874,10 +7873,12 @@ class GenericGraph(GenericGraph_pyx):
          if algorithm is None:
              if vertex_bound:
                  algorithm = "LP"
@@ -127,7 +127,7 @@ index 252984f..ce19682 100644
  
          if (algorithm == "FF"):
              return self._ford_fulkerson(x,y, value_only=value_only, integer=integer, use_edge_labels=use_edge_labels)
-@@ -20134,17 +20135,22 @@ class GenericGraph(GenericGraph_pyx):
+@@ -20251,17 +20252,22 @@ class GenericGraph(GenericGraph_pyx):
              Subgroup of (Permutation Group with generators [(0,7)(1,4)(2,3)(6,8)]) generated by [(0,7)(1,4)(2,3)(6,8)]]
  
          """
@@ -156,7 +156,7 @@ index 252984f..ce19682 100644
  
              A = automorphism_group(self, partition)
  
-@@ -20786,17 +20792,22 @@ class GenericGraph(GenericGraph_pyx):
+@@ -20903,17 +20909,22 @@ class GenericGraph(GenericGraph_pyx):
              True
  
          """
@@ -189,7 +189,7 @@ diff --git a/src/sage/graphs/graph_generators.py b/src/sage/graphs/graph_generat
 index 5919ab3..1766796 100644
 --- a/src/sage/graphs/graph_generators.py
 +++ b/src/sage/graphs/graph_generators.py
-@@ -1192,8 +1192,9 @@ class GraphGenerators():
+@@ -1195,8 +1195,9 @@ class GraphGenerators():
          .. [buckygen] \G. Brinkmann, J. Goedgebeur and B.D. McKay, Generation of Fullerenes,
            Journal of Chemical Information and Modeling, 52(11):2910-2918, 2012.
          """
@@ -201,7 +201,7 @@ index 5919ab3..1766796 100644
              raise TypeError("the optional buckygen package is not installed")
  
          # number of vertices should be positive
-@@ -1277,8 +1278,9 @@ class GraphGenerators():
+@@ -1280,8 +1281,9 @@ class GraphGenerators():
          .. [benzene] \G. Brinkmann, G. Caporossi and P. Hansen, A Constructive Enumeration of Fusenes and Benzenoids,
            Journal of Algorithms, 45:155-166, 2002.
          """
@@ -213,7 +213,7 @@ index 5919ab3..1766796 100644
              raise TypeError("the optional benzene package is not installed")
  
          # number of hexagons should be positive
-@@ -1430,8 +1432,9 @@ class GraphGenerators():
+@@ -1433,8 +1435,9 @@ class GraphGenerators():
          .. [plantri] \G. Brinkmann and B.D. McKay, Fast generation of planar graphs,
             MATCH-Communications in Mathematical and in Computer Chemistry, 58(2):323-357, 2007.
          """
@@ -225,7 +225,7 @@ index 5919ab3..1766796 100644
              raise TypeError("the optional plantri package is not installed")
  
          # number of vertices should be positive
-@@ -1629,8 +1632,9 @@ class GraphGenerators():
+@@ -1632,8 +1635,9 @@ class GraphGenerators():
              sage: [g.size() for g in graphs.triangulations(6, minimum_connectivity=3)] # optional plantri
              [12, 12]
          """
@@ -237,7 +237,7 @@ index 5919ab3..1766796 100644
              raise TypeError("the optional plantri package is not installed")
  
          # number of vertices should be positive
-@@ -1783,8 +1787,9 @@ class GraphGenerators():
+@@ -1786,8 +1790,9 @@ class GraphGenerators():
              sage: [len(g) for g in graphs.quadrangulations(12, no_nonfacial_quadrangles=True, dual=True)]  # optional plantri
              [10, 10]
          """
@@ -293,7 +293,7 @@ diff --git a/src/sage/groups/perm_gps/permgroup.py b/src/sage/groups/perm_gps/pe
 index e42db61..d4d5684 100644
 --- a/src/sage/groups/perm_gps/permgroup.py
 +++ b/src/sage/groups/perm_gps/permgroup.py
-@@ -143,7 +143,6 @@ from sage.groups.perm_gps.permgroup_element import PermutationGroupElement, stan
+@@ -145,7 +145,6 @@ from sage.groups.perm_gps.permgroup_element import PermutationGroupElement, stan
  from sage.groups.abelian_gps.abelian_group import AbelianGroup
  from sage.misc.cachefunc import cached_method
  from sage.groups.class_function import ClassFunction
@@ -301,7 +301,7 @@ index e42db61..d4d5684 100644
  from sage.sets.finite_enumerated_set import FiniteEnumeratedSet
  from sage.categories.all import FiniteEnumeratedSets
  from sage.groups.conjugacy_classes import ConjugacyClassGAP
-@@ -188,8 +187,6 @@ def hap_decorator(f):
+@@ -190,8 +189,6 @@ def hap_decorator(f):
      """
      @wraps(f)
      def wrapped(self, n, p=0):
@@ -310,7 +310,7 @@ index e42db61..d4d5684 100644
          load_hap()
          from sage.arith.all import is_prime
          if not (p == 0 or is_prime(p)):
-@@ -1681,9 +1678,7 @@ class PermutationGroup_generic(group.FiniteGroup):
+@@ -1683,9 +1680,7 @@ class PermutationGroup_generic(group.FiniteGroup):
          try:
              return [Integer(n) for n in self._gap_().IdGroup()]
          except RuntimeError:
@@ -321,7 +321,7 @@ index e42db61..d4d5684 100644
  
      def id(self):
          """
-@@ -1734,9 +1729,7 @@ class PermutationGroup_generic(group.FiniteGroup):
+@@ -1736,9 +1731,7 @@ class PermutationGroup_generic(group.FiniteGroup):
          try:
              return Integer(self._gap_().PrimitiveIdentification())
          except RuntimeError:
@@ -332,7 +332,7 @@ index e42db61..d4d5684 100644
  
      def center(self):
          """
-@@ -4112,8 +4105,6 @@ class PermutationGroup_generic(group.FiniteGroup):
+@@ -4114,8 +4107,6 @@ class PermutationGroup_generic(group.FiniteGroup):
          - David Joyner and Graham Ellis
  
          """
@@ -345,23 +345,23 @@ diff --git a/src/sage/misc/all.py b/src/sage/misc/all.py
 index 90e6985..21daeb0 100644
 --- a/src/sage/misc/all.py
 +++ b/src/sage/misc/all.py
-@@ -52,11 +52,6 @@ from fpickle import pickle_function, unpickle_function
+@@ -53,11 +53,6 @@ from fpickle import pickle_function, unpickle_function
  
- from dist import install_scripts
+ from .dist import install_scripts
  
--from package import (install_package,
+-from .package import (install_package,
 -        installed_packages, is_package_installed,
 -        standard_packages, optional_packages, experimental_packages,
 -        upgrade, package_versions)
 -
- from pager import pager
+ from .pager import pager
  
  lazy_import('sage.misc.sagedoc', ['browse_sage_doc',
 diff --git a/src/sage/rings/polynomial/multi_polynomial_sequence.py b/src/sage/rings/polynomial/multi_polynomial_sequence.py
 index da41cb0..49cae0b 100644
 --- a/src/sage/rings/polynomial/multi_polynomial_sequence.py
 +++ b/src/sage/rings/polynomial/multi_polynomial_sequence.py
-@@ -158,7 +158,6 @@ from sage.misc.cachefunc import cached_method
+@@ -159,7 +159,6 @@ from sage.misc.cachefunc import cached_method
  
  from types import GeneratorType
  from sage.misc.converting_dict import KeyConvertingDict
@@ -369,7 +369,7 @@ index da41cb0..49cae0b 100644
  
  from sage.structure.sequence import Sequence, Sequence_generic
  
-@@ -1428,10 +1427,11 @@ class PolynomialSequence_gf2(PolynomialSequence_generic):
+@@ -1429,10 +1428,11 @@ class PolynomialSequence_gf2(PolynomialSequence_generic):
  
          if S != []:
              if algorithm == "exhaustive_search":