From eea396ca9b54a4b0152723d77f77cdf90d5356a5 Mon Sep 17 00:00:00 2001 From: Patrick Callahan Date: Thu, 20 Jul 2017 10:02:48 -0700 Subject: [PATCH 1/3] pythonPackages.arrow: 0.7.0 -> 0.10.0 --- pkgs/top-level/python-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index f8ed854cf69..f3c788894f4 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -765,15 +765,15 @@ in { arrow = buildPythonPackage rec { name = "arrow-${version}"; - version = "0.7.0"; + version = "0.10.0"; src = pkgs.fetchurl { url = "mirror://pypi/a/arrow/${name}.tar.gz"; - sha256 = "0yx10dz3hp825fcq9w15zbp26v622npcjscb91da05zig8036lra"; + sha256 = "08n7q2l69hlainds1byd4lxhwrq7zsw7s640zkqc3bs5jkq0cnc0"; }; checkPhase = '' - nosetests + nosetests --cover-package=arrow ''; buildInputs = with self; [ nose chai simplejson ]; From 98fe450553c34e44232971fbaad8709b853e89c8 Mon Sep 17 00:00:00 2001 From: Patrick Callahan Date: Thu, 20 Jul 2017 10:03:09 -0700 Subject: [PATCH 2/3] pythonPackages.pympler: disable tests on Darwin since the included psutil test needs /proc --- pkgs/top-level/python-packages.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index f3c788894f4..cf48a16aa9c 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -14023,6 +14023,8 @@ in { substituteInPlace ./test/asizeof/test_asizeof.py --replace "self.assert_(not e" "#self.assert_(not e" ''; + doCheck = stdenv.hostPlatform.isLinux; + meta = { description = "Tool to measure, monitor and analyze memory behavior"; homepage = http://pythonhosted.org/Pympler/; From ce67c7c1aca192540ecccafe9c2d83cacec16817 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Fri, 21 Jul 2017 14:10:05 +0100 Subject: [PATCH 3/3] pythonPackages.arrow: move to python-modules --- .../python-modules/arrow/default.nix | 27 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 23 +--------------- 2 files changed, 28 insertions(+), 22 deletions(-) create mode 100644 pkgs/development/python-modules/arrow/default.nix diff --git a/pkgs/development/python-modules/arrow/default.nix b/pkgs/development/python-modules/arrow/default.nix new file mode 100644 index 00000000000..a85987a95b1 --- /dev/null +++ b/pkgs/development/python-modules/arrow/default.nix @@ -0,0 +1,27 @@ +{ stdenv, buildPythonPackage, fetchPypi +, nose, chai, simplejson +, dateutil }: + +buildPythonPackage rec { + name = "${pname}-${version}"; + pname = "arrow"; + version = "0.10.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "08n7q2l69hlainds1byd4lxhwrq7zsw7s640zkqc3bs5jkq0cnc0"; + }; + + checkPhase = '' + nosetests --cover-package=arrow + ''; + + buildInputs = [ nose chai simplejson ]; + propagatedBuildInputs = [ dateutil ]; + + meta = with stdenv.lib; { + description = "Python library for date manipulation"; + license = "apache"; + maintainers = with maintainers; [ thoughtpolice ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index cf48a16aa9c..fd002ed74ca 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -763,28 +763,7 @@ in { }; - arrow = buildPythonPackage rec { - name = "arrow-${version}"; - version = "0.10.0"; - - src = pkgs.fetchurl { - url = "mirror://pypi/a/arrow/${name}.tar.gz"; - sha256 = "08n7q2l69hlainds1byd4lxhwrq7zsw7s640zkqc3bs5jkq0cnc0"; - }; - - checkPhase = '' - nosetests --cover-package=arrow - ''; - - buildInputs = with self; [ nose chai simplejson ]; - propagatedBuildInputs = with self; [ dateutil ]; - - meta = { - description = "Python library for date manipulation"; - license = "apache"; - maintainers = with maintainers; [ thoughtpolice ]; - }; - }; + arrow = callPackage ../development/python-modules/arrow { }; async = buildPythonPackage rec { name = "async-0.6.1";