From 43fd8d29f8c42e019cf11cf3e7a358f48b630577 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:06:07 +0200 Subject: [PATCH] python3Packages.execnet: 1.9.0 -> 2.0.2 --- .../python-modules/execnet/default.nix | 39 +++++++++---------- 1 file changed, 18 insertions(+), 21 deletions(-) diff --git a/pkgs/development/python-modules/execnet/default.nix b/pkgs/development/python-modules/execnet/default.nix index 528e849290db..eb184c180d5b 100644 --- a/pkgs/development/python-modules/execnet/default.nix +++ b/pkgs/development/python-modules/execnet/default.nix @@ -2,31 +2,22 @@ , buildPythonPackage , isPyPy , fetchPypi -, fetchpatch +, hatchling +, hatch-vcs +, gevent , pytestCheckHook -, setuptools-scm -, apipkg -, py }: buildPythonPackage rec { pname = "execnet"; - version = "1.9.0"; - format = "setuptools"; + version = "2.0.2"; + format = "pyproject"; src = fetchPypi { inherit pname version; - sha256 = "8f694f3ba9cc92cab508b152dcfe322153975c29bda272e2fd7f3f00f36e47c5"; + hash = "sha256-zFm8RCN0L9ca0icSLrDdRNtR77PcQJW0WsmgjHcAlq8="; }; - patches = [ - (fetchpatch { - # Fix test compat with pytest 7.2.0 - url = "https://github.com/pytest-dev/execnet/commit/c0459b92bc4a42b08281e69b8802d24c5d3415d4.patch"; - hash = "sha256-AT2qr7AUpFXcPps525U63A7ARcEVmf0HM6ya73Z2vi0="; - }) - ]; - postPatch = '' # remove vbox tests rm testing/test_termination.py @@ -38,21 +29,27 @@ buildPythonPackage rec { ''; nativeBuildInputs = [ - setuptools-scm - ]; - - propagatedBuildInputs = [ - apipkg + hatchling + hatch-vcs ]; # sometimes crashes with: OSError: [Errno 9] Bad file descriptor doCheck = !isPyPy; nativeCheckInputs = [ - py # no longer required with 1.10.0 + gevent pytestCheckHook ]; + disabledTests = [ + # gets stuck + "test_popen_io" + # OSError: [Errno 9] Bad file descriptor + "test_stdouterrin_setnull" + ]; + + pytestFlagsArray = [ "-vvv" ]; + pythonImportsCheck = [ "execnet" ];