Volker Braun avatar Volker Braun committed 2a82e56

last sage-5.9.beta5

Comments (0)

Files changed (4)

+m4rie_new_version.patch
+trac_14423_python_274.patch
+trac_14187_lazy_import_test.patch
+trac_14014_libgap_cyclotomic_matrix.patch
+trac_14014_deletions.patch
+trac_14014_parents_for_matrix_groups.patch
+trac_14014_parents_group_dependents.patch
+trac_14014_iterator.patch
+trac_14039_doctest_fixes.patch
 trac_14319.patch
 trac_14319-from_list_to_domain.patch
 trac_14319_fix_fan_isomorphism.patch
 trac_14319-empty.patch
-m4rie_new_version.patch
 trac_14203_doctest.patch
 trac_14466_fix_type_repr.patch
-trac_14423_python_274.patch
 trac_14159_weak_value_triple_dict.patch
 trac_14159_use_cdef_get.patch
 trac_14486_set_coercion.patch
 trac_14394_face_fan_bug.patch
 trac_14394_reviewer.patch
 trac_14375_ansi_escapes_indication.2.patch
-trac_14187_lazy_import_test.patch
-trac_14014_libgap_cyclotomic_matrix.patch
-trac_14014_deletions.patch
-trac_14014_parents_for_matrix_groups.patch
-trac_14014_parents_group_dependents.patch
-trac_14014_iterator.patch
 trac_12892_orbit_closure_morphism.patch
 trac_12892_toric_morphism_fibers.patch
 trac_12892_toric_morphism_divisors.patch

trac_14014_parents_group_dependents.patch

 # HG changeset patch
-# Parent f15bc2bb8c0ea2a83128192774f207b10c697ed5
+# Parent 6fe673868bccd9c7db14af10b6217b52628acb92
 
 Source files outside of sage.groups that need to be changed to match
 the new matrix groups.
 diff --git a/sage/matrix/matrix2.pyx b/sage/matrix/matrix2.pyx
 --- a/sage/matrix/matrix2.pyx
 +++ b/sage/matrix/matrix2.pyx
-@@ -7076,6 +7076,8 @@
+@@ -7112,6 +7112,8 @@
              [0 0 0 1 0]
              sage: P.is_unitary()
              True
  
          A square matrix far from unitary. ::
  
-@@ -7092,7 +7094,10 @@
+@@ -7128,7 +7130,10 @@
          import sage.matrix.constructor
          if not self.is_square():
              return False
 diff --git a/sage/misc/cachefunc.pyx b/sage/misc/cachefunc.pyx
 --- a/sage/misc/cachefunc.pyx
 +++ b/sage/misc/cachefunc.pyx
-@@ -1094,6 +1094,7 @@
+@@ -1173,6 +1173,7 @@
              Pickle of the cached method "groebner_basis"
          """
          return 'Pickle of the cached method "%s"'%self._name
      def __reduce__(self):
          """
          This class is a pickle. However, sometimes, pickles
-@@ -1101,43 +1102,30 @@
+@@ -1180,43 +1181,30 @@
  
          TEST::
  
      def __call__(self,*args,**kwds):
          """
          The purpose of this call method is to kill ``self`` and to
-diff --git a/sage/misc/dev_tools.py b/sage/misc/dev_tools.py
---- a/sage/misc/dev_tools.py
-+++ b/sage/misc/dev_tools.py
-@@ -139,8 +139,8 @@
-     In principle, the function should also work on object which are instances.
-     In case of ambiguity, one or two warning lines are printed::
- 
--        sage: import_statements(NN)
--        from sage.rings.semirings.non_negative_integer_semiring import NN
-+        sage: import_statements(RDF)
-+        from sage.rings.real_double import RDF
- 
-         sage: import_statements(ZZ)
-           ** Warning **: several names for that object: ZZ, Z
 diff --git a/sage/modular/arithgroup/arithgroup_perm.py b/sage/modular/arithgroup/arithgroup_perm.py
 --- a/sage/modular/arithgroup/arithgroup_perm.py
 +++ b/sage/modular/arithgroup/arithgroup_perm.py
 diff --git a/sage/rings/number_field/number_field.py b/sage/rings/number_field/number_field.py
 --- a/sage/rings/number_field/number_field.py
 +++ b/sage/rings/number_field/number_field.py
-@@ -7752,6 +7752,21 @@
+@@ -7768,6 +7768,21 @@
          """
          return 'CyclotomicField(%s)'%self.__n
  

trac_14039_doctest_fixes.patch

+# HG changeset patch
+# User Volker Braun <vbraun@stp.dias.ie>
+# Date 1362890841 18000
+# Node ID 73c9a0d8add0ac0e5d8d8550e61b2e980a1d6067
+# Parent 7d947dd3281949e142325d995e0ce2a1b08e9d69
+Updated doctests for GAP-4.6.2
+
+diff --git a/sage/algebras/group_algebra_new.py b/sage/algebras/group_algebra_new.py
+--- a/sage/algebras/group_algebra_new.py
++++ b/sage/algebras/group_algebra_new.py
+@@ -592,8 +592,8 @@
+             sage: GroupAlgebra(DihedralGroup(6), QQ).random_element()
+             -1/95*(2,6)(3,5) - 1/2*(1,3)(4,6)
+             sage: GroupAlgebra(SU(2, 13), QQ).random_element(1)
+-            1/2*[      12 12*a + 7]
+-            [   a + 6        7]
++            1/2*[      11    a + 6]
++            [2*a + 12       11]
+         """
+         a = self(0)
+         for i in range(n):
+diff --git a/sage/groups/finitely_presented.py b/sage/groups/finitely_presented.py
+--- a/sage/groups/finitely_presented.py
++++ b/sage/groups/finitely_presented.py
+@@ -7,7 +7,7 @@
+     sage: F.<a,b,c> = FreeGroup()
+     sage: G = F / [a^2, b^2, c^2, a*b*c*a*b*c]
+     sage: G
+-    Finitely presented group < a, b, c | a^2, b^2, c^2, a*b*c*a*b*c >
++    Finitely presented group < a, b, c | a^2, b^2, c^2, (a*b*c)^2 >
+ 
+ One can create their elements by mutiplying the generators or by
+ specifying a Tietze list (see
+@@ -23,7 +23,7 @@
+     sage: G.inject_variables()
+     Defining a, b, c
+     sage: a.parent()
+-    Finitely presented group < a, b, c | a^2, b^2, c^2, a*b*c*a*b*c >
++    Finitely presented group < a, b, c | a^2, b^2, c^2, (a*b*c)^2 >
+ 
+ Notice that, even if they are represented in the same way, the
+ elements of a finitely presented group and the elements of the
+diff --git a/sage/groups/libgap_wrapper.pyx b/sage/groups/libgap_wrapper.pyx
+--- a/sage/groups/libgap_wrapper.pyx
++++ b/sage/groups/libgap_wrapper.pyx
+@@ -637,7 +637,7 @@
+             sage: y^(2) # indirect doctest
+             b^3*a^2*b^-3
+             sage: x^(-3) # indirect doctest
+-            b*a*b^-1*a^-1*b*a*b^-1*a^-1*b*a*b^-1*a^-1
++            (b*a*b^-1*a^-1)^3
+             sage: y^3  ==  y.__pow__(3)
+             True
+         """
+diff --git a/sage/groups/perm_gps/permgroup.py b/sage/groups/perm_gps/permgroup.py
+--- a/sage/groups/perm_gps/permgroup.py
++++ b/sage/groups/perm_gps/permgroup.py
+@@ -1905,9 +1905,11 @@
+             sage: alpha = PermutationGroupMorphism_im_gens(C8,C8,[(1,8,7,6,5,4,3,2)])
+             sage: S = C2.semidirect_product(C8,[[(1,2)],[alpha]])
+             sage: S == DihedralGroup(8)
++            False
++            sage: S.is_isomorphic(DihedralGroup(8))
+             True
+             sage: S.gens()
+-            [(2,8)(3,7)(4,6), (1,2,3,4,5,6,7,8)]
++            [(3,4,5,6,7,8,9,10), (1,2)(4,10)(5,9)(6,8)]
+ 
+         A more complicated example can be drawn from [THOMAS-WOODS]_.
+         It is there given that a semidirect product of $D_4$ and $C_3$
+@@ -1934,7 +1936,8 @@
+             sage: S1.is_isomorphic(DiCyclicGroup(6))
+             False
+             sage: S1.center()
+-            Subgroup of (Permutation Group with generators [(4,6), (2,3)(4,5,6,7), (1,2,3)]) generated by [(4,6)(5,7)]
++            Subgroup of (Permutation Group with generators 
++            [(5,6,7), (1,2,3,4)(6,7), (1,3)]) generated by [(1,3)(2,4)]
+             sage: len(S1.conjugacy_classes_representatives())
+             9
+ 
+@@ -2030,9 +2033,10 @@
+             sage: A.is_abelian()
+             False
+             sage: A.center()
+-            Subgroup of (Permutation Group with generators [(2,3,5,4), (1,2,3,4,5)]) generated by [()]
++            Subgroup of (Permutation Group with generators 
++            [(5,6,7,8,9), (1,2,4,3)(6,7,9,8)]) generated by [()]
+             sage: A
+-            Permutation Group with generators [(2,3,5,4), (1,2,3,4,5)]
++            Permutation Group with generators [(5,6,7,8,9), (1,2,4,3)(6,7,9,8)]
+ 
+         Noting that the automorphism group of `D_4` is itself `D_4`, it
+         can easily be shown that the holomorph is indeed an internal
+diff --git a/sage/interfaces/gap.py b/sage/interfaces/gap.py
+--- a/sage/interfaces/gap.py
++++ b/sage/interfaces/gap.py
+@@ -858,7 +858,7 @@
+         EXAMPLES::
+         
+             sage: gap.version()
+-            '4.5.7'
++            '4.6.3'
+         """
+         return self.eval('VERSION')[1:-1]
+ 
+@@ -1819,7 +1819,7 @@
+         sage: gap_version()
+         doctest:...: DeprecationWarning: use gap.version() instead
+         See http://trac.sagemath.org/13211 for details.
+-        '4.5.7'
++        '4.6.3'
+     """
+     from sage.misc.superseded import deprecation
+     deprecation(13211, 'use gap.version() instead')

trac_14486_set_coercion.patch

      """
      def __init__(self, X):
          """
-@@ -206,6 +213,10 @@
+@@ -205,7 +212,20 @@
+         
              sage: type(Set(QQ))
              <class 'sage.sets.set.Set_object_with_category'>
++
++        TESTS::
++
++            sage: _a, _b = get_coercion_model().canonical_coercion(Set([0]), 0)
++            Traceback (most recent call last):
++            ...
++            TypeError: no common canonical parent for objects with parents:
++            '<class 'sage.sets.set.Set_object_enumerated_with_category'>'
++            and 'Integer Ring'
          """
 +        from sage.rings.integer import is_Integer
-+        if is_Integer(X):  
++        if isinstance(X, (int,long)) or is_Integer(X):  
 +            # The coercion model will try to call Set_object(0)
 +            raise ValueError('underlying object cannot be an integer')
          Parent.__init__(self, category=Sets())
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.