Merge pull request #212433 from fabaff/pypro4-fix

python310Packages.Pyro4: disable on Python >= 3.11

authored by Pavol Rusnak and committed by GitHub eb95aa03 3d309cd8

+40 -20
+13 -9
pkgs/development/python-modules/pyro4/default.nix
··· 1 1 { lib 2 2 , buildPythonPackage 3 - , fetchPypi 4 - , serpent 5 - , dill 6 3 , cloudpickle 4 + , dill 5 + , fetchPypi 7 6 , msgpack 8 - , isPy27 9 7 , pytestCheckHook 8 + , pythonAtLeast 9 + , serpent 10 10 }: 11 11 12 12 buildPythonPackage rec { ··· 14 14 version = "4.82"; 15 15 format = "setuptools"; 16 16 17 - disabled = isPy27; 17 + # No support Python >= 3.11 18 + # https://github.com/irmen/Pyro4/issues/246 19 + disabled = pythonAtLeast "3.11"; 18 20 19 21 src = fetchPypi { 20 22 pname = "Pyro4"; ··· 37 39 ]; 38 40 39 41 # add testsupport.py to PATH 40 - preCheck = "PYTHONPATH=tests/PyroTests:$PYTHONPATH"; 42 + preCheck = '' 43 + PYTHONPATH=tests/PyroTests:$PYTHONPATH 44 + ''; 41 45 42 - 43 - pytestFlagsArray = [ 46 + disabledTestPaths = [ 44 47 # ignore network related tests, which fail in sandbox 45 - "--ignore=tests/PyroTests/test_naming.py" 48 + "tests/PyroTests/test_naming.py" 46 49 ]; 47 50 48 51 disabledTests = [ ··· 61 64 meta = with lib; { 62 65 description = "Distributed object middleware for Python (RPC)"; 63 66 homepage = "https://github.com/irmen/Pyro4"; 67 + changelog = "https://github.com/irmen/Pyro4/releases/tag/${version}"; 64 68 license = licenses.mit; 65 69 maintainers = with maintainers; [ prusnak ]; 66 70 };
+27 -11
pkgs/development/python-modules/pyro5/default.nix
··· 1 - { buildPythonPackage 2 - , fetchPypi 3 - , lib 1 + { lib 4 2 , stdenv 3 + , buildPythonPackage 4 + , fetchPypi 5 5 , serpent 6 6 , pythonOlder 7 7 , pytestCheckHook 8 8 }: 9 9 10 10 buildPythonPackage rec { 11 - pname = "Pyro5"; 11 + pname = "pyro5"; 12 12 version = "5.14"; 13 + format = "setuptools"; 13 14 14 15 disabled = pythonOlder "3.6"; 15 16 16 17 src = fetchPypi { 17 - inherit pname version; 18 - sha256 = "sha256-ZP3OE3sP5TLohhTSRrfJi74KT0JnhsUkU5rNxeaUCGo="; 18 + pname = "Pyro5"; 19 + inherit version; 20 + hash = "sha256-ZP3OE3sP5TLohhTSRrfJi74KT0JnhsUkU5rNxeaUCGo="; 19 21 }; 20 22 21 - propagatedBuildInputs = [ serpent ]; 23 + propagatedBuildInputs = [ 24 + serpent 25 + ]; 22 26 23 - nativeCheckInputs = [ pytestCheckHook ]; 27 + nativeCheckInputs = [ 28 + pytestCheckHook 29 + ]; 24 30 25 - # ignore network related tests, which fail in sandbox 26 - disabledTests = [ "StartNSfunc" "Broadcast" "GetIP" "TestNameServer" "TestBCSetup" ] 27 - ++ lib.optionals stdenv.hostPlatform.isDarwin [ 31 + disabledTests = [ 32 + # Ignore network related tests, which fail in sandbox 33 + "StartNSfunc" 34 + "Broadcast" 35 + "GetIP" 36 + "TestNameServer" 37 + "TestBCSetup" 38 + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ 28 39 "Socket" 29 40 ]; 30 41 42 + pythonImportsCheck = [ 43 + "Pyro5" 44 + ]; 45 + 31 46 meta = with lib; { 32 47 description = "Distributed object middleware for Python (RPC)"; 33 48 homepage = "https://github.com/irmen/Pyro5"; 49 + changelog = "https://github.com/irmen/Pyro5/releases/tag/v${version}"; 34 50 license = licenses.mit; 35 51 maintainers = with maintainers; [ peterhoeg ]; 36 52 };