summary refs log tree commit diff
diff options
context:
space:
mode:
authorTimo Kaufmann <timokau@zoho.com>2019-11-02 15:15:17 +0100
committerTimo Kaufmann <timokau@zoho.com>2019-11-06 14:40:13 +0100
commitf85ce834ce426ab9abcd66a66d20afef5645baac (patch)
treede5cee7077ec1dc02a30cfb938a67671a450dc10
parentaf480796c9e447e63f2c3720543b8e1c148cf34b (diff)
downloadnixpkgs-f85ce834ce426ab9abcd66a66d20afef5645baac.tar
nixpkgs-f85ce834ce426ab9abcd66a66d20afef5645baac.tar.gz
nixpkgs-f85ce834ce426ab9abcd66a66d20afef5645baac.tar.bz2
nixpkgs-f85ce834ce426ab9abcd66a66d20afef5645baac.tar.lz
nixpkgs-f85ce834ce426ab9abcd66a66d20afef5645baac.tar.xz
nixpkgs-f85ce834ce426ab9abcd66a66d20afef5645baac.tar.zst
nixpkgs-f85ce834ce426ab9abcd66a66d20afef5645baac.zip
sage: ignore deprecation warnings in rst2sws
Needs to be fixed upstream (by werkzeug, twisted). Doesn't impact the
functionality and the tests are soon to be removed with the py3 update
anyway.
-rw-r--r--pkgs/applications/science/math/sage/patches/ignore-cmp-deprecation.patch19
1 files changed, 15 insertions, 4 deletions
diff --git a/pkgs/applications/science/math/sage/patches/ignore-cmp-deprecation.patch b/pkgs/applications/science/math/sage/patches/ignore-cmp-deprecation.patch
index 5c1073e13e9..11ca7481961 100644
--- a/pkgs/applications/science/math/sage/patches/ignore-cmp-deprecation.patch
+++ b/pkgs/applications/science/math/sage/patches/ignore-cmp-deprecation.patch
@@ -1,13 +1,24 @@
 diff --git a/src/sage/tests/cmdline.py b/src/sage/tests/cmdline.py
-index bd6b76ab82..f8340a8c66 100644
+index bd6b76ab82..ccf1203dec 100644
 --- a/src/sage/tests/cmdline.py
 +++ b/src/sage/tests/cmdline.py
-@@ -872,7 +872,7 @@ def test_executable(args, input="", timeout=100.0, **kwds):
+@@ -837,8 +837,6 @@ def test_executable(args, input="", timeout=100.0, **kwds):
+         ///
+         4
+         }}}
+-        sage: err # py2
+-        ''
+         sage: ret
+         0
+ 
+@@ -871,8 +869,8 @@ def test_executable(args, input="", timeout=100.0, **kwds):
+         sage: output = tmp_filename(ext='.sws')
          sage: with open(input, 'w') as F:
          ....:     _ = F.write(s)
-         sage: test_executable(["sage", "--rst2sws", input, output]) # py2
+-        sage: test_executable(["sage", "--rst2sws", input, output]) # py2
 -        ('', '', 0)
-+        ('', '...', 0)
++        sage: test_executable(["sage", "--rst2sws", input, output])[2] # py2
++        0
          sage: import tarfile # py2
          sage: f = tarfile.open(output, 'r') # py2
          sage: print(f.extractfile('sage_worksheet/worksheet.html').read()) # py2