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

Rebuild for ntl 9.8.0.

Browse source 
Also, nauty is now available under a free license, so use it.
This commit is contained in:
Jerry James 2016-04-29 17:07:42 -06:00
parent 0a631244e3
commit cb1cb96696
2 changed files with 17 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

19
sagemath-nauty.patch
View file

@ -1,13 +1,12 @@
diff -up src/sage/graphs/graph_generators.py.orig src/sage/graphs/graph_generators.py
--- src/sage/graphs/graph_generators.py.orig 2015-10-11 17:55:39.963810018 -0300
+++ src/sage/graphs/graph_generators.py 2015-10-11 17:55:46.861810283 -0300
@@ -838,8 +838,7 @@ class GraphGenerators():
>A geng -d0D3 n=4 e=0-6
"""
import subprocess
- from sage.misc.package import is_package_installed
- if not is_package_installed("nauty"):
+ if 1:
--- src/sage/graphs/graph_generators.py.orig 2015-07-26 07:34:43.000000000 -0600
+++ src/sage/graphs/graph_generators.py 2016-04-28 21:13:15.214276462 -0600
@@ -841,7 +841,7 @@ class GraphGenerators():
from sage.misc.package import is_package_installed
if not is_package_installed("nauty"):
raise TypeError("the optional nauty package is not installed")
sp = subprocess.Popen("geng {0}".format(options), shell=True,
- sp = subprocess.Popen("geng {0}".format(options), shell=True,
+ sp = subprocess.Popen("nauty-geng {0}".format(options), shell=True,
stdin=subprocess.PIPE, stdout=subprocess.PIPE,
stderr=subprocess.PIPE, close_fds=True)
if debug: