sage: 8.8 -> 8.9.beta0
This commit is contained in:
Timo Kaufmann
parent
3a28589551
commit
924c321e8a
@ -1,8 +1,8 @@
|
||||
diff --git a/src/sage_setup/docbuild/__init__.py b/src/sage_setup/docbuild/__init__.py
|
||||
index 0f2700168a..60f71357d2 100644
|
||||
index 73a078e619..059125c59f 100644
|
||||
--- a/src/sage_setup/docbuild/__init__.py
|
||||
+++ b/src/sage_setup/docbuild/__init__.py
|
||||
@@ -86,26 +86,6 @@ def builder_helper(type):
|
||||
@@ -86,27 +86,6 @@ def builder_helper(type):
|
||||
"""
|
||||
Returns a function which builds the documentation for
|
||||
output type ``type``.
|
||||
@ -19,7 +19,8 @@ index 0f2700168a..60f71357d2 100644
|
||||
- ....: raise BaseException("abort pool operation")
|
||||
- sage: original_runsphinx, sage_setup.docbuild.sphinxbuild.runsphinx = sage_setup.docbuild.sphinxbuild.runsphinx, raiseBaseException
|
||||
-
|
||||
- sage: from sage_setup.docbuild import builder_helper, build_many, build_ref_doc
|
||||
- sage: from sage_setup.docbuild import builder_helper, build_ref_doc
|
||||
- sage: from sage_setup.docbuild import _build_many as build_many
|
||||
- sage: helper = builder_helper("html")
|
||||
- sage: try:
|
||||
- ....: build_many(build_ref_doc, [("docname", "en", "html", {})])
|
||||
@ -29,7 +30,7 @@ index 0f2700168a..60f71357d2 100644
|
||||
"""
|
||||
def f(self, *args, **kwds):
|
||||
output_dir = self._output_dir(type)
|
||||
@@ -127,10 +107,9 @@ def builder_helper(type):
|
||||
@@ -128,10 +107,9 @@ def builder_helper(type):
|
||||
logger.debug(build_command)
|
||||
|
||||
# Run Sphinx with Sage's special logger
|
||||
@ -43,10 +44,10 @@ index 0f2700168a..60f71357d2 100644
|
||||
if ABORT_ON_ERROR:
|
||||
raise
|
||||
diff --git a/src/sage_setup/docbuild/sphinxbuild.py b/src/sage_setup/docbuild/sphinxbuild.py
|
||||
index 9a2fba79bc..77c8ed3592 100644
|
||||
index fe7eba43b2..463790965c 100644
|
||||
--- a/src/sage_setup/docbuild/sphinxbuild.py
|
||||
+++ b/src/sage_setup/docbuild/sphinxbuild.py
|
||||
@@ -318,3 +318,8 @@ def runsphinx():
|
||||
@@ -321,3 +321,8 @@ def runsphinx():
|
||||
sys.stderr = saved_stderr
|
||||
sys.stdout.flush()
|
||||
sys.stderr.flush()
|
||||
|
||||
@ -1,64 +0,0 @@
|
||||
diff --git a/build/pkgs/threejs/spkg-src b/build/pkgs/threejs/spkg-src
|
||||
index 91780d813c..254b850a24 100755
|
||||
--- a/build/pkgs/threejs/spkg-src
|
||||
+++ b/build/pkgs/threejs/spkg-src
|
||||
@@ -20,9 +20,17 @@ URL3="https://raw.githubusercontent.com/mrdoob/three.js/${GIT_VERSION}/LICENSE"
|
||||
echo "Downloading $URL3"
|
||||
curl -OL "$URL3"
|
||||
|
||||
+# Set up directory structure
|
||||
+
|
||||
+mkdir build
|
||||
+mv three.min.js build
|
||||
+
|
||||
+mkdir -p examples/js/controls
|
||||
+mv OrbitControls.js examples/js/controls
|
||||
+
|
||||
# Package
|
||||
-tar czf "$SAGE_ROOT/upstream/threejs-${GIT_VERSION}.tar.gz" 'three.min.js' 'OrbitControls.js' 'LICENSE'
|
||||
-rm -rf 'three.min.js' 'OrbitControls.js' 'LICENSE'
|
||||
+tar czf "$SAGE_ROOT/upstream/threejs-${GIT_VERSION}.tar.gz" build examples 'LICENSE'
|
||||
+rm -rf 'build' 'examples' 'LICENSE'
|
||||
|
||||
# Update package info
|
||||
echo "${GIT_VERSION}" > 'package-version.txt'
|
||||
diff --git a/src/sage/repl/rich_output/backend_ipython.py b/src/sage/repl/rich_output/backend_ipython.py
|
||||
index 7c27d48a21..8bf4861a35 100644
|
||||
--- a/src/sage/repl/rich_output/backend_ipython.py
|
||||
+++ b/src/sage/repl/rich_output/backend_ipython.py
|
||||
@@ -411,10 +411,15 @@ class BackendIPythonCommandline(BackendIPython):
|
||||
sage: backend.threejs_offline_scripts()
|
||||
'...<script ...</script>...'
|
||||
"""
|
||||
- from sage.env import SAGE_SHARE
|
||||
+ from sage.env import THREEJS_DIR
|
||||
|
||||
- scripts = [os.path.join(SAGE_SHARE, 'threejs', script)
|
||||
- for script in ['three.min.js', 'OrbitControls.js']]
|
||||
+ scripts = [
|
||||
+ os.path.join(THREEJS_DIR, script)
|
||||
+ for script in [
|
||||
+ 'build/three.min.js',
|
||||
+ 'examples/js/controls/OrbitControls.js',
|
||||
+ ]
|
||||
+ ]
|
||||
|
||||
if sys.platform == 'cygwin':
|
||||
import cygwin
|
||||
@@ -594,13 +599,13 @@ class BackendIPythonNotebook(BackendIPython):
|
||||
sage: from sage.repl.rich_output.backend_ipython import BackendIPythonNotebook
|
||||
sage: backend = BackendIPythonNotebook()
|
||||
sage: backend.threejs_offline_scripts()
|
||||
- '...<script src="/nbextensions/threejs/three.min...<\\/script>...'
|
||||
+ '...<script src="/nbextensions/threejs/build/three.min...<\\/script>...'
|
||||
"""
|
||||
from sage.repl.rich_output import get_display_manager
|
||||
CDN_scripts = get_display_manager().threejs_scripts(online=True)
|
||||
return """
|
||||
-<script src="/nbextensions/threejs/three.min.js"></script>
|
||||
-<script src="/nbextensions/threejs/OrbitControls.js"></script>
|
||||
+<script src="/nbextensions/threejs/build/three.min.js"></script>
|
||||
+<script src="/nbextensions/threejs/examples/js/controls/OrbitControls.js"></script>
|
||||
<script>
|
||||
if ( !window.THREE ) document.write('{}');
|
||||
</script>
|
||||
@ -10,14 +10,14 @@
|
||||
# all get the same sources with the same patches applied.
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "8.8";
|
||||
version = "8.9.beta0";
|
||||
pname = "sage-src";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "sagemath";
|
||||
repo = "sage";
|
||||
rev = version;
|
||||
sha256 = "0jm7zdkz8wfgrmf6620jfr8kgvprrz3qfl8gzx6rl5z5cm734b6x";
|
||||
sha256 = "1bp6sdfk6h966y9jcpqnsrjfs0f5xgc1xmjw75h2y18hdgiadiy6";
|
||||
};
|
||||
|
||||
# Patches needed because of particularities of nix or the way this is packaged.
|
||||
@ -49,10 +49,6 @@ stdenv.mkDerivation rec {
|
||||
# https://trac.sagemath.org/ticket/27660#ticket
|
||||
./patches/do-not-test-find-library.patch
|
||||
|
||||
|
||||
# https://trac.sagemath.org/ticket/28007
|
||||
./patches/threejs-offline.patch
|
||||
|
||||
# Parallelize docubuild using subprocesses, fixing an isolation issue. See
|
||||
# https://groups.google.com/forum/#!topic/sage-packaging/YGOm8tkADrE
|
||||
./patches/sphinx-docbuild-subprocesses.patch
|
||||
|
||||
Loading…
Reference in New Issue
Block a user