[sagemath] 01/03: Some minor fixes to tests and build-deps

[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 0fc3e731afd074e72a61705c082ef33eddbdfe4a
Author: Ximin Luo <infinity0 at debian.org>
Date:   Sun Oct 16 21:31:49 2016 +0200

    Some minor fixes to tests and build-deps
---
 debian/control                            | 14 ++++++--------
 debian/patches/debian-install-paths.patch | 11 +++++++++++
 debian/rules                              |  3 +++
 3 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/debian/control b/debian/control
index d6302cf..54f4b89 100644
--- a/debian/control
+++ b/debian/control
@@ -19,7 +19,7 @@ Build-Depends:
  ecl (>= 15.3.7+dfsg1-2),
  eclib-tools (>= 20160720-1+sage1),
  f2c,
- fflas-ffpack (>= 2.2.1-1),
+ fflas-ffpack (>= 2.2.2-1),
  flintqs,
  gap-core (= 4r8p3-3),
  libgap-sage-dev (>= 4.8.3), libgap-sage-dev (<< 4.8.4),
@@ -44,8 +44,7 @@ Build-Depends:
  libecm-dev,
  libflint-arb-dev (>= 2.8.1-2),
  libflint-dev (>= 2.5.2-5+b2),
- libfplll-dev (>= 4.0.5+git20160107),
- libfplll-dev (<< 5),
+ libfplll-dev (>= 4.0.5+git20160107), libfplll-dev (<< 5),
  libfreetype6-dev,
  libgc-dev,
  libgcrypt11-dev,
@@ -76,7 +75,7 @@ Build-Depends:
  libratpoints-dev,
  libreadline-dev,
  librw-dev,
- libsingular4-dev (>= 4.0.3-p3),
+ libsingular4-dev (>= 4.0.3-p3+ds-2),
  libsqlite3-dev,
  libsymmetrica-dev,
  libtachyon-dev,
@@ -143,6 +142,7 @@ Build-Depends:
  python-ptyprocess,
  python-pygments,
  python-rpy2,
+ python-sagenb (>= 0.13),
  python-scipy,
  python-setuptools,
  python-setuptools-scm,
@@ -171,14 +171,12 @@ Build-Depends:
  sagemath-database-polytopes,
  sagetex,
  scons,
- singular (>= 4.0.3-p3),
- singular-doc (>= 4.0.3-p3),
+ singular (>= 4.0.3-p3+ds-2),
+ singular-doc (>= 4.0.3-p3+ds-2),
  sqlite3,
  sympow,
  tachyon,
  zlib1g-dev,
-# Packages not in unstable, but in unstable-sage:
- python-sagenb (>= 0.13),
 
 Package: sagemath-empty
 Architecture: all
diff --git a/debian/patches/debian-install-paths.patch b/debian/patches/debian-install-paths.patch
index ab17371..380c2ef 100644
--- a/debian/patches/debian-install-paths.patch
+++ b/debian/patches/debian-install-paths.patch
@@ -18,6 +18,17 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
  
  clean:
  	@echo "Deleting Sage library build artifacts..."
+--- a/sage/src/sage_setup/clean.py
++++ b/sage/src/sage_setup/clean.py
+@@ -85,7 +85,7 @@
+         sage: from sage.misc.sageinspect import loadable_module_extension
+         sage: skip_extensions = (loadable_module_extension(),)
+         sage: for f in stale_iter:
+-        ....:     if f.endswith(skip_extensions): continue
++        ....:     if f.endswith(skip_extensions) or f.endswith(".pyo"): continue
+         ....:     print('Found stale file: ' + f)
+     """
+     from sage.misc.sageinspect import loadable_module_extension
 --- a/sage/src/setup.py
 +++ b/sage/src/setup.py
 @@ -155,9 +155,9 @@
diff --git a/debian/rules b/debian/rules
index f222ae6..1c5fe06 100755
--- a/debian/rules
+++ b/debian/rules
@@ -52,6 +52,7 @@ prune:
 
 ptestlong:
 	cd sage && $(SAGE_LOCAL)/bin/sage-starts
+ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
 	# We do the below instead of `$(MAKE) --directory=sage ptestlong` because
 	# it has a bug where it can't detect a previous successful build. So it
 	# will try to rebuild some sagelib files, then the docbuild, then those
@@ -61,6 +62,7 @@ ptestlong:
 	# `debian/rules build` twice it will go directly to (override_)dh_auto_test
 	# (and then this target) without trying (override_)dh_auto_build again.
 	cd sage && ./sage -t -p --all --long $(EXTRA_SAGE_TEST_FLAGS) --logfile=logs/ptestlong.log
+endif
 
 # If the docbuild fails and you want to try again, you should run this first.
 # Otherwise the docbuild gets slower and slower as it re-reads information from
@@ -81,6 +83,7 @@ build-dep:
 	else sudo apt-get install --no-install-recommends sagemath-build-deps; fi
 	rm -f sagemath-build-deps_$(DEB_VERSION)_all.deb
 
+# TODO: does not count "special" failures like segfault/abort/timed-out etc.
 failed-tests:
 	grep "Failed example:" sage/logs/ptestlong.log | awk '{s++} END {print s}'
 

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