From 9174bd253835527cf83aeb53c9bbd0aa937cc067 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 22 Apr 2017 23:44:00 +0200 Subject: [PATCH] pythonPackages.pandas: 0.19.2 -> 0.20.1 --- .../python-modules/pandas/default.nix | 21 ++++++++----------- 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/pkgs/development/python-modules/pandas/default.nix b/pkgs/development/python-modules/pandas/default.nix index 212a382a4b0..eb5b5987a40 100644 --- a/pkgs/development/python-modules/pandas/default.nix +++ b/pkgs/development/python-modules/pandas/default.nix @@ -1,8 +1,9 @@ { buildPythonPackage +, fetchPypi , python , stdenv , fetchurl -, nose +, pytest , glibcLocales , cython , dateutil @@ -27,16 +28,16 @@ let inherit (stdenv) isDarwin; in buildPythonPackage rec { pname = "pandas"; - version = "0.19.2"; + version = "0.20.1"; name = "${pname}-${version}"; - src = fetchurl { - url = "mirror://pypi/${builtins.substring 0 1 pname}/${pname}/${name}.tar.gz"; - sha256 = "6f0f4f598c2b16746803c8bafef7c721c57e4844da752d36240c0acf97658014"; + src = fetchPypi { + inherit pname version; + sha256 = "42707365577ef69f7c9c168ddcf045df2957595a9ee71bc13c7997eecb96b190"; }; LC_ALL = "en_US.UTF-8"; - buildInputs = [ nose glibcLocales ] ++ optional isDarwin libcxx; + buildInputs = [ pytest glibcLocales ] ++ optional isDarwin libcxx; propagatedBuildInputs = [ cython dateutil @@ -70,14 +71,10 @@ in buildPythonPackage rec { ''; # The flag `-A 'not network'` will disable tests that use internet. - # The `-e` flag disables a few problematic tests. checkPhase = '' runHook preCheck - # The flag `-w` provides the initial directory to search for tests. - # The flag `-A 'not network'` will disable tests that use internet. - nosetests -w $out/${python.sitePackages}/pandas --no-path-adjustment -A 'not slow and not network' \ - --verbosity=3 - runHook postCheck + py.test $out/${python.sitePackages}/pandas --skip-slow --skip-network + runHook postCheck ''; meta = {