From 64026f84a7ec2e0279abcb85c69bbb9f296b89d0 Mon Sep 17 00:00:00 2001
From: André Fabian Silva Delgado <emulatorman@parabola.nu>
Date: Sun, 23 Oct 2016 21:52:41 -0300
Subject: sagemath-7.4-2.parabola1: updating version

---
 libre/sagemath/test-optional.patch | 36 +++++++++++++++++++++++++-----------
 1 file changed, 25 insertions(+), 11 deletions(-)

(limited to 'libre/sagemath/test-optional.patch')

diff --git a/libre/sagemath/test-optional.patch b/libre/sagemath/test-optional.patch
index 385f0bbe9..1918cbe5d 100644
--- a/libre/sagemath/test-optional.patch
+++ b/libre/sagemath/test-optional.patch
@@ -1,11 +1,25 @@
---- 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)
+--- src/sage/doctest/control.py.orig       2016-10-20 19:39:53.714618246 +0200
++++ src/sage/doctest/control.py    2016-10-20 19:40:15.158049920 +0200
+@@ -307,22 +307,6 @@
+             if "all" in options.optional:
+                 # Special case to run all optional tests
+                 options.optional = True
+-            else:
+-                # We replace the 'optional' tag by all optional
+-                # packages for which the installed version matches the
+-                # latest available version (this implies in particular
+-                # that the package is actually installed).
+-                if 'optional' in options.optional:
+-                    options.optional.discard('optional')
+-                    from sage.misc.package import list_packages
+-                    for pkg in list_packages('optional', local=True).values():
+-                        if pkg['installed_version'] == pkg['remote_version']:
+-                            options.optional.add(pkg['name'])
+-
+-                # Check that all tags are valid
+-                for o in options.optional:
+-                    if not optionaltag_regex.search(o):
+-                        raise ValueError('invalid optional tag {!r}'.format(o))
+ 
+         self.options = options
+         self.files = args
-- 
cgit v1.2.3