git.iko.soy/typeable/nixpkgs
on master help sign in
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>

commit4746e1717f082663813861046c2774f395402bda authorСухарик <65870+suhr@users.noreply.github.com> dateWed 6 Jan 2021, 20:10 (6 years ago) parent3138165
3 files changed+30−2
pkgs/applications/science/math/sage/patches/sympy-1.7-update.patch+25 pkgs/applications/science/math/sage/sage-src.nix+3 pkgs/development/python-modules/sympy/default.nix+2−2
pkgs/applications/science/math/sage/patches/sympy-1.7-update.patchnew file+25
@@ -0,0 +1,25 @@
1+diff --git a/src/sage/interfaces/sympy.py b/src/sage/interfaces/sympy.py
2+index cc35a42a9f..6e577d5d8d 100644
3+--- a/src/sage/interfaces/sympy.py
4++++ b/src/sage/interfaces/sympy.py
5+@@ -397,7 +397,7 @@ def _sympysage_rf(self):
6+ sage: from sympy import Symbol, rf
7+ sage: _ = var('x, y')
8+ sage: rfxy = rf(Symbol('x'), Symbol('y'))
9+- sage: assert rising_factorial(x,y)._sympy_() == rfxy.rewrite('gamma')
10++ sage: assert rising_factorial(x,y)._sympy_() == rfxy.rewrite('gamma', piecewise=False)
11+ sage: assert rising_factorial(x,y) == rfxy._sage_()
12+ """
13+ from sage.arith.all import rising_factorial
14+diff --git a/src/sage/symbolic/expression.pyx b/src/sage/symbolic/expression.pyx
15+index 7c18ec1efa..c2619ac42d 100644
16+--- a/src/sage/symbolic/expression.pyx
17++++ b/src/sage/symbolic/expression.pyx
18+@@ -955,6 +955,6 @@ cdef class Expression(CommutativeRingElement):
19+ sage: unicode_art(13 - I)
20+ 13 - ⅈ
21+ sage: unicode_art(1.3 - I)
22+- 1.3 - 1.0⋅ⅈ
23++ 1.3 - ⅈ
24+ sage: unicode_art(cos(I))
25+ cosh(1)
pkgs/applications/science/math/sage/sage-src.nix+3
@@ -103,6 +103,9 @@ stdenv.mkDerivation rec {
103103
104104 # adapt sage's Image class to pillow 8.0.1 (https://trac.sagemath.org/ticket/30971)
105105 ./patches/pillow-update.patch
106+
107+ # fix test output with sympy 1.7 (https://trac.sagemath.org/ticket/30985)
108+ ./patches/sympy-1.7-update.patch
106109 ];
107110
108111 patches = nixPatches ++ bugfixPatches ++ packageUpgradePatches;
pkgs/development/python-modules/sympy/default.nix+2−2
@@ -8,11 +8,11 @@
88
99buildPythonPackage rec {
1010 pname = "sympy";
11− version = "1.6.2";
11+ version = "1.7.1";
1212
1313 src = fetchPypi {
1414 inherit pname version;
15− sha256 = "1cfadcc80506e4b793f5b088558ca1fcbeaec24cd6fc86f1fdccaa3ee1d48708";
15+ sha256 = "sha256-o96SYel1Nbg7uGB7DaLH0DEmZQ+v6isniWV7Ipwkay4=";
1616 };
1717
1818 checkInputs = [ glibcLocales ];