Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[20.09] python3Packages.graspy: 0.2.0 -> 0.3.0; unbreak tests #98308

Merged
merged 2 commits into from
Sep 20, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
19 changes: 8 additions & 11 deletions pkgs/development/python-modules/graspy/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,9 @@
, buildPythonPackage
, isPy27
, fetchFromGitHub
, pytest
, pytestCheckHook
, pytestcov
, hyppo
, matplotlib
, networkx
, numpy
Expand All @@ -14,18 +15,19 @@

buildPythonPackage rec {
pname = "graspy";
version = "0.2";
version = "0.3";

disabled = isPy27;

src = fetchFromGitHub {
owner = "neurodata";
repo = pname;
rev = "v${version}";
sha256 = "1ss7d71lwblimg7ri88ir9w59j0ri13wl75091hjf7q0mchqr6yd";
sha256 = "0lab76qiryxvwl6zrcikhnxil1xywl0wkkm2vzi4v9mdzpa7w29r";
};

propagatedBuildInputs = [
hyppo
matplotlib
networkx
numpy
Expand All @@ -34,14 +36,9 @@ buildPythonPackage rec {
seaborn
];

checkInputs = [ pytest pytestcov ];

checkPhase = ''
runHook preCheck
# `test_autogmm` takes too long; fixed in next release (graspy/pull/328)
pytest tests -k 'not test_autogmm'
runHook postCheck
'';
checkInputs = [ pytestCheckHook pytestcov ];
pytestFlagsArray = [ "tests" "--ignore=docs" ];
disabledTests = [ "gridplot_outputs" ];

meta = with lib; {
homepage = "https://graspy.neurodata.io";
Expand Down
40 changes: 40 additions & 0 deletions pkgs/development/python-modules/hyppo/default.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
{ lib
, buildPythonPackage
, isPy27
, fetchFromGitHub
, pytestCheckHook , pytestcov , numba
, numpy
, scikitlearn
, scipy
}:

buildPythonPackage rec {
pname = "hyppo";
version = "0.1.3";

disabled = isPy27;

src = fetchFromGitHub {
owner = "neurodata";
repo = pname;
rev = "v${version}";
sha256 = "0qdnb1l4hz4dgwhapz1fp9sb2vxxvr8h2ngsbvyf50h3kapcn19r";
};

propagatedBuildInputs = [
numba
numpy
scikitlearn
scipy
];

checkInputs = [ pytestCheckHook pytestcov ];
pytestFlagsArray = [ "--ignore=docs" ];

meta = with lib; {
homepage = "https://github.com/neurodata/hyppo";
description = "Indepedence testing in Python";
license = licenses.asl20;
maintainers = with maintainers; [ bcdarwin ];
};
}
2 changes: 2 additions & 0 deletions pkgs/top-level/python-packages.nix
Original file line number Diff line number Diff line change
Expand Up @@ -2759,6 +2759,8 @@ in {

hypothesis = if isPy3k then callPackage ../development/python-modules/hypothesis { } else self.hypothesis_4;

hyppo = callPackage ../development/python-modules/hyppo { };

i3ipc = callPackage ../development/python-modules/i3ipc { };

i3-py = callPackage ../development/python-modules/i3-py { };
Expand Down