Fix failure to install (bz 2154932)

- Fix failure to find nauty binaries (bz 2125737)
- Convert License tags to SPDX
This commit is contained in:
Jerry James 2022-12-20 12:39:08 -07:00
parent 545b239d33
commit 98d6f9fdd6
2 changed files with 62 additions and 28 deletions

View file

@ -1,6 +1,6 @@
diff -up src/sage/env.py.orig src/sage/env.py
--- src/sage/env.py.orig 2022-06-01 11:12:32.216196966 -0600
+++ src/sage/env.py 2022-06-01 11:12:57.991304879 -0600
--- src/sage/env.py.orig 2022-12-19 15:39:47.797902092 -0700
+++ src/sage/env.py 2022-12-19 15:41:27.291049166 -0700
@@ -166,15 +166,15 @@ SAGE_DATE = var("SAGE_DATE", version.dat
SAGE_VERSION_BANNER = var("SAGE_VERSION_BANNER", version.banner)
@ -37,8 +37,9 @@ diff -up src/sage/env.py.orig src/sage/env.py
MAXIMA = var("MAXIMA", "maxima")
MAXIMA_FAS = var("MAXIMA_FAS")
KENZO_FAS = var("KENZO_FAS")
SAGE_NAUTY_BINS_PREFIX = var("SAGE_NAUTY_BINS_PREFIX", "")
-SAGE_NAUTY_BINS_PREFIX = var("SAGE_NAUTY_BINS_PREFIX", "")
-RUBIKS_BINS_PREFIX = var("RUBIKS_BINS_PREFIX", "")
+SAGE_NAUTY_BINS_PREFIX = var("SAGE_NAUTY_BINS_PREFIX", "nauty-")
+RUBIKS_BINS_PREFIX = var("RUBIKS_BINS_PREFIX", "rubiks_")
FOURTITWO_HILBERT = var("FOURTITWO_HILBERT")
FOURTITWO_MARKOV = var("FOURTITWO_MARKOV")