sagemath/sagemath-qepcad.patch
Jerry James 30bb46d8dc Version 9.5.
Drop unnecessary -4ti2 and -primecount patches.
2022-03-21 08:59:27 -06:00

59 lines
2 KiB
Diff

diff -up src/sage/interfaces/qepcad.py.orig src/sage/interfaces/qepcad.py
--- src/sage/interfaces/qepcad.py.orig 2022-01-30 06:41:50.000000000 -0700
+++ src/sage/interfaces/qepcad.py 2022-03-04 16:29:29.109754141 -0700
@@ -530,7 +530,7 @@ TESTS:
Check the qepcad configuration file::
- sage: with open(os.path.join(SAGE_LOCAL, 'etc', 'default.qepcadrc')) as f: # optional - qepcad
+ sage: with open(os.path.join('/usr/share/qepcad/default.qepcadrc')) as f: # optional - qepcad
....: f.readlines()[-1]
'SINGULAR yes\n'
@@ -605,7 +605,6 @@ AUTHORS:
# http://www.gnu.org/licenses/
#*****************************************************************************
-from sage.env import SAGE_LOCAL
import pexpect
import re
import sys
@@ -620,6 +619,8 @@ from .expect import Expect, ExpectFuncti
from sage.interfaces.interface import AsciiArtString
+QEPCAD_LOCAL = "/usr/share/qepcad"
+
def _qepcad_atoms(formula):
r"""
Return the atoms of a qepcad quantifier-free formula, as a set of strings.
@@ -649,17 +650,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
@@ -684,7 +685,7 @@ def _update_command_info():
cache = {}
- with open(os.path.join(SAGE_LOCAL, 'share/qepcad', 'qepcad.help')) as help:
+ with open(os.path.join(QEPCAD_LOCAL, 'bin', 'qepcad.help')) as help:
assert(help.readline().strip() == '@')
while True: