-
-
Notifications
You must be signed in to change notification settings - Fork 481
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Trac #30972: Versioned installation of threejs
From Matthias Koeppe on #30915: When we start using Sage with a system jupyter notebook (Meta-ticket #30306), there is an issue involving the installation directory `share/jupyter/nbextensions/threejs`, and the fact that there will be several unrelated (and possibly mutually incompatible) copies of that. Here is an example. Let's say: - system jupyter is installed in `/usr`, so the notebook server is accessing `/usr/share/jupyter/nbextensions`. - Sage-9.x may be installed in `/home/x/sage-9.x/local/` and may need threejs r122. - Sage-9.y may be installed in `/home/x/sage-9.y/local/` and may need threejs r155. - Let's say r122 and r155 are mutually incompatible. As @enriqueartal has reported in #30915, our offline threejs graphics needs `/usr/share/jupyter/nbextensions/threejs/`. But the system does not provide it -- it is only provided by Sage (and, after #30915 is the result of a custom build (fork) of threejs). If we create a symlink `/usr/share/jupyter/nbextensions/threejs` -> `/home/x/sage-9.x/local/share/jupyter/nbextensions/threejs`, then Sage 9.x will work with the system jupyter notebook; but Sage 9.y will not. This means that we need a versioned installation scheme so that offline threejs graphics can access the specific version it needs even if the user is accessing Sage through the system notebook. In this ticket we also rename directories from `threejs` to `threejs- sage` (in `share/` and `share/jupyter/nbextensions/`) to reflect the fact that it is a Sage-specific fork. This will reduce the need for downstream patching. (On this ticket we ignore the separate issue that installing such symlinks is not user-friendly -- see #30123 Repackage Sage's cropped `threejs` as a pip-installable package `jupyter-threejs-sage` for a follow-up.) URL: https://trac.sagemath.org/30972 Reported by: paulmasson Ticket author(s): Matthias Koeppe, Joshua Campbell Reviewer(s): Joshua Campbell, Matthias Koeppe, Dima Pasechnik
- Loading branch information
Showing
8 changed files
with
30 additions
and
14 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1 +1 @@ | ||
r122 | ||
r122.p0 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1 +1,2 @@ | ||
sdh_install src/* "${SAGE_SHARE}/threejs" | ||
sdh_install src/version "${SAGE_SHARE}/threejs-sage/" | ||
sdh_install -T src/build "${SAGE_SHARE}/threejs-sage/$(cat src/version)" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
r122 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters