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

Jump to bottom

Fix Numpy on PyPy #53771

Closed
wants to merge 4 commits into from
Closed

Fix Numpy on PyPy #53771

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
08f912e
funcsigs: fix tests on pypy3
leo60228 Jan 10, 2019
667fac0
pytest: disable tests on pypy
leo60228 Jan 10, 2019
6dc6e89
mock: disable tests on pypy
leo60228 Jan 10, 2019
f9cff8a
numpy: enable on pypy (without tests)
leo60228 Jan 10, 2019
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
9 changes: 8 additions & 1 deletion pkgs/development/python-modules/funcsigs/default.nix
View file
Open in desktop
@@ -1,4 +1,4 @@
{ stdenv, buildPythonPackage, fetchPypi
{ stdenv, buildPythonPackage, fetchPypi, fetchpatch
, unittest2 }:

buildPythonPackage rec {
Expand All @@ -9,6 +9,13 @@ buildPythonPackage rec {
inherit pname version;
sha256 = "0l4g5818ffyfmfs1a924811azhjj8ax9xd1cffr1mzd3ycn0zfx7";
};

patches = [
(fetchpatch {
url = "https://raw.githubusercontent.com/gentoo/gentoo/fd9a5a0a3c15d7400b936ce0f0814fd4078e900c/dev-python/funcsigs/files/funcsigs-1.0.2-fix-pypy3-tests.patch";
sha256 = "04pqkgglqxdkvq07mbr21zlijwiw8jarrb10r4d4yxr3swn3zsl6";
})
];

buildInputs = [ unittest2 ];

Expand Down
2 changes: 2 additions & 0 deletions pkgs/development/python-modules/mock/default.nix
View file
Open in desktop
Expand Up @@ -6,6 +6,7 @@
, six
, pbr
, python
, isPyPy
}:

buildPythonPackage rec {
Expand All @@ -20,6 +21,7 @@ buildPythonPackage rec {
buildInputs = [ unittest2 ];
propagatedBuildInputs = [ funcsigs six pbr ];

doCheck = !isPyPy;
checkPhase = ''
${python.interpreter} -m unittest discover
'';
Expand Down
3 changes: 2 additions & 1 deletion pkgs/development/python-modules/numpy/default.nix
View file
Open in desktop
Expand Up @@ -24,7 +24,6 @@ in buildPythonPackage rec {
sha256 = "3d734559db35aa3697dadcea492a423118c5c55d176da2f3be9c98d4803fc2a7";
};

disabled = isPyPy;
nativeBuildInputs = [ gfortran pytest ];
buildInputs = [ blas ];

Expand Down Expand Up @@ -58,6 +57,8 @@ in buildPythonPackage rec {

enableParallelBuilding = true;

doCheck = !isPyPy;

checkPhase = ''
runHook preCheck
pushd dist
Expand Down
3 changes: 2 additions & 1 deletion pkgs/development/python-modules/pytest/default.nix
View file
Open in desktop
@@ -1,6 +1,6 @@
{ stdenv, buildPythonPackage, pythonOlder, fetchPypi, attrs, hypothesis, py
, setuptools_scm, setuptools, six, pluggy, funcsigs, isPy3k, more-itertools
, atomicwrites, mock, writeText, pathlib2
, atomicwrites, mock, writeText, pathlib2, isPyPy
}:

let generic = { version, sha256 }:
Expand All @@ -23,6 +23,7 @@ let generic = { version, sha256 }:
++ stdenv.lib.optionals (!isPy3k) [ funcsigs ]
++ stdenv.lib.optionals (pythonOlder "3.6") [ pathlib2 ];

doCheck = !isPyPy;
checkPhase = ''
runHook preCheck
$out/bin/py.test -x testing/
Expand Down