[sagemath] 01/02: Clean up debian-temp-userdir.patch and disable a failing qepcad test that we're not using

[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 1687726f6d801e53bd224199a345c3218e7b8e25
Author: Ximin Luo <infinity0 at debian.org>
Date:   Thu Oct 13 13:40:20 2016 +0200

    Clean up debian-temp-userdir.patch and disable a failing qepcad test that we're not using
---
 debian/README.Debian                              |  7 ++--
 debian/patches/debian-temp-userdir-singular.patch | 17 --------
 debian/patches/debian-temp-userdir.patch          | 48 +++++++++++++----------
 debian/patches/series                             |  1 -
 4 files changed, 30 insertions(+), 43 deletions(-)

diff --git a/debian/README.Debian b/debian/README.Debian
index ddc2b01..aecb5ee 100644
--- a/debian/README.Debian
+++ b/debian/README.Debian
@@ -70,8 +70,8 @@ Now for the summary:
 
 ### Breakdown
 
-37+5 unreproducible for infinity0
-50 (estimated) for Tobias
+36+5 unreproducible for infinity0
+49 (estimated) for Tobias
 
 ### We have some sort of lead for further investigation
 
@@ -112,12 +112,11 @@ sage -t --long src/sage/tensor/differential_form_element.py  # 2 doctests failed
 sage -t --long src/sage/symbolic/expression.pyx  # 1 doctest failed
 # ^ plus one extra for Tobias
 
-12 Others
+11 Others
 sage -t --long src/sage/coding/code_bounds.py  # 1 doctest failed
 sage -t --long src/sage/crypto/block_cipher/miniaes.py  # 1 doctest failed
 sage -t --long src/sage/functions/exp_integral.py  # 1 doctest failed
 sage -t --long src/sage/functions/log.py  # 2 doctests failed
-sage -t --long src/sage/interfaces/qepcad.py  # 1 doctest failed
 sage -t --long src/sage/interfaces/singular.py  # 3 doctests failed
 sage -t --long src/sage/libs/singular/function.pyx  # 2 doctests failed (see #17254#comment:252)
 sage -t --long src/sage/numerical/mip.pyx  # 1 doctest failed
diff --git a/debian/patches/debian-temp-userdir-singular.patch b/debian/patches/debian-temp-userdir-singular.patch
deleted file mode 100644
index 246b190..0000000
--- a/debian/patches/debian-temp-userdir-singular.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-This patch makes some doctests pass 
-but this will have to go when we install system-wide
-and not in the user home.
-
---- a/sage/src/sage_setup/find.py
-+++ b/sage/src/sage_setup/find.py
-@@ -150,8 +150,8 @@
- 
-     EXAMPLES::
- 
--        sage: from site import getsitepackages
--        sage: site_packages = getsitepackages()[0]
-+        sage: from site import getusersitepackages
-+        sage: site_packages = getusersitepackages()
-         sage: files_by_module = installed_files_by_module(site_packages)
-         sage: from sage.misc.sageinspect import loadable_module_extension
-         sage: 'sage/structure/sage_object' + loadable_module_extension() in \
diff --git a/debian/patches/debian-temp-userdir.patch b/debian/patches/debian-temp-userdir.patch
index d9e38f7..33565ef 100644
--- a/debian/patches/debian-temp-userdir.patch
+++ b/debian/patches/debian-temp-userdir.patch
@@ -22,20 +22,6 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
  
 -cd src && python setup.py install
 +cd src && python setup.py install --user
---- a/sage/build/pkgs/nbconvert/spkg-install
-+++ b/sage/build/pkgs/nbconvert/spkg-install
-@@ -1,3 +1,3 @@
- #!/usr/bin/env bash
- 
--cd src && python setup.py install
-+cd src && python setup.py install --user
---- a/sage/build/pkgs/nbformat/spkg-install
-+++ b/sage/build/pkgs/nbformat/spkg-install
-@@ -1,3 +1,3 @@
- #!/usr/bin/env bash
- 
--cd src && python setup.py install
-+cd src && python setup.py install --user
 --- a/sage/build/pkgs/notebook/spkg-install
 +++ b/sage/build/pkgs/notebook/spkg-install
 @@ -12,7 +12,7 @@
@@ -118,13 +104,6 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
  
  if [ $? -ne 0 ]; then
      echo >&2 "Sage failed to start up."
---- a/sage/build/pkgs/speaklater/spkg-install
-+++ b/sage/build/pkgs/speaklater/spkg-install
-@@ -1,3 +1,3 @@
- #!/usr/bin/env bash
- 
--cd src && python setup.py install
-+cd src && python setup.py install --user
 --- a/sage/build/pkgs/sagenb_export/spkg-install
 +++ b/sage/build/pkgs/sagenb_export/spkg-install
 @@ -1,7 +1,7 @@
@@ -143,3 +122,30 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
  
 -cd src && python setup.py install
 +cd src && python setup.py install --user
+--- a/sage/src/sage_setup/find.py
++++ b/sage/src/sage_setup/find.py
+@@ -150,8 +150,8 @@
+ 
+     EXAMPLES::
+ 
+-        sage: from site import getsitepackages
+-        sage: site_packages = getsitepackages()[0]
++        sage: from site import getusersitepackages
++        sage: site_packages = getusersitepackages()
+         sage: files_by_module = installed_files_by_module(site_packages)
+         sage: from sage.misc.sageinspect import loadable_module_extension
+         sage: 'sage/structure/sage_object' + loadable_module_extension() in \
+--- a/sage/src/sage/interfaces/qepcad.py
++++ b/sage/src/sage/interfaces/qepcad.py
+@@ -528,11 +528,6 @@
+ 
+ TESTS:
+ 
+-Check the qepcad configuration file::
+-
+-    sage: open('%s/default.qepcadrc'%SAGE_LOCAL).readlines()[-1]
+-    'SINGULAR .../bin\n'
+-
+ Tests related to the not tested examples (nondeterministic order of atoms)::
+ 
+     sage: from sage.interfaces.qepcad import _qepcad_atoms
diff --git a/debian/patches/series b/debian/patches/series
index f8b61a6..774b75c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -42,7 +42,6 @@ debian-fix-trivial-test-cases.patch
 
 # temporary patches for whatever reason
 # they will eventually be gotten rid of
-debian-temp-userdir-singular.patch
 debian-temp-userdir.patch
 temp-disable-parallel-sphinx.patch
 temp-cython-include-source.patch

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