From f5b773beecbb7ea64518570b3c9431afaf606238 Mon Sep 17 00:00:00 2001 From: Ryan Bernstein Date: Wed, 1 Nov 2017 14:37:31 -0400 Subject: [PATCH 1/3] pythonPackages.pomegranate: 0.8.0 -> 0.8.1 Also now using GitHub instead of PiPy, because the PiPy version fails to build. Not sure why they aren't identical. --- .../python-modules/pomegranate/default.nix | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/pomegranate/default.nix b/pkgs/development/python-modules/pomegranate/default.nix index 2884ac9ddc4..fa7eb03fd0b 100644 --- a/pkgs/development/python-modules/pomegranate/default.nix +++ b/pkgs/development/python-modules/pomegranate/default.nix @@ -1,13 +1,15 @@ -{ stdenv, buildPythonPackage, fetchPypi, numpy, scipy, cython, networkx, joblib, nose }: +{ stdenv, buildPythonPackage, fetchFromGitHub, fetchPypi, numpy, scipy, cython, networkx, joblib, nose }: buildPythonPackage rec { pname = "pomegranate"; - version = "0.8.0"; + version = "0.8.1"; name = "${pname}-${version}"; - - src = fetchPypi { - inherit pname version; - sha256 = "6b03d05bffbe46c674800652cf273a8d338a2e40001b763cd6925aac0b578a43"; + + src = fetchFromGitHub { + repo = pname; + owner = "jmschrei"; + rev = "v${version}"; + sha256 = "085nka5bh88bxbd5vl1azyv9cfpp6grz2ngclc85f9kgccac1djr"; }; propagatedBuildInputs = [ numpy scipy cython networkx joblib ]; From 20fd713669da88005f5955d032ba5b306d6a8b78 Mon Sep 17 00:00:00 2001 From: Ryan Bernstein Date: Wed, 1 Nov 2017 14:41:45 -0400 Subject: [PATCH 2/3] pythonPackages.pomegranate: Removed unnecessary dependency --- pkgs/development/python-modules/pomegranate/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/pomegranate/default.nix b/pkgs/development/python-modules/pomegranate/default.nix index fa7eb03fd0b..77b373de259 100644 --- a/pkgs/development/python-modules/pomegranate/default.nix +++ b/pkgs/development/python-modules/pomegranate/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchFromGitHub, fetchPypi, numpy, scipy, cython, networkx, joblib, nose }: +{ stdenv, buildPythonPackage, fetchFromGitHub, numpy, scipy, cython, networkx, joblib, nose }: buildPythonPackage rec { pname = "pomegranate"; From 8796e3b6803b4128fc2c47d5e585519ba62384f0 Mon Sep 17 00:00:00 2001 From: Joerg Thalheim Date: Thu, 2 Nov 2017 08:19:58 +0000 Subject: [PATCH 3/3] python.pkgs.joblib: disable tests properly --- pkgs/development/python-modules/joblib/default.nix | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/joblib/default.nix b/pkgs/development/python-modules/joblib/default.nix index 0efd110d1de..eedbed250a1 100644 --- a/pkgs/development/python-modules/joblib/default.nix +++ b/pkgs/development/python-modules/joblib/default.nix @@ -6,6 +6,7 @@ , numpydoc , isPy3k , stdenv +, pytest }: @@ -18,14 +19,10 @@ buildPythonPackage rec { sha256 = "7b8fd56df36d9731a83729395ccb85a3b401f62a96255deb1a77220c00ed4085"; }; - checkInputs = [ nose sphinx numpydoc ]; + checkInputs = [ sphinx numpydoc pytest ]; - # Failing test on Python 3.x and Darwin - postPatch = '''' + lib.optionalString (isPy3k || stdenv.isDarwin) '' - sed -i -e '70,84d' joblib/test/test_format_stack.py - # test_nested_parallel_warnings: ValueError: Non-zero return code: -9. - # Not sure why but it's nix-specific. Try removing for new joblib releases. - rm joblib/test/test_parallel.py + checkPhase = '' + py.test -k 'not test_disk_used and not test_nested_parallel_warnings' joblib/test ''; meta = { @@ -33,4 +30,4 @@ buildPythonPackage rec { homepage = http://pythonhosted.org/joblib/; license = lib.licenses.bsd3; }; -} \ No newline at end of file +}