Version 9.6

- Fix path to libSingular.so (bz 2073208)
- Fix threejs install location (bz 2081720)
- Drop upstreamed -rubiks and -intersphinx-disabled-reftypes patches
- Drop no longer used ratpoints BR
- Thebe is no longer bundled
This commit is contained in:
Jerry James 2022-06-07 09:24:36 -06:00
parent 33af71616a
commit aed4db5045
10 changed files with 300 additions and 646 deletions

View file

@ -1,6 +1,6 @@
diff -up src/sage/env.py.orig src/sage/env.py
--- src/sage/env.py.orig 2022-03-04 16:22:20.700225896 -0700
+++ src/sage/env.py 2022-03-04 16:23:09.566306142 -0700
--- 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
@@ -166,15 +166,15 @@ SAGE_DATE = var("SAGE_DATE", version.dat
SAGE_VERSION_BANNER = var("SAGE_VERSION_BANNER", version.banner)
@ -21,7 +21,7 @@ diff -up src/sage/env.py.orig src/sage/env.py
SAGE_SPKG_INST = var("SAGE_SPKG_INST", join(SAGE_LOCAL, "var", "lib", "sage", "installed"))
# source tree of the Sage distribution
@@ -202,11 +202,11 @@ THEBE_DIR = var("THEBE_DIR", join(SAGE_S
@@ -202,16 +202,16 @@ THEBE_DIR = var("THEBE_DIR", join(SAGE_S
COMBINATORIAL_DESIGN_DATA_DIR = var("COMBINATORIAL_DESIGN_DATA_DIR", join(SAGE_SHARE, "combinatorial_designs"))
CREMONA_MINI_DATA_DIR = var("CREMONA_MINI_DATA_DIR", join(SAGE_SHARE, "cremona"))
CREMONA_LARGE_DATA_DIR = var("CREMONA_LARGE_DATA_DIR", join(SAGE_SHARE, "cremona"))
@ -37,3 +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", "")
-RUBIKS_BINS_PREFIX = var("RUBIKS_BINS_PREFIX", "")
+RUBIKS_BINS_PREFIX = var("RUBIKS_BINS_PREFIX", "rubiks_")
FOURTITWO_HILBERT = var("FOURTITWO_HILBERT")
FOURTITWO_MARKOV = var("FOURTITWO_MARKOV")
FOURTITWO_GRAVER = var("FOURTITWO_GRAVER")