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

Merge with master

Browse source
This commit is contained in:
pcpa 2015-07-25 19:08:59 -03:00
commit 221c045d4b
3 changed files with 98 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

13
sagemath-ipython3.patch Normal file
View file

@ -0,0 +1,13 @@
diff -up src/sage/repl/display/formatter.py.orig src/sage/repl/display/formatter.py
--- src/sage/repl/display/formatter.py.orig 2015-04-26 11:35:47.474617033 -0300
+++ src/sage/repl/display/formatter.py 2015-04-26 11:36:17.859618196 -0300
@@ -60,7 +60,8 @@ This other facility uses a simple
#*****************************************************************************
-from IPython.core.formatters import PlainTextFormatter, warn_format_error
+from IPython.core.formatters import PlainTextFormatter
+from IPython.core.formatters import catch_format_error as warn_format_error
from IPython.utils.py3compat import str_to_unicode, unicode_to_str
from sage.repl.display.pretty_print import (

53
sagemath-qepcad.patch Normal file
View file

@ -0,0 +1,53 @@
diff -up src/sage/interfaces/qepcad.py.orig src/sage/interfaces/qepcad.py
--- src/sage/interfaces/qepcad.py.orig 2015-07-19 15:07:33.423329719 -0300
+++ src/sage/interfaces/qepcad.py 2015-07-19 15:07:50.294330365 -0300
@@ -522,8 +522,8 @@ TESTS:
Check the qepcad configuration file::
- sage: open('%s/default.qepcadrc'%SAGE_LOCAL).readlines()[-1]
- 'SINGULAR .../local/bin\n'
+ sage: open('/usr/share/qepcad/default.qepcadrc').readlines()[-1]
+ 'SINGULAR /usr/bin\n'
AUTHORS:
@@ -550,6 +550,8 @@ from sage.repl.preparse import implicit_
from expect import Expect, ExpectFunction, AsciiArtString
+QEPCAD_LOCAL = "/usr/share/qepcad"
+
def _qepcad_cmd(memcells=None):
r"""
Construct a QEPCAD command line.
@@ -560,17 +562,17 @@ def _qepcad_cmd(memcells=None):
sage: from sage.interfaces.qepcad import _qepcad_cmd
sage: s = _qepcad_cmd()
- sage: s == 'env qe=%s qepcad '%SAGE_LOCAL
+ sage: s == 'env qe=/usr/share/qepcad qepcad '
True
sage: s = _qepcad_cmd(memcells=8000000)
- sage: s == 'env qe=%s qepcad +N8000000'%SAGE_LOCAL
+ sage: s == 'env qe=/usr/share/qepcad qepcad +N8000000'
True
"""
if memcells is not None:
memcells_arg = '+N%s' % memcells
else:
memcells_arg = ''
- return "env qe=%s qepcad %s"%(SAGE_LOCAL, memcells_arg)
+ return "env qe=%s qepcad %s"%(QEPCAD_LOCAL, memcells_arg)
_command_info_cache = None
@@ -595,7 +597,7 @@ def _update_command_info():
cache = {}
- with open('%s/bin/qepcad.help'%SAGE_LOCAL) as help:
+ with open('%s/bin/qepcad.help'%QEPCAD_LOCAL) as help:
assert(help.readline().strip() == '@')
while True:

38
sagemath.spec
View file

@ -42,7 +42,7 @@ Name: sagemath
Group: Applications/Engineering
Summary: A free open-source mathematics software system
Version: 6.5
Release: 2%{?dist}
Release: 7%{?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
@ -148,8 +148,15 @@ Patch23: %{name}-ntl.patch
# Temporary patch: http://trac.sagemath.org/ticket/17657
Patch24: %{name}-parallel.patch
# https://bugzilla.redhat.com/show_bug.cgi?id=1194941
Patch25: %{name}-ipython3.patch
# Fix a changed interface in NTL 9.x
Patch25: %{name}-ntl9.patch
Patch26: %{name}-ntl9.patch
# Correct unable to start QEPCAD within sage
# https://bugzilla.redhat.com/show_bug.cgi?id=1243590
Patch27: %{name}-qepcad.patch
BuildRequires: 4ti2
BuildRequires: atlas-devel
@ -211,8 +218,8 @@ BuildRequires: python-ipython
BuildRequires: python-matplotlib
BuildRequires: python-networkx
BuildRequires: python-sphinx
BuildRequires: python-twisted
BuildRequires: python-twisted-web
BuildRequires: python-twisted-web2
BuildRequires: polybori-devel
BuildRequires: R
BuildRequires: ratpoints-devel
@ -263,10 +270,11 @@ Requires: python-ipython
Requires: python-matplotlib
Requires: python-networkx
Requires: python-polybori
Requires: python-twisted
Requires: python-twisted-mail
Requires: python-twisted-web
Requires: python-twisted-web2
Requires: python-ZODB3
Requires: qepcad-B
Requires: R
Requires: rpy
Requires: %{name}-core
@ -632,6 +640,8 @@ popd
%patch23
%patch24
%patch25
%patch26
%patch27
sed -e 's|@@SAGE_ROOT@@|%{SAGE_ROOT}|' \
-e 's|@@SAGE_DOC@@|%{SAGE_DOC}|' \
@ -1358,10 +1368,26 @@ exit 0
########################################################################
%changelog
* Mon May 18 2015 Jerry James <loganjerry@gmail.com> - 6.5-2
* Sun Jul 19 2015 pcpa <paulo.cesar.pereira.de.andrade@gmail.com> - 6.5-7
- Correct unable to start QEPCAD within sage (#1243590)
* Fri Jun 19 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 6.5-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
* Mon May 18 2015 Jerry James <loganjerry@gmail.com> - 6.5-5
- Rebuild for ntl 9.1.1 and cddlib 094h
* Thu May 14 2015 pcpa <paulo.cesar.pereira.de.andrade@gmail.com> - 6.5-1
* Sat May 9 2015 Jerry James <loganjerry@gmail.com> - 6.5-4
- Rebuild for ntl 9.1.0
* Tue May 5 2015 Peter Robinson <pbrobinson@fedoraproject.org> 6.5-3
- Drop old F-18 comparisions
- Build on ARMv7, all deps now met
* Sun Apr 26 2015 pcpa <paulo.cesar.pereira.de.andrade@gmail.com> - 6.5-2
- Add patch to work with ipython 3
* Fri Apr 3 2015 pcpa <paulo.cesar.pereira.de.andrade@gmail.com> - 6.5-1
- Update to sagemath 6.5
- Add new Catalan and Hungarian doc subpackages
- Add customizations to not need a patched pari