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

Update to sagemath 7.3

Browse source
This commit is contained in:
pcpa 2016-08-20 13:51:55 -04:00
parent a3d306800c
commit 0fdebf23cf
35 changed files with 3245 additions and 874 deletions
Download patch file Download diff file Expand all files Collapse all files

14
sagemath-jmol.patch
View file

@ -1,8 +1,8 @@
diff -up src/sage/interfaces/jmoldata.py.orig src/sage/interfaces/jmoldata.py
--- 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
--- src/sage/interfaces/jmoldata.py.orig 2016-08-08 13:34:51.199532656 -0400
+++ src/sage/interfaces/jmoldata.py 2016-08-08 13:36:16.474535921 -0400
@@ -147,8 +147,6 @@ class JmolData(SageObject):
sage: print(os.path.exists(testfile)) # optional -- java
True
"""
- # Set up paths, file names and scripts
@ -10,7 +10,7 @@ diff -up src/sage/interfaces/jmoldata.py.orig src/sage/interfaces/jmoldata.py
target_native = targetfile
import sys
if sys.platform == 'cygwin':
@@ -172,10 +170,8 @@ class JmolData(SageObject):
@@ -173,10 +171,8 @@ class JmolData(SageObject):
env = dict(os.environ)
env['LC_ALL'] = 'C'
env['LANG'] = 'C'
@ -18,8 +18,8 @@ diff -up src/sage/interfaces/jmoldata.py.orig src/sage/interfaces/jmoldata.py
- "-jar", jmolpath, "-iox", "-g", sizeStr,
- "-J", launchscript, "-j", imagescript],
- stdout=jout, stderr=jout, env=env)
+ subprocess.call(["jmol","-n","-g",sizeStr,
+ "-J",launchscript,"-j",imagescript],stdout=jout)
+ subprocess.call(["jmol", "-n", "-g", sizeStr,
+ "-J",launchscript, "-j", imagescript], stdout=jout)
if not os.path.isfile(targetfile):
raise RuntimeError("Jmol failed to create file %s, see %s for details"%(repr(targetfile), repr(scratchout)))
os.unlink(scratchout)