diff --git a/pkgs/development/python-modules/pyro4/default.nix b/pkgs/development/python-modules/pyro4/default.nix index 70aaaa7b4cfb..7b0c8229c899 100644 --- a/pkgs/development/python-modules/pyro4/default.nix +++ b/pkgs/development/python-modules/pyro4/default.nix @@ -1,12 +1,12 @@ { lib , buildPythonPackage -, fetchPypi -, serpent -, dill , cloudpickle +, dill +, fetchPypi , msgpack -, isPy27 , pytestCheckHook +, pythonAtLeast +, serpent }: buildPythonPackage rec { @@ -14,7 +14,9 @@ buildPythonPackage rec { version = "4.82"; format = "setuptools"; - disabled = isPy27; + # No support Python >= 3.11 + # https://github.com/irmen/Pyro4/issues/246 + disabled = pythonAtLeast "3.11"; src = fetchPypi { pname = "Pyro4"; @@ -37,12 +39,13 @@ buildPythonPackage rec { ]; # add testsupport.py to PATH - preCheck = "PYTHONPATH=tests/PyroTests:$PYTHONPATH"; + preCheck = '' + PYTHONPATH=tests/PyroTests:$PYTHONPATH + ''; - - pytestFlagsArray = [ + disabledTestPaths = [ # ignore network related tests, which fail in sandbox - "--ignore=tests/PyroTests/test_naming.py" + "tests/PyroTests/test_naming.py" ]; disabledTests = [ @@ -61,6 +64,7 @@ buildPythonPackage rec { meta = with lib; { description = "Distributed object middleware for Python (RPC)"; homepage = "https://github.com/irmen/Pyro4"; + changelog = "https://github.com/irmen/Pyro4/releases/tag/${version}"; license = licenses.mit; maintainers = with maintainers; [ prusnak ]; }; diff --git a/pkgs/development/python-modules/pyro5/default.nix b/pkgs/development/python-modules/pyro5/default.nix index e96952174417..7c469595ab74 100644 --- a/pkgs/development/python-modules/pyro5/default.nix +++ b/pkgs/development/python-modules/pyro5/default.nix @@ -1,36 +1,52 @@ -{ buildPythonPackage -, fetchPypi -, lib +{ lib , stdenv +, buildPythonPackage +, fetchPypi , serpent , pythonOlder , pytestCheckHook }: buildPythonPackage rec { - pname = "Pyro5"; + pname = "pyro5"; version = "5.14"; + format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { - inherit pname version; - sha256 = "sha256-ZP3OE3sP5TLohhTSRrfJi74KT0JnhsUkU5rNxeaUCGo="; + pname = "Pyro5"; + inherit version; + hash = "sha256-ZP3OE3sP5TLohhTSRrfJi74KT0JnhsUkU5rNxeaUCGo="; }; - propagatedBuildInputs = [ serpent ]; + propagatedBuildInputs = [ + serpent + ]; - nativeCheckInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ + pytestCheckHook + ]; - # ignore network related tests, which fail in sandbox - disabledTests = [ "StartNSfunc" "Broadcast" "GetIP" "TestNameServer" "TestBCSetup" ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ + disabledTests = [ + # Ignore network related tests, which fail in sandbox + "StartNSfunc" + "Broadcast" + "GetIP" + "TestNameServer" + "TestBCSetup" + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ "Socket" ]; + pythonImportsCheck = [ + "Pyro5" + ]; + meta = with lib; { description = "Distributed object middleware for Python (RPC)"; homepage = "https://github.com/irmen/Pyro5"; + changelog = "https://github.com/irmen/Pyro5/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ peterhoeg ]; };