[sagemath] 01/02: Make the "sage-starts" test work so we can run the other tests and watch how they fail

[Ximin Luo]

This is an automated email from the git hooks/post-receive script.

infinity0 pushed a commit to branch master
in repository sagemath.

commit a957de9a7962003f8d117d0ae067a69dafc016f8
Author: Ximin Luo <infinity0 at debian.org>
Date:   Fri Jul 8 14:01:50 2016 +0200

    Make the "sage-starts" test work so we can run the other tests and watch how they fail
---
 debian/README.Debian                            | 12 +++---------
 debian/patches/python_installs_in_userdir.patch | 11 +++++++++++
 debian/patches/series                           |  2 +-
 debian/patches/sphinx-update.patch              |  2 +-
 4 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/debian/README.Debian b/debian/README.Debian
index 40e07cf..7702be7 100644
--- a/debian/README.Debian
+++ b/debian/README.Debian
@@ -19,15 +19,9 @@ also need sage to -lflint-arb instead of -larb (or perhaps Debian needs to
 install it as libarb.so; check upstream to see what they prefer). as a temp
 workaround you can `ln -s libflint-arb.so /usr/lib/libarb.so`.
 
-3. Docbuild now works; "Testing that Sage starts..." fails
-
-Testing that Sage starts...
-[2016-07-08 13:35:27] Sage version 7.1, released 2016-03-20
-Traceback (most recent call last):
-  File "/home/infinity0/tmp/sage/sagemath/sage/src/bin/sage-eval", line 4, in <module>
-    from sage.all import *
-ImportError: No module named sage.all
-Sage failed to start up.
+Then the build should work, but the tests will fail. This is partly due to our
+hacky patches, and it's probably not worth trying to fix them before we update
+to Sage 7.2/7.3 "properly".
 
 ## TODO (required to get into Debian archives)
 
diff --git a/debian/patches/python_installs_in_userdir.patch b/debian/patches/python_installs_in_userdir.patch
index 3dabdfd..b064d30 100644
--- a/debian/patches/python_installs_in_userdir.patch
+++ b/debian/patches/python_installs_in_userdir.patch
@@ -145,3 +145,14 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
          # Ensure that the reference guide is compiled first so that links from
          # the other documents to it are correctly resolved.
          if 'en/reference' in documents:
+--- a/sage/src/bin/sage-starts
++++ b/sage/src/bin/sage-starts
+@@ -14,7 +14,7 @@
+ # sysadmin.  We use --nodotsage so we don't force a .sage directory
+ # in the sysadmin's HOME directory.
+ cmd='sage.all._write_started_file(); print "Yes, Sage starts."'
+-build/bin/sage-logger "./sage --nodotsage -c '$cmd'" logs/start.log
++build/bin/sage-logger "./sage -c '$cmd'" logs/start.log
+ 
+ if [ $? -ne 0 ]; then
+     echo >&2 "Sage failed to start up."
diff --git a/debian/patches/series b/debian/patches/series
index 4f5573a..4f2c33e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -13,7 +13,7 @@ planarity-update.patch
 use-gsl-cblas.patch
 mpfi-fix-api.patch
 cysignals-multiarch-path.patch
-python_installs_in_userdir.patch
 sphinx-update.patch
 #temp-disable-parallel-sphinx.patch
 update-libgap.patch
+python_installs_in_userdir.patch
diff --git a/debian/patches/sphinx-update.patch b/debian/patches/sphinx-update.patch
index d49361f..f4ee09e 100644
--- a/debian/patches/sphinx-update.patch
+++ b/debian/patches/sphinx-update.patch
@@ -7,7 +7,7 @@ Forwarded: not-needed
 This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
 --- a/sage/src/sage_setup/docbuild/__init__.py
 +++ b/sage/src/sage_setup/docbuild/__init__.py
-@@ -770,7 +770,7 @@
+@@ -767,7 +767,7 @@
  
          env_pickle = os.path.join(self._doctrees_dir(), 'environment.pickle')
          try:

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/sagemath.git