From 01c4c8ffcbdecf210c7d8a4214ec631aa4f8e2e8 Mon Sep 17 00:00:00 2001 From: Matthias Koeppe Date: Sat, 27 Jul 2024 20:21:22 -0700 Subject: [PATCH 1/4] Update doctests for SymPy 1.13 --- src/sage/doctest/forker.py | 13 +++++++------ src/sage/functions/hypergeometric.py | 2 +- src/sage/typeset/ascii_art.py | 9 +++++---- 3 files changed, 13 insertions(+), 11 deletions(-) diff --git a/src/sage/doctest/forker.py b/src/sage/doctest/forker.py index 823a0d14a41..de1c8531814 100644 --- a/src/sage/doctest/forker.py +++ b/src/sage/doctest/forker.py @@ -150,14 +150,15 @@ def init_sage(controller=None): sage: from sympy.printing.pretty.pretty import PrettyPrinter sage: s = sympify('+x^'.join(str(i) for i in range(30))) sage: print(PrettyPrinter(settings={'wrap_line': True}).doprint(s)) - 29 28 27 26 25 24 23 22 21 20 19 18 17 - x + x + x + x + x + x + x + x + x + x + x + x + x + + 29 28 27 26 25 24 23 22 21 20 19 18 17 ↪ + x + x + x + x + x + x + x + x + x + x + x + x + x + ↪ - 16 15 14 13 12 11 10 9 8 7 6 5 4 3 - x + x + x + x + x + x + x + x + x + x + x + x + x + x + x + ↪ 16 15 14 13 12 11 10 9 8 7 6 5 4 3 ↪ + ↪ x + x + x + x + x + x + x + x + x + x + x + x + x + x + ↪ - 2 - + x + ↪ 2 + ↪ x + x + The displayhook sorts dictionary keys to simplify doctesting of dictionary output:: diff --git a/src/sage/functions/hypergeometric.py b/src/sage/functions/hypergeometric.py index ade7836b310..eb5c6665c0d 100644 --- a/src/sage/functions/hypergeometric.py +++ b/src/sage/functions/hypergeometric.py @@ -124,7 +124,7 @@ sage: maxima(hypergeometric([1, 1, 1], [3, 3, 3], x)) # needs sage.symbolic hypergeometric([1,1,1],[3,3,3],_SAGE_VAR_x) sage: hypergeometric((5, 4), (4, 4), 3)._sympy_() # needs sympy sage.symbolic - hyper((5, 4), (4, 4), 3) + hyper((5,), (4,), 3) sage: hypergeometric((5, 4), (4, 4), 3)._mathematica_init_() # needs sage.symbolic 'HypergeometricPFQ[{5,4},{4,4},3]' diff --git a/src/sage/typeset/ascii_art.py b/src/sage/typeset/ascii_art.py index 83d92af8959..e470e2bd88d 100644 --- a/src/sage/typeset/ascii_art.py +++ b/src/sage/typeset/ascii_art.py @@ -44,11 +44,12 @@ sage: shell.run_cell('%display ascii_art') sage: shell.run_cell("i = var('i')") # needs sage.symbolic sage: shell.run_cell('sum(factorial(i)*x^i, i, 0, 10)') # needs sage.symbolic - 10 9 8 7 6 5 4 3 - 3628800*x + 362880*x + 40320*x + 5040*x + 720*x + 120*x + 24*x + 6*x + 10 9 8 7 6 5 4 3 > + 3628800*x + 362880*x + 40320*x + 5040*x + 720*x + 120*x + 24*x + 6*x > - 2 - + 2*x + x + 1 + > 2 + > + 2*x + x + 1 + sage: shell.run_cell('3/(7*x)') # needs sage.symbolic 3 --- From 251769c02cfdeae3db6a188dfdc635134db4fb26 Mon Sep 17 00:00:00 2001 From: Matthias Koeppe Date: Thu, 18 Jul 2024 14:00:56 -0700 Subject: [PATCH 2/4] build/pkgs/sympy: Upgrade to 1.13.0 --- build/pkgs/sympy/checksums.ini | 4 ++-- build/pkgs/sympy/package-version.txt | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/pkgs/sympy/checksums.ini b/build/pkgs/sympy/checksums.ini index 30e67c20de6..ed52c00e979 100644 --- a/build/pkgs/sympy/checksums.ini +++ b/build/pkgs/sympy/checksums.ini @@ -1,4 +1,4 @@ tarball=sympy-VERSION-py3-none-any.whl -sha1=80fa00ab605295d61992ca3faa76771a62944527 -sha256=9b2cbc7f1a640289430e13d2a56f02f867a1da0190f2f99d8968c2f74da0e515 +sha1=a67a7b69ee85795f392e3872c59f9e4808f94cf7 +sha256=6b0b32a4673fb91bd3cac3b55406c8e01d53ae22780be467301cc452f6680c92 upstream_url=https://pypi.io/packages/py3/s/sympy/sympy-VERSION-py3-none-any.whl diff --git a/build/pkgs/sympy/package-version.txt b/build/pkgs/sympy/package-version.txt index f8f4f03b3dc..feaae22bac7 100644 --- a/build/pkgs/sympy/package-version.txt +++ b/build/pkgs/sympy/package-version.txt @@ -1 +1 @@ -1.12.1 +1.13.0 From 0c526db019b8456c697e3484c280858c7c0db74e Mon Sep 17 00:00:00 2001 From: Matthias Koeppe Date: Fri, 19 Jul 2024 02:44:25 -0700 Subject: [PATCH 3/4] build/pkgs/sympy: Update to 1.13.1 --- build/pkgs/sympy/checksums.ini | 4 ++-- build/pkgs/sympy/package-version.txt | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/pkgs/sympy/checksums.ini b/build/pkgs/sympy/checksums.ini index ed52c00e979..63ef86d1b73 100644 --- a/build/pkgs/sympy/checksums.ini +++ b/build/pkgs/sympy/checksums.ini @@ -1,4 +1,4 @@ tarball=sympy-VERSION-py3-none-any.whl -sha1=a67a7b69ee85795f392e3872c59f9e4808f94cf7 -sha256=6b0b32a4673fb91bd3cac3b55406c8e01d53ae22780be467301cc452f6680c92 +sha1=90e250f2b22eaf968f56a9ec52e71e69a6f8f0a9 +sha256=db36cdc64bf61b9b24578b6f7bab1ecdd2452cf008f34faa33776680c26d66f8 upstream_url=https://pypi.io/packages/py3/s/sympy/sympy-VERSION-py3-none-any.whl diff --git a/build/pkgs/sympy/package-version.txt b/build/pkgs/sympy/package-version.txt index feaae22bac7..b50dd27dd92 100644 --- a/build/pkgs/sympy/package-version.txt +++ b/build/pkgs/sympy/package-version.txt @@ -1 +1 @@ -1.13.0 +1.13.1 From 6fb81c3b7d75ba4a58569af8c677725ee99351e0 Mon Sep 17 00:00:00 2001 From: Matthias Koeppe Date: Mon, 12 Aug 2024 10:28:39 -0700 Subject: [PATCH 4/4] build/pkgs/sympy: Update to 1.13.2 --- build/pkgs/sympy/checksums.ini | 4 ++-- build/pkgs/sympy/package-version.txt | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/pkgs/sympy/checksums.ini b/build/pkgs/sympy/checksums.ini index 63ef86d1b73..17e31ea9f3d 100644 --- a/build/pkgs/sympy/checksums.ini +++ b/build/pkgs/sympy/checksums.ini @@ -1,4 +1,4 @@ tarball=sympy-VERSION-py3-none-any.whl -sha1=90e250f2b22eaf968f56a9ec52e71e69a6f8f0a9 -sha256=db36cdc64bf61b9b24578b6f7bab1ecdd2452cf008f34faa33776680c26d66f8 +sha1=e34c28a2aa2b677efe2f1b7cefe275e20d2e652c +sha256=c51d75517712f1aed280d4ce58506a4a88d635d6b5dd48b39102a7ae1f3fcfe9 upstream_url=https://pypi.io/packages/py3/s/sympy/sympy-VERSION-py3-none-any.whl diff --git a/build/pkgs/sympy/package-version.txt b/build/pkgs/sympy/package-version.txt index b50dd27dd92..61ce01b3011 100644 --- a/build/pkgs/sympy/package-version.txt +++ b/build/pkgs/sympy/package-version.txt @@ -1 +1 @@ -1.13.1 +1.13.2