mirror of
https://src.fedoraproject.org/rpms/sagemath.git
synced 2025-04-22 11:45:56 -04:00
Update to sagemath 6.8
This commit is contained in:
parent
b4699213da
commit
3aa9b0c734
32 changed files with 806 additions and 615 deletions
|
@ -1,22 +1,23 @@
|
|||
diff -up src/sage/interfaces/jmoldata.py.orig src/sage/interfaces/jmoldata.py
|
||||
--- src/sage/interfaces/jmoldata.py.orig 2014-08-12 14:13:57.189963669 -0300
|
||||
+++ src/sage/interfaces/jmoldata.py 2014-08-12 14:16:21.359969189 -0300
|
||||
@@ -139,8 +139,6 @@ class JmolData(SageObject):
|
||||
--- src/sage/interfaces/jmoldata.py.orig 2015-10-11 17:48:03.194792527 -0300
|
||||
+++ src/sage/interfaces/jmoldata.py 2015-10-11 17:48:39.748793927 -0300
|
||||
@@ -146,8 +146,6 @@ class JmolData(SageObject):
|
||||
sage: print os.path.exists(testfile) # optional -- java
|
||||
True
|
||||
|
||||
"""
|
||||
- # Set up paths, file names and scripts
|
||||
- jmolpath = os.path.join(SAGE_LOCAL, "share", "jmol", "JmolData.jar")
|
||||
launchscript = ""
|
||||
if (datafile_cmd!='script'):
|
||||
launchscript = "load "
|
||||
@@ -152,9 +150,8 @@ class JmolData(SageObject):
|
||||
scratchout = tmp_filename(ext=".txt")
|
||||
with open(scratchout, 'w') as jout:
|
||||
# Now call the java application and write the file.
|
||||
target_native = targetfile
|
||||
import sys
|
||||
if sys.platform == 'cygwin':
|
||||
@@ -172,10 +170,8 @@ class JmolData(SageObject):
|
||||
env = dict(os.environ)
|
||||
env['LC_ALL'] = 'C'
|
||||
env['LANG'] = 'C'
|
||||
- subprocess.call(["java", "-Xmx512m", "-Djava.awt.headless=true",
|
||||
- "-jar", jmolpath, "-iox", "-g", sizeStr,
|
||||
- "-J", launchscript, "-j", imagescript], stdout=jout, stderr=jout)
|
||||
- "-J", launchscript, "-j", imagescript],
|
||||
- stdout=jout, stderr=jout, env=env)
|
||||
+ subprocess.call(["jmol","-n","-g",sizeStr,
|
||||
+ "-J",launchscript,"-j",imagescript],stdout=jout)
|
||||
if not os.path.isfile(targetfile):
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue