Merge pull request #15294 from rardiol/sympy

sympy and mathics update

pkgs/development/python-modules/mathics/disable_console_tests.patch

@@ -1,21 +0,0 @@
-These tests require that Mathics already be installed to work,
-which is not true when nix runs them.
-
---- a/test/test_console.py	2015-09-07 21:41:08.530501979 -0700
-+++ b/test/test_console.py	2015-09-07 21:42:44.082176084 -0700
-@@ -13,6 +13,7 @@
-         os.environ["TERM"] = "dumb"
-         self.console = pexpect.spawn('python2 mathics/main.py --color NOCOLOR')
- 
-+    @unittest.expectedFailure
-     def testLaunch(self):
-         cons = self.console
- 
-@@ -41,6 +42,7 @@
-             'Quit by pressing CONTROL-D\r\n'
-             '\r\n')
- 
-+    @unittest.expectedFailure
-     def testPrompt(self):
-         cons = self.console
-         cons.expect('Quit by pressing CONTROL-D\r\n\r\n')

pkgs/top-level/python-packages.nix

@@ -11787,17 +11787,15 @@ in modules // {
 
   mathics = buildPythonPackage rec {
     name = "mathics-${version}";
-    version = "0.8";
+    version = "0.9";
     src = pkgs.fetchFromGitHub {
       owner = "mathics";
       repo = "Mathics";
       rev = "v${version}";
-      sha256 = "1hyrxnhxw35vn00k55hp9bkg8vg4dsphrpfg1yg4cn53y78rk1im";
+      sha256 = "0xzz7j8xskj5y6as178mjmm0i2xbhd4q4mwmdnvghpd2aqq3qx1c";
     };
 
-    disabled = isPy3k;
+    disabled = isPy26;
-
-    patches = [ ../development/python-modules/mathics/disable_console_tests.patch ];
 
     buildInputs = with self; [ pexpect ];
 
@@ -11806,17 +11804,17 @@ in modules // {
     '';
 
     propagatedBuildInputs = with self; [
-      argparse
       cython
-      colorama
-      dateutil
-      django_1_6
-      mpmath
-      readline
-      interruptingcow
-      ply
-      sqlite3
       sympy
+      django_1_8
+      ply
+      mpmath
+      dateutil
+      colorama
+      six
+
+      readline
+      sqlite3
     ];
 
     meta = {
@@ -20414,16 +20412,17 @@ in modules // {
   };
 
   sympy = buildPythonPackage rec {
-    name = "sympy-0.7.6.1";
+    name = "sympy-1.0";
-    disabled = isPy34 || isPy35 || isPyPy;  # some tests fail
 
     src = pkgs.fetchurl {
       url    = "mirror://pypi/s/sympy/${name}.tar.gz";
-      sha256 = "1fc272b51091aabe7d07f1bf9f0a47f3e28657fb2bec52bf3ef0e8f159f5f564";
+      sha256 = "1bpzjwr9hrr7w88v4vgnj9lr6vxcldc94si13n8xpr1rv08d5b1y";
     };
 
     buildInputs = [ pkgs.glibcLocales ];
 
+    propagatedBuildInputs = with self; [ mpmath ];
+
     preCheck = ''
       export LANG="en_US.UTF-8"
     '';