diff --git a/sagemath-python3.patch b/sagemath-python3.patch index b4b848d..563fca6 100644 --- a/sagemath-python3.patch +++ b/sagemath-python3.patch @@ -1,7 +1,7 @@ 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 +@@ -2813,7 +2813,7 @@ class InteractiveShell(SingletonConfigur try: for i, node in enumerate(to_run_exec): @@ -10,13 +10,6 @@ diff -up build/pkgs/ipython/src/IPython/core/interactiveshell.py.orig build/pkgs 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 d28ad9d..206a063 100644 --- a/sagemath.spec +++ b/sagemath.spec @@ -94,7 +94,7 @@ Name: sagemath Summary: A free open-source mathematics software system Version: 9.0 -Release: 4%{?dist} +Release: 5%{?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 @@ -1825,6 +1825,9 @@ rm -fr %{SAGE_LOCAL}/var/lib/sage/installed/database_cremona_ellcurve-%{cremona_ ######################################################################## %changelog +* Fri May 8 2020 Jerry James - 9.0-5 +- Attempt 2 at fixing bundled ipython (bz 1832673) + * Thu May 7 2020 Jerry James - 9.0-4 - Fix bundled ipython incompatibility with python 3.8 (bz 1832673)