Merge pull request #10296 from FRidh/pandas

python packages updates

pkgs/top-level/python-packages.nix

@@ -9313,15 +9313,16 @@ let
       modules.sqlite3
     ];
 
+    preCheck = ''
       # Test does not work on Py3k because it calls 'python'.
       # https://github.com/nipy/nibabel/issues/341
-
+      rm nisext/tests/test_testers.py
       # Test fails with numpy 1.10.1: ERROR: nibabel.tests.test_proxy_api.TestPARRECAPI.test_proxy_slicing
       # See https://github.com/nipy/nibabel/pull/358
       # and https://github.com/numpy/numpy/issues/6491
-    preCheck = ''
-      rm nisext/tests/test_testers.py
       rm nibabel/tests/test_proxy_api.py
+      # https://github.com/nipy/nibabel/issues/366
+      rm nisext/tests/test_doctest_markup.py
     '';
 
     meta = {
@@ -9387,6 +9388,26 @@ let
     };
   };
 
+  nose-exclude = buildPythonPackage rec {
+    name = "nose-exclude-${version}";
+    version = "0.4.1";
+
+    src = pkgs.fetchurl {
+      url = "https://pypi.python.org/packages/source/n/nose-exclude/${name}.tar.gz";
+      sha256 = "44466a9bcb56d2e568750f91504d1278c74eabb259a305b06e975b87b51635da";
+    };
+
+    propagatedBuildInputs = with self; [ nose ];
+
+    meta = {
+      license = licenses.lgpl21;
+      description = "Exclude specific directories from nosetests runs";
+      homepage = https://github.com/kgrandis/nose-exclude;
+      maintainers = with maintainers; [ fridh ];
+    };
+
+  };
+
   nose-selecttests = buildPythonPackage rec {
     version = "0.4";
     name = "nose-selecttests-${version}";
@@ -10038,14 +10059,15 @@ let
     inherit (pkgs.stdenv.lib) optional optionalString;
     inherit (pkgs.stdenv) isDarwin;
   in buildPythonPackage rec {
-    name = "pandas-0.16.2";
+    name = "pandas-${version}";
+    version = "0.17.0";
 
     src = pkgs.fetchurl {
       url = "https://pypi.python.org/packages/source/p/pandas/${name}.tar.gz";
-      sha256 = "10agmrkps8bi5948vwpipfxds5kj1d076m9i0nhaxwqiw7gm6670";
+      sha256 = "320d4fdf734b82adebc8fde9d8ca4b05fe155a72b6f7aa95d76242da8748d6a4";
     };
 
-    buildInputs = [ self.nose ] ++ optional isDarwin pkgs.libcxx;
+    buildInputs = with self; [ nose ] ++ optional isDarwin pkgs.libcxx;
     propagatedBuildInputs = with self; [
       dateutil
       numpy
@@ -10071,31 +10093,16 @@ let
                   "['pandas/src/klib', 'pandas/src', '$cpp_sdk']"
     '';
 
-    preCheck = ''
+    # The flag `-A 'not network'` will disable tests that use internet.
-      # Broken test, probably https://github.com/pydata/pandas/issues/10312:
+    # The `-e` flag disables a few problematic tests.
-      rm pandas/io/tests/test_html.py
+    # https://github.com/pydata/pandas/issues/11169
-
+    # https://github.com/pydata/pandas/issues/11287
-      # Hitting https://github.com/pydata/pandas/pull/7362 on python
-      # 3.3 and 3.4, not sure why:
-      rm pandas/tseries/tests/test_daterange.py
-
-      # Need to skip this test; insert a line here... hacky but oh well.
-      badtest=pandas/tseries/tests/test_timezones.py
-      fixed=$TMPDIR/fixed_test_timezones.py
-      touch $fixed
-      head -n 602 $badtest > $fixed
-      echo '        raise nose.SkipTest("Not working")' >> $fixed
-      tail -n +603 $badtest >> $fixed
-      mv $fixed $badtest
-    '';
-
     checkPhase = ''
       runHook preCheck
-
       # The flag `-A 'not network'` will disable tests that use internet.
       # The `-e` flag disables a few problematic tests.
       ${python.executable} setup.py nosetests -A 'not network' --stop \
-        -e 'test_clipboard|test_series' --verbosity=3
+        -e 'test_data|test_excel|test_html|test_json|test_frequencies|test_frame' --verbosity=3
 
       runHook postCheck
     '';
@@ -16159,11 +16166,11 @@ let
 
   xray = buildPythonPackage rec {
     name = "xray-${version}";
-    version = "0.6.0";
+    version = "0.6.1";
 
     src = pkgs.fetchurl {
       url = "https://pypi.python.org/packages/source/x/xray/${name}.tar.gz";
-      sha256 = "c8c4aadb0d39662a81c259bd609f42708ff31c90012a9dd0a1f9ee56a798196f";
+      sha256 = "bfbc307203d5433b4da31c210773c8474c237ff97350874b6e436d452fb9dfc8";
     };
 
     buildInputs = with self; [nose];