diff options
| author | Timo Kaufmann <timokau@zoho.com> | 2019-07-02 22:03:53 +0200 |
|---|---|---|
| committer | Timo Kaufmann <timokau@zoho.com> | 2019-07-02 23:02:36 +0200 |
| commit | 924c321e8aca912733e7b6f7af1e65d73667c560 (patch) | |
| tree | 87ffc8b52780e0bd7e73b2799289592c933d9c42 /pkgs/applications/science/math/sage/patches/sphinx-docbuild-subprocesses.patch | |
| parent | 3a28589551776c74bb71847e86ccc15b05a42b51 (diff) | |
| download | nixpkgs-924c321e8aca912733e7b6f7af1e65d73667c560.tar nixpkgs-924c321e8aca912733e7b6f7af1e65d73667c560.tar.gz nixpkgs-924c321e8aca912733e7b6f7af1e65d73667c560.tar.bz2 nixpkgs-924c321e8aca912733e7b6f7af1e65d73667c560.tar.lz nixpkgs-924c321e8aca912733e7b6f7af1e65d73667c560.tar.xz nixpkgs-924c321e8aca912733e7b6f7af1e65d73667c560.tar.zst nixpkgs-924c321e8aca912733e7b6f7af1e65d73667c560.zip | |
sage: 8.8 -> 8.9.beta0
Diffstat (limited to 'pkgs/applications/science/math/sage/patches/sphinx-docbuild-subprocesses.patch')
| -rw-r--r-- | pkgs/applications/science/math/sage/patches/sphinx-docbuild-subprocesses.patch | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/pkgs/applications/science/math/sage/patches/sphinx-docbuild-subprocesses.patch b/pkgs/applications/science/math/sage/patches/sphinx-docbuild-subprocesses.patch index 933344aa559..56f09279622 100644 --- a/pkgs/applications/science/math/sage/patches/sphinx-docbuild-subprocesses.patch +++ b/pkgs/applications/science/math/sage/patches/sphinx-docbuild-subprocesses.patch @@ -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() |