[arch-commits] Commit in sagemath/trunk (PKGBUILD test-optional.patch)

[Antonio Rojas]

    Date: Saturday, October 31, 2015 @ 09:45:46
  Author: arojas
Revision: 145353

Don't call sage-list-packages when running tests

Added:
  sagemath/trunk/test-optional.patch
Modified:
  sagemath/trunk/PKGBUILD

---------------------+
 PKGBUILD            |    6 ++++--
 test-optional.patch |   11 +++++++++++
 2 files changed, 15 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-10-31 06:13:18 UTC (rev 145352)
+++ PKGBUILD	2015-10-31 08:45:46 UTC (rev 145353)
@@ -31,8 +31,8 @@
 provides=(sage-mathematics)
 source=("$pkgname-$pkgver.tar.gz::https://github.com/sagemath/sage/archive/$pkgver.tar.gz" 
 	"http://mirrors.mit.edu/sage/spkg/upstream/pexpect/pexpect-2.0.tar.bz2"
-	'anal.h' 'package.patch' 'env.patch' 'paths.patch' 'clean.patch' 'skip-check.patch' 
-	'pexpect-env.patch' 'pexpect-del.patch' 'disable-fes.patch' 'jupyter-path.patch'
+	anal.h package.patch env.patch paths.patch clean.patch skip-check.patch
+	pexpect-env.patch pexpect-del.patch disable-fes.patch jupyter-path.patch test-optional.patch
 	pari-sage-2.8.1813.patch::"http://git.sagemath.org/sage.git/patch/?id=c1f5aa26e"
 	jupyter-kernel.patch::"http://git.sagemath.org/sage.git/patch/?id=4f06d3df"
 	relative-links.patch::"http://git.sagemath.org/sage.git/patch/src/sage/repl/ipython_kernel/kernel.py?id=52a717a7")
@@ -77,6 +77,8 @@
    -i src/sage/databases/cremona.py
 # find bliss headers
   sed -e 's|graph.hh|bliss/graph.hh|' -i src/sage/graphs/bliss.pyx
+# don't list optional packages when running tests
+  patch -p0 -i ../test-optional.patch
 
 # Upstream patches  
 # fix build against libfes 0.2 http://trac.sagemath.org/ticket/15209

Added: test-optional.patch
===================================================================
--- test-optional.patch	                        (rev 0)
+++ test-optional.patch	2015-10-31 08:45:46 UTC (rev 145353)
@@ -0,0 +1,11 @@
+--- src/sage/doctest/control.py.orig	2015-10-31 09:40:55.173671531 +0100
++++ src/sage/doctest/control.py	2015-10-31 09:40:05.370125436 +0100
+@@ -253,7 +253,7 @@
+                 if 'optional' in options.optional:
+                     options.optional.discard('optional')
+                     from sage.misc.package import package_versions
+-                    optional_pkgs = package_versions("optional", local=True)
++                    optional_pkgs = {}
+                     for pkg, versions in optional_pkgs.items():
+                         if versions[0] == versions[1]:
+                             options.optional.add(pkg)