diff options
| author | Timo Kaufmann <timokau@zoho.com> | 2018-10-22 14:51:03 +0200 |
|---|---|---|
| committer | Timo Kaufmann <timokau@zoho.com> | 2018-10-22 14:52:19 +0200 |
| commit | db75fe73138cadea7011b59afda7b684321075d7 (patch) | |
| tree | 86d609f912d956239f04a4ba99907d2198016bae | |
| parent | 5f33fbbc7beef255c411fcbc3c4dea30fb260d6d (diff) | |
| download | nixlib-db75fe73138cadea7011b59afda7b684321075d7.tar nixlib-db75fe73138cadea7011b59afda7b684321075d7.tar.gz nixlib-db75fe73138cadea7011b59afda7b684321075d7.tar.bz2 nixlib-db75fe73138cadea7011b59afda7b684321075d7.tar.lz nixlib-db75fe73138cadea7011b59afda7b684321075d7.tar.xz nixlib-db75fe73138cadea7011b59afda7b684321075d7.tar.zst nixlib-db75fe73138cadea7011b59afda7b684321075d7.zip | |
sage: fix doctest
The test is depending on the "py2" tag always being added. I patched that recently to make it possible to test sagedoc individually. Somehow I missed this doctest.
| -rw-r--r-- | pkgs/applications/science/math/sage/patches/Only-test-py2-py3-optional-tests-when-all-of-sage-is.patch | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/pkgs/applications/science/math/sage/patches/Only-test-py2-py3-optional-tests-when-all-of-sage-is.patch b/pkgs/applications/science/math/sage/patches/Only-test-py2-py3-optional-tests-when-all-of-sage-is.patch index 2a7dc13756d9..8cd80281d0e4 100644 --- a/pkgs/applications/science/math/sage/patches/Only-test-py2-py3-optional-tests-when-all-of-sage-is.patch +++ b/pkgs/applications/science/math/sage/patches/Only-test-py2-py3-optional-tests-when-all-of-sage-is.patch @@ -1,14 +1,14 @@ -From c8edfefbbec87ca776d3cf84ee895aac200dda40 Mon Sep 17 00:00:00 2001 +From 8218bd4fdeb4c92de8af0d3aabec55980fc4fb3d Mon Sep 17 00:00:00 2001 From: Timo Kaufmann <timokau@zoho.com> Date: Sun, 21 Oct 2018 17:52:40 +0200 Subject: [PATCH] Only test py2/py3 optional tests when all of sage is tested --- - src/sage/doctest/control.py | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) + src/sage/doctest/control.py | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/sage/doctest/control.py b/src/sage/doctest/control.py -index bf18df8b2b..b04af0e2e8 100644 +index bf18df8b2b..935c67abf7 100644 --- a/src/sage/doctest/control.py +++ b/src/sage/doctest/control.py @@ -362,7 +362,8 @@ class DocTestController(SageObject): @@ -21,6 +21,15 @@ index bf18df8b2b..b04af0e2e8 100644 self.options = options +@@ -765,7 +766,7 @@ class DocTestController(SageObject): + sage: DC = DocTestController(DD, [dirname]) + sage: DC.expand_files_into_sources() + sage: sorted(DC.sources[0].options.optional) # abs tol 1 +- ['guava', 'magma', 'py2'] ++ ['guava', 'magma'] + + We check that files are skipped appropriately:: + -- 2.18.1 |