Bump min sympy version to 1.7

Author: rocky

mathics/builtin/arithmetic.py

@@ -1874,7 +1874,7 @@ class Sum(_IterationFunction, SympyFunction):
      = 0
 
     >> (-1 + a^n) Sum[a^(k n), {k, 0, m-1}] // Simplify
-     = Piecewise[{{m (-1 + a ^ n), a ^ n == 1}, {-1 + (a ^ n) ^ m, True}}]
+     = -1 + (a ^ n) ^ m
 
     Infinite sums:
     >> Sum[1 / 2 ^ i, {i, 1, Infinity}]

mathics/builtin/linalg.py

@@ -58,24 +58,24 @@ class Tr(Builtin):
     <dt>'Tr[$m$]'
         <dd>computes the trace of the matrix $m$.
     </dl>
-    
+
     >> Tr[{{1, 2, 3}, {4, 5, 6}, {7, 8, 9}}]
      = 15
-    
+
     Symbolic trace:
     >> Tr[{{a, b, c}, {d, e, f}, {g, h, i}}]
      = a + e + i
     """
-    
+
     messages = {
         'matsq': "The matrix `1` is not square."
     }
-    
+
     #TODO: generalize to vectors and higher-rank tensors, and allow function arguments for application
-    
+
     def apply(self, m, evaluation):
         'Tr[m_]'
-        
+
         matrix = to_sympy_matrix(m)
         if matrix is None or matrix.cols != matrix.rows or matrix.cols == 0:
             return evaluation.message('Tr', 'matsq', m)
@@ -701,7 +701,7 @@ class Eigenvalues(Builtin):
      = {-1, 1, 2}
 
     >> Eigenvalues[{{Cos[theta],Sin[theta],0},{-Sin[theta],Cos[theta],0},{0,0,1}}] // Sort
-     = {1, Cos[theta] + Sqrt[-1 + Cos[theta] ^ 2], Cos[theta] - Sqrt[-1 + Cos[theta] ^ 2]}
+     = {1, Cos[theta] + Sqrt[(-1 + Cos[theta]) (1 + Cos[theta])], Cos[theta] - Sqrt[(-1 + Cos[theta]) (1 + Cos[theta])]}
 
     >> Eigenvalues[{{7, 1}, {-4, 3}}]
      = {5, 5}
@@ -731,7 +731,7 @@ def apply(self, m, evaluation):
             eigenvalues.sort(key=lambda v: (abs(v[0]), - re(v[0]), - im(v[0])),
                              reverse=True)
 
-            eigenvalues = [from_sympy(v) for (v, c) in eigenvalues 
+            eigenvalues = [from_sympy(v) for (v, c) in eigenvalues
                            for _ in range(c)]
         # Sort the eigenvalues in an arbitrary yet deterministic order
         else:

mathics/builtin/numbertheory.py

@@ -294,7 +294,7 @@ class Divisors(Builtin):
 
     # TODO: support GaussianIntegers
     # e.g. Divisors[2, GaussianIntegers -> True]
-    
+
     attributes = ('Listable',)
 
     def apply(self, n, evaluation):
@@ -369,102 +369,102 @@ class MantissaExponent(Builtin):
 
     >> MantissaExponent[125., 2]
      = {0.976563, 7}
-      
+
     >> MantissaExponent[10, b]
      = MantissaExponent[10, b]
-     
+
     #> MantissaExponent[E, Pi]
      = {E / Pi, 1}
-     
+
     #> MantissaExponent[Pi, Pi]
      = {1 / Pi, 2}
-     
+
     #> MantissaExponent[5/2 + 3, Pi]
      = {11 / (2 Pi ^ 2), 2}
-     
+
     #> MantissaExponent[b]
      = MantissaExponent[b]
-     
+
     #> MantissaExponent[17, E]
      = {17 / E ^ 3, 3}
-     
+
     #> MantissaExponent[17., E]
      = {0.84638, 3}
-     
+
     #> MantissaExponent[Exp[Pi], 2]
      = {E ^ Pi / 32, 5}
-     
+
     #> MantissaExponent[3 + 2 I, 2]
      : The value 3 + 2 I is not a real number
      = MantissaExponent[3 + 2 I, 2]
-     
+
     #> MantissaExponent[25, 0.4]
      : Base 0.4 is not a real number greater than 1.
      = MantissaExponent[25, 0.4]
-     
+
     #> MantissaExponent[0.0000124]
      = {0.124, -4}
-    
+
     #> MantissaExponent[0.0000124, 2]
      = {0.812646, -16}
-    
+
     #> MantissaExponent[0]
      = {0, 0}
-     
+
     #> MantissaExponent[0, 2]
      = {0, 0}
     """
-    
+
     attributes = ('Listable',)
-    
+
     rules = {
         'MantissaExponent[0]': '{0, 0}',
         'MantissaExponent[0, n_]': '{0, 0}',
         }
-    
+
     messages = {
         'realx': 'The value `1` is not a real number',
         'rbase': 'Base `1` is not a real number greater than 1.',
     }
-    
+
     def apply(self, n, b, evaluation):
         'MantissaExponent[n_, b_]'
         # Handle Input with special cases such as PI and E
         n_sympy, b_sympy = n.to_sympy(), b.to_sympy()
-        
+
         expr = Expression('MantissaExponent', n, b)
-        
+
         if isinstance(n.to_python(), complex):
             evaluation.message('MantissaExponent', 'realx', n)
             return expr
-         
+
         if n_sympy.is_constant():
             temp_n = Expression('N', n).evaluate(evaluation)
             py_n = temp_n.to_python()
         else:
             return expr
-              
+
         if b_sympy.is_constant():
             temp_b = Expression('N', b).evaluate(evaluation)
             py_b = temp_b.to_python()
         else:
             return expr
-        
+
         if not py_b > 1:
             evaluation.message('MantissaExponent', 'rbase', b)
             return expr
-            
+
         base_exp = int(mpmath.log(py_n, py_b))
-        
+
         exp = (base_exp + 1) if base_exp >= 0 else base_exp
 
         return Expression('List', Expression('Divide', n , b ** exp), exp)
-                                 
+
     def apply_2(self, n, evaluation):
         'MantissaExponent[n_]'
         n_sympy = n.to_sympy()
         expr = Expression('MantissaExponent', n)
-        
+
         if isinstance(n.to_python(), complex):
             evaluation.message('MantissaExponent', 'realx', n)
             return expr
@@ -474,12 +474,12 @@ def apply_2(self, n, evaluation):
             py_n = temp_n.to_python()
         else:
             return expr
-        
-        base_exp = int(mpmath.log10(py_n))    
+
+        base_exp = int(mpmath.log10(py_n))
         exp = (base_exp + 1) if base_exp >= 0 else base_exp
-         
+
         return Expression('List', Expression('Divide', n , (10 ** exp)), exp)
-    
+
 def _fractional_part(self, n, expr, evaluation):
     n_sympy = n.to_sympy()
     if n_sympy.is_constant():
@@ -491,9 +491,9 @@ def _fractional_part(self, n, expr, evaluation):
             result = n - negative_integer_part
     else:
         return expr
-        
+
     return from_python(result)
-    
+
 class FractionalPart(Builtin):
     """
     <dl>
@@ -509,34 +509,34 @@ class FractionalPart(Builtin):
 
     #> FractionalPart[b]
      = FractionalPart[b]
-    
+
     #> FractionalPart[{-2.4, -2.5, -3.0}]
      = {-0.4, -0.5, 0.}
-    
+
     #> FractionalPart[14/32]
      = 7 / 16
-      
+
     #> FractionalPart[4/(1 + 3 I)]
      = 2 / 5 - I / 5
-     
+
     #> FractionalPart[Pi^20]
      = -8769956796 + Pi ^ 20
     """
-    
+
     attributes = ('Listable', 'NumericFunction', 'ReadProtected')
-  
+
     def apply(self, n, evaluation):
         'FractionalPart[n_]'
         expr = Expression('FractionalPart', n)
         return _fractional_part(self.__class__.__name__, n, expr, evaluation)
-        
+
     def apply_2(self, n, evaluation):
         'FractionalPart[n_Complex]'
         expr = Expression('FractionalPart', n)
         n_real  = Expression("Re", n).evaluate(evaluation)
         n_image  = Expression("Im", n).evaluate(evaluation)
-        
-        real_fractional_part = _fractional_part(self.__class__.__name__, n_real, expr, evaluation) 
+
+        real_fractional_part = _fractional_part(self.__class__.__name__, n_real, expr, evaluation)
         image_fractional_part = _fractional_part(self.__class__.__name__, n_image, expr, evaluation)
         return Expression('Complex', real_fractional_part, image_fractional_part)
 
@@ -634,7 +634,7 @@ class CoprimeQ(Builtin):
      = True
 
     >> CoprimeQ[4+2I, 6+3I]
-     = False
+     = True
 
     >> CoprimeQ[2, 3, 5]
      = True
@@ -964,4 +964,3 @@ def apply(self, m, n, evaluation):
             return Expression('List', Integer(py_m // py_n), (py_m % py_n))
         else:
             return Expression('QuotientRemainder', m, n)
-

setup.py

@@ -80,7 +80,7 @@ def read(*rnames):
 
 # General Requirements
 INSTALL_REQUIRES += [
-    "sympy>=1.6, < 1.7",
+    "sympy>=1.7, <= 1.8dev",
     "django >= 3.0, < 3.2",
     "mpmath>=1.1.0",
     "numpy",