diff --git a/pkgs/development/python-modules/busypie/default.nix b/pkgs/development/python-modules/busypie/default.nix new file mode 100644 index 000000000000..9539d3f4371e --- /dev/null +++ b/pkgs/development/python-modules/busypie/default.nix @@ -0,0 +1,53 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pytest-asyncio +, pytest-timeout +, pytestCheckHook +, pythonOlder +, setuptools +, wheel +}: + +buildPythonPackage rec { + pname = "busypie"; + version = "0.5.1"; + pyproject = true; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "rockem"; + repo = "busypie"; + rev = "refs/tags/v${version}"; + hash = "sha256-dw0Sc/a27/EYY7LVMQqDkYuxrUFYK+N6XLk6A7A/eS8="; + }; + + postPatch = '' + substituteInPlace setup.py \ + --replace "pytest-runner" "" + ''; + + nativeBuildInputs = [ + setuptools + wheel + ]; + + nativeCheckInputs = [ + pytest-asyncio + pytest-timeout + pytestCheckHook + ]; + + pythonImportsCheck = [ + "busypie" + ]; + + meta = with lib; { + description = "Expressive busy wait for Python"; + homepage = "https://github.com/rockem/busypie"; + changelog = "https://github.com/rockem/busypie/releases/tag/v${version}"; + license = licenses.asl20; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/pubnub/default.nix b/pkgs/development/python-modules/pubnub/default.nix index f35edd59794a..2e58df25f2f4 100644 --- a/pkgs/development/python-modules/pubnub/default.nix +++ b/pkgs/development/python-modules/pubnub/default.nix @@ -1,6 +1,7 @@ { lib , aiohttp , buildPythonPackage +, busypie , cbor2 , fetchFromGitHub , pycryptodomex @@ -13,7 +14,7 @@ buildPythonPackage rec { pname = "pubnub"; - version = "7.2.0"; + version = "7.3.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -21,8 +22,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = pname; repo = "python"; - rev = "refs/tags/${version}"; - hash = "sha256-AUB6pk3Gkrjc0RRFP0mql+up1baPjyPwuiRz8O6r/GM="; + rev = "refs/tags/v${version}"; + hash = "sha256-KZC6a0ZrTPn033tQxn7HeCRhZUAgO2I5rGDzLJITtpI="; }; propagatedBuildInputs = [ @@ -33,6 +34,7 @@ buildPythonPackage rec { ]; nativeCheckInputs = [ + busypie pytest-asyncio pytest-vcr pytestCheckHook @@ -45,6 +47,11 @@ buildPythonPackage rec { "tests/functional/push" ]; + disabledTests = [ + "test_subscribe" + "test_handshaking" + ]; + pythonImportsCheck = [ "pubnub" ]; @@ -52,7 +59,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python-based APIs for PubNub"; homepage = "https://github.com/pubnub/python"; - changelog = "https://github.com/pubnub/python/releases/tag/${version}"; + changelog = "https://github.com/pubnub/python/releases/tag/v${version}"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 7351988a0fcb..386396d3d0dc 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1697,6 +1697,8 @@ self: super: with self; { bundlewrap = callPackage ../development/python-modules/bundlewrap { }; + busypie = callPackage ../development/python-modules/busypie { }; + bx-py-utils = callPackage ../development/python-modules/bx-py-utils { }; bx-python = callPackage ../development/python-modules/bx-python { };