diff options
Diffstat (limited to 'libre/sagemath/test-optional.patch')
| -rw-r--r-- | libre/sagemath/test-optional.patch | 36 |
1 files changed, 25 insertions, 11 deletions
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 |