Merge branch 'master' into staging-next

A mass darwin rebuild from master (#55784).
This commit is contained in:
Vladimír Čunát
2019-02-17 07:58:47 +01:00
62 changed files with 838 additions and 413 deletions

View File

@@ -16,6 +16,7 @@
, lxml
, html5lib
, beautifulsoup4
, hypothesis
, openpyxl
, tables
, xlwt
@@ -28,16 +29,17 @@ let
in buildPythonPackage rec {
pname = "pandas";
version = "0.23.4";
version = "0.24.1";
src = fetchPypi {
inherit pname version;
sha256 = "5b24ca47acf69222e82530e89111dd9d14f9b970ab2cd3a1c2c78f0c4fbba4f4";
sha256 = "435821cb2501eabbcee7e83614bd710940dc0cf28b5afbc4bdb816c31cec71af";
};
checkInputs = [ pytest glibcLocales moto ];
checkInputs = [ pytest glibcLocales moto hypothesis ];
buildInputs = [ cython ] ++ optional isDarwin libcxx;
nativeBuildInputs = [ cython ];
buildInputs = optional isDarwin libcxx;
propagatedBuildInputs = [
dateutil
scipy