summary refs log tree commit diff
path: root/pkgs/development/python-modules/pandas
diff options
context:
space:
mode:
authorFrederik Rietdijk <fridh@fridh.nl>2018-06-12 18:47:03 +0200
committerFrederik Rietdijk <fridh@fridh.nl>2018-06-22 13:09:22 +0200
commitaeef0cd86a48a50a9c4515eacbcc9706f8ae48af (patch)
tree32729951a51723477354997ab529d9bc55db53c0 /pkgs/development/python-modules/pandas
parent7a6a3141407d23e527e2eadc892375f1c982fe40 (diff)
downloadnixpkgs-aeef0cd86a48a50a9c4515eacbcc9706f8ae48af.tar
nixpkgs-aeef0cd86a48a50a9c4515eacbcc9706f8ae48af.tar.gz
nixpkgs-aeef0cd86a48a50a9c4515eacbcc9706f8ae48af.tar.bz2
nixpkgs-aeef0cd86a48a50a9c4515eacbcc9706f8ae48af.tar.lz
nixpkgs-aeef0cd86a48a50a9c4515eacbcc9706f8ae48af.tar.xz
nixpkgs-aeef0cd86a48a50a9c4515eacbcc9706f8ae48af.tar.zst
nixpkgs-aeef0cd86a48a50a9c4515eacbcc9706f8ae48af.zip
python: pandas: 0.22.0 -> 0.23.0
Diffstat (limited to 'pkgs/development/python-modules/pandas')
-rw-r--r--pkgs/development/python-modules/pandas/default.nix13
-rw-r--r--pkgs/development/python-modules/pandas/pandas-0.22.0-pytest-3.5.1.patch13
2 files changed, 6 insertions, 20 deletions
diff --git a/pkgs/development/python-modules/pandas/default.nix b/pkgs/development/python-modules/pandas/default.nix
index cb497742e47..c1f8c791cb9 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 cba71b91316..00000000000
--- 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)
-