From aeef0cd86a48a50a9c4515eacbcc9706f8ae48af Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Tue, 12 Jun 2018 18:47:03 +0200
Subject: [PATCH] python: pandas: 0.22.0 -> 0.23.0

---
 pkgs/development/python-modules/pandas/default.nix  | 13 ++++++-------
 .../pandas/pandas-0.22.0-pytest-3.5.1.patch         | 13 -------------
 2 files changed, 6 insertions(+), 20 deletions(-)
 delete mode 100644 pkgs/development/python-modules/pandas/pandas-0.22.0-pytest-3.5.1.patch

diff --git a/pkgs/development/python-modules/pandas/default.nix b/pkgs/development/python-modules/pandas/default.nix
index cb497742e47a..c1f8c791cb9b 100644
--- a/pkgs/development/python-modules/pandas/default.nix
+++ b/pkgs/development/python-modules/pandas/default.nix
@@ -28,16 +28,18 @@ let
   inherit (stdenv) isDarwin;
 in buildPythonPackage rec {
   pname = "pandas";
-  version = "0.22.0";
-  name = "${pname}-${version}";
+  version = "0.23.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "44a94091dd71f05922eec661638ec1a35f26d573c119aa2fad964f10a2880e6c";
+    sha256 = "84ab1d50590cb2d9554211f164dc1b1a216bc94da2ba922aed2690c83f248fd9";
   };
 
   LC_ALL = "en_US.UTF-8";
-  buildInputs = [ pytest glibcLocales ] ++ optional isDarwin libcxx;
+
+  checkInputs = [ pytest glibcLocales moto ];
+
+  buildInputs = [] ++ optional isDarwin libcxx;
   propagatedBuildInputs = [
     cython
     dateutil
@@ -55,8 +57,6 @@ in buildPythonPackage rec {
     xlwt
   ];
 
-  patches = [ ./pandas-0.22.0-pytest-3.5.1.patch ];
-
   # For OSX, we need to add a dependency on libcxx, which provides
   # `complex.h` and other libraries that pandas depends on to build.
   postPatch = optionalString isDarwin ''
@@ -67,7 +67,6 @@ in buildPythonPackage rec {
                 "['pandas/src/klib', 'pandas/src', '$cpp_sdk']"
   '';
 
-  checkInputs = [ moto ];
   checkPhase = ''
     runHook preCheck
   ''
diff --git a/pkgs/development/python-modules/pandas/pandas-0.22.0-pytest-3.5.1.patch b/pkgs/development/python-modules/pandas/pandas-0.22.0-pytest-3.5.1.patch
deleted file mode 100644
index cba71b91316a..000000000000
--- a/pkgs/development/python-modules/pandas/pandas-0.22.0-pytest-3.5.1.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- a/pandas/tests/io/test_pytables.py
-+++ b/pandas/tests/io/test_pytables.py
-@@ -5028,8 +5028,8 @@ class TestHDFStore(Base):
-             with ensure_clean_path(self.path) as path:
-                 with catch_warnings(record=True):
-                     with pytest.raises(
--                        ValueError, msg=("cannot have non-object label "
--                                         "DataIndexableCol")):
-+                        ValueError, message=("cannot have non-object label "
-+                                             "DataIndexableCol")):
-                         df.to_hdf(path, 'df', format='table',
-                                   data_columns=True)
-