mirror of
https://src.fedoraproject.org/rpms/sagemath.git
synced 2025-04-22 03:39:03 -04:00
1a0bd1afc6
Also: - Drop -lrslib, -gap-hap, and -flask patches. - Drop obsolete scriplets to fix F24 to F25 upgrade (bz 1594429 and 1618934). - Drop obsolete mktexlsr invocations. - Fix more Singular paths. - Fix still more uses of /usr/bin/env. - Drop disallow/dissallow fixup for cython; now fixed in cython itself.
59 lines
2 KiB
Diff
59 lines
2 KiB
Diff
diff -up src/sage/interfaces/qepcad.py.orig src/sage/interfaces/qepcad.py
|
|
--- src/sage/interfaces/qepcad.py.orig 2018-08-03 05:10:08.000000000 -0600
|
|
+++ src/sage/interfaces/qepcad.py 2018-08-29 10:43:25.856903772 -0600
|
|
@@ -530,7 +530,7 @@ TESTS:
|
|
|
|
Check the qepcad configuration file::
|
|
|
|
- sage: with open(os.path.join(SAGE_LOCAL, 'default.qepcadrc')) as f: # optional - qepcad
|
|
+ sage: with open('/usr/share/qepcad/default.qepcadrc')) as f: # optional - qepcad
|
|
....: f.readlines()[-1]
|
|
'SINGULAR .../bin\n'
|
|
|
|
@@ -608,7 +608,6 @@ from __future__ import print_function
|
|
from __future__ import absolute_import
|
|
from six import string_types
|
|
|
|
-from sage.env import SAGE_LOCAL
|
|
import pexpect
|
|
import re
|
|
import sys
|
|
@@ -621,6 +620,8 @@ from sage.docs.instancedoc import instan
|
|
from .expect import Expect, ExpectFunction, 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.
|
|
@@ -650,17 +651,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
|
|
|
|
@@ -685,7 +686,7 @@ def _update_command_info():
|
|
|
|
cache = {}
|
|
|
|
- with open(os.path.join(SAGE_LOCAL, 'bin', 'qepcad.help')) as help:
|
|
+ with open(os.path.join(QEPCAD_LOCAL, 'bin', 'qepcad.help')) as help:
|
|
assert(help.readline().strip() == '@')
|
|
|
|
while True:
|