diff options
| author | Orivej Desh <orivej@gmx.fr> | 2018-06-03 12:15:25 +0000 |
|---|---|---|
| committer | Orivej Desh <orivej@gmx.fr> | 2018-06-03 12:15:25 +0000 |
| commit | 420827170c2843ec1fd44f08353d3782e9bc31e3 (patch) | |
| tree | 9e2db2693adfe86d9d9084f1d095479265321a81 /pkgs/development/python-modules | |
| parent | ccd8ac22869b7db8317a480314b13557b89c4ed9 (diff) | |
| parent | 448d7d648d1a2e8aacc85f9d0abc90643ca2e89b (diff) | |
| download | nixpkgs-420827170c2843ec1fd44f08353d3782e9bc31e3.tar nixpkgs-420827170c2843ec1fd44f08353d3782e9bc31e3.tar.gz nixpkgs-420827170c2843ec1fd44f08353d3782e9bc31e3.tar.bz2 nixpkgs-420827170c2843ec1fd44f08353d3782e9bc31e3.tar.lz nixpkgs-420827170c2843ec1fd44f08353d3782e9bc31e3.tar.xz nixpkgs-420827170c2843ec1fd44f08353d3782e9bc31e3.tar.zst nixpkgs-420827170c2843ec1fd44f08353d3782e9bc31e3.zip | |
Merge branch 'master' into staging
* master: (25 commits) prosody: 0.10.1 -> 0.10.2 mpd: fix spelling in description pulseaudio-ctl: init at 1.66 qt: remove install_name_tool stuff multimc: 0.6.1 -> 0.6.2 lib: test for bitAnd, bitOr, bitXor pandas: fix check with the current pytest qt: fixup from c4cac55d6979ccdbc48cf0daf26e44c79cf5d0f9 calibre: 2.24.1 -> 2.25.0 spotify: 1.0.79.223.g92622cc2-21 -> 1.0.80.480.g51b03ac3-13 (#41356) libbsd-freedesktop: re-init at 0.9.1, use for samba sbt: 1.1.4 -> 1.1.6 nixos/slurm: remove propagatedBuidInputs from slurmWrapped gitkraken: 3.6.1 -> 3.6.3 pass-import: export PREFIX, set PASSWORD_STORE_BIN pass: Add pass-audit extension slurm: add maintainer nixos/slurm: update test, add test for enableStools slurm: add freeipmi, readline, libssh2, fix hwloc nixos/slurm: Add man pages to wrapedSlurm ...
Diffstat (limited to 'pkgs/development/python-modules')
| -rw-r--r-- | pkgs/development/python-modules/pandas/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/development/python-modules/pandas/pandas-0.22.0-pytest-3.5.1.patch | 13 |
2 files changed, 15 insertions, 0 deletions
diff --git a/pkgs/development/python-modules/pandas/default.nix b/pkgs/development/python-modules/pandas/default.nix index 3f9188a6322..cb497742e47 100644 --- a/pkgs/development/python-modules/pandas/default.nix +++ b/pkgs/development/python-modules/pandas/default.nix @@ -55,6 +55,8 @@ 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 '' 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 new file mode 100644 index 00000000000..cba71b91316 --- /dev/null +++ b/pkgs/development/python-modules/pandas/pandas-0.22.0-pytest-3.5.1.patch @@ -0,0 +1,13 @@ +--- 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) + |