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

Merge pull request #91118 from simonchatts/darwin-fixes

Browse Source 
python: aiohttp/psutil/uvloop Darwin fixes
This commit is contained in:
Frederik Rietdijk 2020-06-20 07:40:35 +02:00 committed by GitHub
commit a48adb3511
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pkgs/development/python-modules/aiohttp/default.nix
View File

@ -62,6 +62,7 @@ buildPythonPackage rec {
"test_read_incomplete_chunk" "test_read_incomplete_chunk"
"test_request_tracing_exception" "test_request_tracing_exception"
] ++ lib.optionals stdenv.isDarwin [ ] ++ lib.optionals stdenv.isDarwin [
"test_addresses" # https://github.com/aio-libs/aiohttp/issues/3572
"test_close" "test_close"
]; ];

2
pkgs/development/python-modules/psutil/default.nix
View File

@ -16,7 +16,7 @@ buildPythonPackage rec {
# arch doesn't report frequency is the same way # arch doesn't report frequency is the same way
# tests segfaults on darwin https://github.com/giampaolo/psutil/issues/1715 # tests segfaults on darwin https://github.com/giampaolo/psutil/issues/1715
doCheck = stdenv.isDarwin || stdenv.isx86_64; doCheck = !stdenv.isDarwin && stdenv.isx86_64;
checkInputs = [ pytest ] checkInputs = [ pytest ]
++ lib.optionals isPy27 [ mock ipaddress ]; ++ lib.optionals isPy27 [ mock ipaddress ];
# out must be referenced as test import paths are relative # out must be referenced as test import paths are relative

3
pkgs/development/python-modules/uvloop/default.nix
View File

@ -55,6 +55,9 @@ buildPythonPackage rec {
export TEST_DIR=$(mktemp -d) export TEST_DIR=$(mktemp -d)
cp -r tests $TEST_DIR cp -r tests $TEST_DIR
pushd $TEST_DIR pushd $TEST_DIR
'' + lib.optionalString stdenv.isDarwin ''
# Some tests fail on Darwin
rm tests/test_[stu]*.py
''; '';
postCheck = '' postCheck = ''
popd popd