1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
|
diff --git a/build/pkgs/sympy/checksums.ini b/build/pkgs/sympy/checksums.ini
index 1b98ad8879..e5b80927ab 100644
--- a/build/pkgs/sympy/checksums.ini
+++ b/build/pkgs/sympy/checksums.ini
@@ -1,4 +1,5 @@
tarball=sympy-VERSION.tar.gz
-sha1=be2e740860f7900f0ee2a8102d2943fded44125c
-md5=fa9ad424535075312df022964ede21bc
-cksum=3298250000
+sha1=067078df2d0401f3c4b49ee2e50a4105f92c5272
+md5=dbb7b21d2972c41f37d48f744b6189a3
+cksum=575244204
+upstream_url=https://github.com/sympy/sympy/releases/download/sympy-VERSION/sympy-VERSION.tar.gz
diff --git a/build/pkgs/sympy/package-version.txt b/build/pkgs/sympy/package-version.txt
index c239c60cba..810ee4e91e 100644
--- a/build/pkgs/sympy/package-version.txt
+++ b/build/pkgs/sympy/package-version.txt
@@ -1 +1 @@
-1.5
+1.6
diff --git a/src/sage/calculus/test_sympy.py b/src/sage/calculus/test_sympy.py
index 9fb9358cb2..86f9366704 100644
--- a/src/sage/calculus/test_sympy.py
+++ b/src/sage/calculus/test_sympy.py
@@ -109,7 +109,7 @@ And here are some actual tests of sympy::
sage: e = (1/cos(x)^3)._sympy_(); e
cos(x)**(-3)
- sage: f = e.series(x, 0, 10); f
+ sage: f = e.series(x, 0, int(10)); f
1 + 3*x**2/2 + 11*x**4/8 + 241*x**6/240 + 8651*x**8/13440 + O(x**10)
And the pretty-printer. Since unicode characters are not working on
diff --git a/src/sage/manifolds/calculus_method.py b/src/sage/manifolds/calculus_method.py
index 7042afe77a..a658551ee9 100644
--- a/src/sage/manifolds/calculus_method.py
+++ b/src/sage/manifolds/calculus_method.py
@@ -65,7 +65,7 @@ def _SR_to_Sympy(expression):
"""
# Nothing to do if expression is already a SymPy object:
- if type(expression) in sympy.core.all_classes:
+ if type(expression) in sympy.core.core.all_classes:
return expression
return SR(expression)._sympy_()
diff --git a/src/sage/symbolic/relation.py b/src/sage/symbolic/relation.py
index 028f628797..d252434d52 100644
--- a/src/sage/symbolic/relation.py
+++ b/src/sage/symbolic/relation.py
@@ -914,7 +914,8 @@ def solve(f, *args, **kwds):
print them::
sage: solve(sinh(x) - 2*cosh(x),x,algorithm='sympy')
- ConditionSet(x, Eq((-exp(2*x) - 3)*exp(-x)/2, 0), Reals)
+ [ImageSet(Lambda(_n, I*(2*_n*pi + pi/2) + log(sqrt(3))), Integers),
+ ImageSet(Lambda(_n, I*(2*_n*pi - pi/2) + log(sqrt(3))), Integers)]
sage: solve(2*sin(x) - 2*sin(2*x), x,algorithm='sympy')
[ImageSet(Lambda(_n, 2*_n*pi), Integers),
ImageSet(Lambda(_n, 2*_n*pi + pi), Integers),
|