public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #31103 from rybern/bump-pomegranate

Browse Source 
pythonPackages.pomegranate: 0.8.0 -> 0.8.1
This commit is contained in:
Jörg Thalheim 2017-11-02 08:26:01 +00:00 committed by GitHub
commit 7daa03590d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
pkgs/development/python-modules/joblib/default.nix
View File

@ -6,6 +6,7 @@
, numpydoc , numpydoc
, isPy3k , isPy3k
, stdenv , stdenv
, pytest
}: }:
@ -18,14 +19,10 @@ buildPythonPackage rec {
sha256 = "7b8fd56df36d9731a83729395ccb85a3b401f62a96255deb1a77220c00ed4085"; sha256 = "7b8fd56df36d9731a83729395ccb85a3b401f62a96255deb1a77220c00ed4085";
}; };
checkInputs = [ nose sphinx numpydoc ]; checkInputs = [ sphinx numpydoc pytest ];
# Failing test on Python 3.x and Darwin checkPhase = ''
postPatch = '''' + lib.optionalString (isPy3k || stdenv.isDarwin) '' py.test -k 'not test_disk_used and not test_nested_parallel_warnings' joblib/test
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
''; '';
meta = { meta = {
@ -33,4 +30,4 @@ buildPythonPackage rec {
homepage = http://pythonhosted.org/joblib/; homepage = http://pythonhosted.org/joblib/;
license = lib.licenses.bsd3; license = lib.licenses.bsd3;
}; };
} }

14
pkgs/development/python-modules/pomegranate/default.nix
View File

@ -1,13 +1,15 @@
{ stdenv, buildPythonPackage, fetchPypi, numpy, scipy, cython, networkx, joblib, nose }: { stdenv, buildPythonPackage, fetchFromGitHub, numpy, scipy, cython, networkx, joblib, nose }:
buildPythonPackage rec { buildPythonPackage rec {
pname = "pomegranate"; pname = "pomegranate";
version = "0.8.0"; version = "0.8.1";
name = "${pname}-${version}"; name = "${pname}-${version}";
src = fetchPypi { src = fetchFromGitHub {
inherit pname version; repo = pname;
sha256 = "6b03d05bffbe46c674800652cf273a8d338a2e40001b763cd6925aac0b578a43"; owner = "jmschrei";
rev = "v${version}";
sha256 = "085nka5bh88bxbd5vl1azyv9cfpp6grz2ngclc85f9kgccac1djr";
}; };
propagatedBuildInputs = [ numpy scipy cython networkx joblib ]; propagatedBuildInputs = [ numpy scipy cython networkx joblib ];