diff options
| author | Сухарик <65870+suhr@users.noreply.github.com> | 2021-01-06 20:10:30 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-01-06 17:10:30 +0000 |
| commit | 4746e1717f082663813861046c2774f395402bda (patch) | |
| tree | aed4e2cbb7ffd449f1ca244058a4762a4797ca35 /pkgs/applications/science/math/sage | |
| parent | 313816590bc892a6427dfc27e629f892cbcfc5e7 (diff) | |
sympy: 1.6.2 -> 1.7.1 (#107663)
* sympy: 1.6.2 -> 1.7.1 * sage: adapt tests to sympy 1.7 Co-authored-by: Mauricio Collares <mauricio@collares.org>
Diffstat (limited to 'pkgs/applications/science/math/sage')
| -rw-r--r-- | pkgs/applications/science/math/sage/patches/sympy-1.7-update.patch | 25 | ||||
| -rw-r--r-- | pkgs/applications/science/math/sage/sage-src.nix | 3 |
2 files changed, 28 insertions, 0 deletions
diff --git a/pkgs/applications/science/math/sage/patches/sympy-1.7-update.patch b/pkgs/applications/science/math/sage/patches/sympy-1.7-update.patch new file mode 100644 index 0000000000000..1d21622a23543 --- /dev/null +++ b/pkgs/applications/science/math/sage/patches/sympy-1.7-update.patch @@ -0,0 +1,25 @@ +diff --git a/src/sage/interfaces/sympy.py b/src/sage/interfaces/sympy.py +index cc35a42a9f..6e577d5d8d 100644 +--- a/src/sage/interfaces/sympy.py ++++ b/src/sage/interfaces/sympy.py +@@ -397,7 +397,7 @@ def _sympysage_rf(self): + sage: from sympy import Symbol, rf + sage: _ = var('x, y') + sage: rfxy = rf(Symbol('x'), Symbol('y')) +- sage: assert rising_factorial(x,y)._sympy_() == rfxy.rewrite('gamma') ++ sage: assert rising_factorial(x,y)._sympy_() == rfxy.rewrite('gamma', piecewise=False) + sage: assert rising_factorial(x,y) == rfxy._sage_() + """ + from sage.arith.all import rising_factorial +diff --git a/src/sage/symbolic/expression.pyx b/src/sage/symbolic/expression.pyx +index 7c18ec1efa..c2619ac42d 100644 +--- a/src/sage/symbolic/expression.pyx ++++ b/src/sage/symbolic/expression.pyx +@@ -955,6 +955,6 @@ cdef class Expression(CommutativeRingElement): + sage: unicode_art(13 - I) + 13 - ⅈ + sage: unicode_art(1.3 - I) +- 1.3 - 1.0⋅ⅈ ++ 1.3 - ⅈ + sage: unicode_art(cos(I)) + cosh(1) diff --git a/pkgs/applications/science/math/sage/sage-src.nix b/pkgs/applications/science/math/sage/sage-src.nix index 8948621a025a8..b8fb41596607d 100644 --- a/pkgs/applications/science/math/sage/sage-src.nix +++ b/pkgs/applications/science/math/sage/sage-src.nix @@ -103,6 +103,9 @@ stdenv.mkDerivation rec { # adapt sage's Image class to pillow 8.0.1 (https://trac.sagemath.org/ticket/30971) ./patches/pillow-update.patch + + # fix test output with sympy 1.7 (https://trac.sagemath.org/ticket/30985) + ./patches/sympy-1.7-update.patch ]; patches = nixPatches ++ bugfixPatches ++ packageUpgradePatches; |