[sagemath] 01/01: Suppress PIP deprecation warnings, and PIP new version warnings the same way as upstream.

[Tobias Hansen]

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

thansen pushed a commit to branch master
in repository sagemath.

commit 20ce5673e3e7a7e143446da979d6f91f0a8cb5ea
Author: Tobias Hansen <thansen at broeselmaschine.fc.up.pt>
Date:   Sun Dec 4 15:03:30 2016 +0000

    Suppress PIP deprecation warnings, and PIP new version warnings the same way as upstream.
---
 debian/patches/debian-install-paths.patch |  2 +-
 debian/patches/debian-pip-nowarn.patch    | 27 +++++++++++++++++----------
 2 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/debian/patches/debian-install-paths.patch b/debian/patches/debian-install-paths.patch
index 76fae84..a7fd953 100644
--- a/debian/patches/debian-install-paths.patch
+++ b/debian/patches/debian-install-paths.patch
@@ -121,7 +121,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
      clean_install_dir(output_dir, python_packages, python_modules,
 --- a/sage/sage
 +++ b/sage/sage
-@@ -23,6 +23,7 @@
+@@ -22,6 +22,7 @@
  # automatically.
  #SAGE_ROOT=/path/to/sage-version
  
diff --git a/debian/patches/debian-pip-nowarn.patch b/debian/patches/debian-pip-nowarn.patch
index 1f785c2..66c51d9 100644
--- a/debian/patches/debian-pip-nowarn.patch
+++ b/debian/patches/debian-pip-nowarn.patch
@@ -1,15 +1,22 @@
 Description: Don't output pip warnings, otherwise some doctests fail
-Author: Ximin Luo <infinity0 at debian.org>
+ This removes two types of warnings. "--no-index" suppresses messages from
+ pip advertising a new pip version. This was applied to sage in
+ https://trac.sagemath.org/ticket/21812
+ "--format=legacy" suppresses a warning that the default format will
+ change from legacy to columns. This is being discussed in
+ https://trac.sagemath.org/ticket/21835
+Author: Tobias Hansen <thansen at debian.org>
 Forwarded: not-needed
 ---
 This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- a/sage/sage
-+++ b/sage/sage
-@@ -16,6 +16,7 @@
- # along with this program; if not, write to the Free Software
- # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+--- a/sage/src/sage/misc/package.py
++++ b/sage/src/sage/misc/package.py
+@@ -144,7 +144,7 @@
+         sage: d['beautifulsoup']   # optional - beautifulsoup
+         '...'
+     """
+-    proc = subprocess.Popen(["pip", "list"], stdout=subprocess.PIPE)
++    proc = subprocess.Popen(["pip", "list", "--no-index", "--format=legacy"], stdout=subprocess.PIPE)
+     stdout = str(proc.communicate()[0])
+     return dict((name.lower(), version) for name,version in PIP_VERSION.findall(stdout))
  
-+export PIP_DISABLE_PIP_VERSION_CHECK=1
- 
- # Set SAGE_ROOT to the location of the sage install, i.e. the directory
- # containing this shell script.  If unset, we will try to figure it out

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