diff --git a/pkgs/development/python-modules/curio/default.nix b/pkgs/development/python-modules/curio/default.nix new file mode 100644 index 00000000000..65d225dc377 --- /dev/null +++ b/pkgs/development/python-modules/curio/default.nix @@ -0,0 +1,34 @@ +{ lib +, buildPythonPackage +, fetchPypi +, isPy3k +, pytest +, sphinx +}: + +buildPythonPackage rec { + pname = "curio"; + version = "0.9"; + + src = fetchPypi { + inherit pname version; + sha256 = "51d1a7b49b4f8dd1486ac785c72d522962e93ccfdcfc1f818f5c7553a307b5ef"; + }; + + disabled = !isPy3k; + + checkInputs = [ pytest sphinx ]; + + # test_aside_basic times out, + # test_aside_cancel fails because modifies PYTHONPATH and cant find pytest + checkPhase = '' + pytest --deselect tests/test_task.py::test_aside_basic --deselect tests/test_task.py::test_aside_cancel + ''; + + meta = with lib; { + homepage = "https://github.com/dabeaz/curio"; + description = "Library for performing concurrent I/O with coroutines in Python 3"; + license = licenses.bsd3; + maintainers = [ maintainers.marsam ]; + }; +} diff --git a/pkgs/development/python-modules/sniffio/default.nix b/pkgs/development/python-modules/sniffio/default.nix index 9893bc5828a..f5674c09e02 100644 --- a/pkgs/development/python-modules/sniffio/default.nix +++ b/pkgs/development/python-modules/sniffio/default.nix @@ -1,26 +1,27 @@ { buildPythonPackage, lib, fetchPypi, glibcLocales, isPy3k, contextvars -, pythonOlder +, pythonOlder, pytest, curio }: buildPythonPackage rec { pname = "sniffio"; - version = "1.0.0"; + version = "1.1.0"; src = fetchPypi { inherit pname version; - sha256 = "1dzb0nx3m1hpjgsv6s6w5ac2jcmywcz6gqnfkw8rwz1vkr1836rf"; + sha256 = "8e3810100f69fe0edd463d02ad407112542a11ffdc29f67db2bf3771afb87a21"; }; - # breaks with the following error: - # > TypeError: 'encoding' is an invalid keyword argument for this function disabled = !isPy3k; buildInputs = [ glibcLocales ]; propagatedBuildInputs = lib.optionals (pythonOlder "3.7") [ contextvars ]; - # no tests distributed with PyPI - doCheck = false; + checkInputs = [ pytest curio ]; + + checkPhase = '' + pytest + ''; meta = with lib; { homepage = https://github.com/python-trio/sniffio; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index def44703e4b..ebb423c4732 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -335,6 +335,8 @@ in { cozy = callPackage ../development/python-modules/cozy { }; + curio = callPackage ../development/python-modules/curio { }; + dendropy = callPackage ../development/python-modules/dendropy { }; dependency-injector = callPackage ../development/python-modules/dependency-injector { };