zyppe/sagemath
1
0
Fork 0
mirror of https://src.fedoraproject.org/rpms/sagemath.git synced 2025-04-22 19:55:54 -04:00
Code Issues Projects Releases Packages Wiki Activity

Attempt 2 at fixing bundled ipython (bz 1832673).

Browse source
This commit is contained in:
Jerry James 2020-05-08 10:33:07 -06:00
parent 6b21278ce7
commit 20c8922c14
2 changed files with 5 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

9
sagemath-python3.patch
View file

@ -1,7 +1,7 @@
diff -up build/pkgs/ipython/src/IPython/core/interactiveshell.py.orig build/pkgs/ipython/src/IPython/core/interactiveshell.py 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.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 +++ 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: try:
for i, node in enumerate(to_run_exec): 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") code = compiler(mod, cell_name, "exec")
if self.run_code(code, result): if self.run_code(code, result):
return True 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 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.orig 2019-11-14 04:02:40.000000000 -0700
+++ build/pkgs/sagetex/src/extractsagecode.py 2020-02-25 13:42:46.674646884 -0700 +++ build/pkgs/sagetex/src/extractsagecode.py 2020-02-25 13:42:46.674646884 -0700

5
sagemath.spec
View file

@ -91,7 +91,7 @@
Name: sagemath Name: sagemath
Summary: A free open-source mathematics software system Summary: A free open-source mathematics software system
Version: 9.0 Version: 9.0
Release: 3%{?dist} Release: 4%{?dist}
# The file ${SAGE_ROOT}/COPYING.txt is the upstream license breakdown file # The file ${SAGE_ROOT}/COPYING.txt is the upstream license breakdown file
# Additionally, every $files section has a comment with the license name # Additionally, every $files section has a comment with the license name
# before files with that license # before files with that license
@ -1814,6 +1814,9 @@ rm -fr %{SAGE_LOCAL}/var/lib/sage/installed/database_cremona_ellcurve-%{cremona_
######################################################################## ########################################################################
%changelog %changelog
* Fri May 8 2020 Jerry James <loganjerry@gmail.com> - 9.0-4
- Attempt 2 at fixing bundled ipython (bz 1832673)
* Thu May 7 2020 Jerry James <loganjerry@gmail.com> - 9.0-3 * Thu May 7 2020 Jerry James <loganjerry@gmail.com> - 9.0-3
- Fix bundled ipython incompatibility with python 3.8 (bz 1832673) - Fix bundled ipython incompatibility with python 3.8 (bz 1832673)