Merge pull request #34807 from dotlambda/python

python: housekeeping

Changed files
+17 -27
pkgs
development
python-modules
aiohttp
async_timeout
chardet
multidict
pytest-xdist
+1 -2
pkgs/development/python-modules/aiohttp/default.nix
···
, idna-ssl
, pytest
, gunicorn
-
, pytest-raisesregexp
, pytest-mock
}:
···
disabled = pythonOlder "3.4";
-
checkInputs = [ pytest gunicorn pytest-raisesregexp pytest-mock ];
+
checkInputs = [ pytest gunicorn pytest-mock ];
propagatedBuildInputs = [ async-timeout chardet multidict yarl ]
++ lib.optional (pythonOlder "3.7") idna-ssl;
+5 -8
pkgs/development/python-modules/async_timeout/default.nix
···
{ lib
-
, fetchurl
+
, fetchPypi
, buildPythonPackage
, pytestrunner
, pythonOlder
}:
-
let
+
buildPythonPackage rec {
pname = "async-timeout";
version = "2.0.0";
-
in buildPythonPackage rec {
-
name = "${pname}-${version}";
-
src = fetchurl {
-
url = "mirror://pypi/${builtins.substring 0 1 pname}/${pname}/${name}.tar.gz";
+
src = fetchPypi {
+
inherit pname version;
sha256 = "c17d8ac2d735d59aa62737d76f2787a6c938f5a944ecf768a8c0ab70b0dea566";
};
-
buildInputs = [ pytestrunner ];
# Circular dependency on aiohttp
doCheck = false;
···
homepage = https://github.com/aio-libs/async_timeout/;
license = lib.licenses.asl20;
};
-
}
+
}
+1 -2
pkgs/development/python-modules/chardet/default.nix
···
, pytest, pytestrunner, hypothesis }:
buildPythonPackage rec {
-
name = "${pname}-${version}";
pname = "chardet";
version = "3.0.4";
···
sha256 = "1bpalpia6r5x1kknbk11p1fzph56fmmnp405ds8icksd3knr5aw4";
};
-
buildInputs = [ pytest pytestrunner hypothesis ];
+
checkInputs = [ pytest pytestrunner hypothesis ];
meta = with stdenv.lib; {
homepage = https://github.com/chardet/chardet;
+2 -4
pkgs/development/python-modules/multidict/default.nix
···
{ lib
, fetchPypi
, buildPythonPackage
-
, cython
-
, pytest, psutil, pytestrunner
+
, pytest, pytestrunner
, isPy3k
}:
···
sha256 = "0liazqlyk2nmr82nhiw2z72j7bjqxaisifkj476msw140d4i4i7v";
};
-
buildInputs = [ cython ];
-
checkInputs = [ pytest psutil pytestrunner ];
+
checkInputs = [ pytest pytestrunner ];
disabled = !isPy3k;
+8 -11
pkgs/development/python-modules/pytest-xdist/default.nix
···
{ stdenv, fetchPypi, buildPythonPackage, isPy3k, execnet, pytest, setuptools_scm, pytest-forked }:
buildPythonPackage rec {
-
name = "${pname}-${version}";
pname = "pytest-xdist";
version = "1.22.0";
···
sha256 = "65228a859191f2c74ee68c127317eefe35eedd3d43fc1431f19240663b0cafcd";
};
-
buildInputs = [ pytest setuptools_scm pytest-forked];
+
nativeBuildInputs = [ setuptools_scm ];
+
buildInputs = [ pytest pytest-forked ];
propagatedBuildInputs = [ execnet ];
-
postPatch = ''
-
rm testing/acceptance_test.py testing/test_remote.py testing/test_slavemanage.py
-
'';
-
checkPhase = ''
-
py.test testing
+
# Excluded tests access file system
+
py.test testing -k "not test_distribution_rsyncdirs_example \
+
and not test_rsync_popen_with_path \
+
and not test_popen_rsync_subdir \
+
and not test_init_rsync_roots \
+
and not test_rsyncignore"
'';
-
-
# Only test on 3.x
-
# INTERNALERROR> AttributeError: 'NoneType' object has no attribute 'getconsumer'
-
doCheck = isPy3k;
meta = with stdenv.lib; {
description = "py.test xdist plugin for distributed testing and loop-on-failing modes";