From 6b21278ce7b9a278b340a3eb403755b9acff694b Mon Sep 17 00:00:00 2001 From: Jerry James Date: Thu, 7 May 2020 09:24:24 -0600 Subject: [PATCH] Fix bundled ipython incompatibility with python 3.8 (bz 1832673). --- sagemath-python3.patch | 19 +++++++++++++++++++ sagemath.spec | 5 ++++- 2 files changed, 23 insertions(+), 1 deletion(-) diff --git a/sagemath-python3.patch b/sagemath-python3.patch index 36a73fd..b4b848d 100644 --- a/sagemath-python3.patch +++ b/sagemath-python3.patch @@ -1,3 +1,22 @@ +diff -up build/pkgs/ipython/src/IPython/core/interactiveshell.py.orig build/pkgs/ipython/src/IPython/core/interactiveshell.py +--- build/pkgs/ipython/src/IPython/core/interactiveshell.py.orig 2018-07-28 18:24:17.000000000 -0600 ++++ build/pkgs/ipython/src/IPython/core/interactiveshell.py 2020-05-07 09:19:44.916646996 -0600 +@@ -2813,13 +2813,13 @@ class InteractiveShell(SingletonConfigur + + try: + for i, node in enumerate(to_run_exec): +- mod = ast.Module([node]) ++ mod = ast.Module([node], []) + code = compiler(mod, cell_name, "exec") + if self.run_code(code, result): + return True + + for i, node in enumerate(to_run_interactive): +- mod = ast.Interactive([node]) ++ mod = ast.Interactive([node], []) + code = compiler(mod, cell_name, "single") + if self.run_code(code, result): + return True diff -up build/pkgs/sagetex/src/extractsagecode.py.orig build/pkgs/sagetex/src/extractsagecode.py --- build/pkgs/sagetex/src/extractsagecode.py.orig 2019-11-14 04:02:40.000000000 -0700 +++ build/pkgs/sagetex/src/extractsagecode.py 2020-02-25 13:42:46.674646884 -0700 diff --git a/sagemath.spec b/sagemath.spec index 47096fb..bb4deb4 100644 --- a/sagemath.spec +++ b/sagemath.spec @@ -91,7 +91,7 @@ Name: sagemath Summary: A free open-source mathematics software system Version: 9.0 -Release: 2%{?dist} +Release: 3%{?dist} # The file ${SAGE_ROOT}/COPYING.txt is the upstream license breakdown file # Additionally, every $files section has a comment with the license name # before files with that license @@ -1814,6 +1814,9 @@ rm -fr %{SAGE_LOCAL}/var/lib/sage/installed/database_cremona_ellcurve-%{cremona_ ######################################################################## %changelog +* Thu May 7 2020 Jerry James - 9.0-3 +- Fix bundled ipython incompatibility with python 3.8 (bz 1832673) + * Fri Mar 13 2020 Jerry James - 9.0-2 - Rebuild for gap 4.11.0 - Update libgap interface for gap 4.11.0