cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Merge pull request #212433 from fabaff/pypro4-fix

Browse source 
python310Packages.Pyro4: disable on Python >= 3.11
This commit is contained in:
Pavol Rusnak 2023-01-24 18:29:51 +00:00 committed by GitHub
commit eb95aa0392
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 40 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
pkgs/development/python-modules/pyro4/default.nix
View file

@ -1,12 +1,12 @@
{ lib { lib
, buildPythonPackage , buildPythonPackage
, fetchPypi
, serpent
, dill
, cloudpickle , cloudpickle
, dill
, fetchPypi
, msgpack , msgpack
, isPy27
, pytestCheckHook , pytestCheckHook
, pythonAtLeast
, serpent
}: }:
buildPythonPackage rec { buildPythonPackage rec {
@ -14,7 +14,9 @@ buildPythonPackage rec {
version = "4.82"; version = "4.82";
format = "setuptools"; format = "setuptools";
disabled = isPy27; # No support Python >= 3.11
# https://github.com/irmen/Pyro4/issues/246
disabled = pythonAtLeast "3.11";
src = fetchPypi { src = fetchPypi {
pname = "Pyro4"; pname = "Pyro4";
@ -37,12 +39,13 @@ buildPythonPackage rec {
]; ];
# add testsupport.py to PATH # add testsupport.py to PATH
preCheck = "PYTHONPATH=tests/PyroTests:$PYTHONPATH"; preCheck = ''
PYTHONPATH=tests/PyroTests:$PYTHONPATH
'';
disabledTestPaths = [
pytestFlagsArray = [
# ignore network related tests, which fail in sandbox # ignore network related tests, which fail in sandbox
"--ignore=tests/PyroTests/test_naming.py" "tests/PyroTests/test_naming.py"
]; ];
disabledTests = [ disabledTests = [
@ -61,6 +64,7 @@ buildPythonPackage rec {
meta = with lib; { meta = with lib; {
description = "Distributed object middleware for Python (RPC)"; description = "Distributed object middleware for Python (RPC)";
homepage = "https://github.com/irmen/Pyro4"; homepage = "https://github.com/irmen/Pyro4";
changelog = "https://github.com/irmen/Pyro4/releases/tag/${version}";
license = licenses.mit; license = licenses.mit;
maintainers = with maintainers; [ prusnak ]; maintainers = with maintainers; [ prusnak ];
}; };

38
pkgs/development/python-modules/pyro5/default.nix
View file

@ -1,36 +1,52 @@
{ buildPythonPackage { lib
, fetchPypi
, lib
, stdenv , stdenv
, buildPythonPackage
, fetchPypi
, serpent , serpent
, pythonOlder , pythonOlder
, pytestCheckHook , pytestCheckHook
}: }:
buildPythonPackage rec { buildPythonPackage rec {
pname = "Pyro5"; pname = "pyro5";
version = "5.14"; version = "5.14";
format = "setuptools";
disabled = pythonOlder "3.6"; disabled = pythonOlder "3.6";
src = fetchPypi { src = fetchPypi {
inherit pname version; pname = "Pyro5";
sha256 = "sha256-ZP3OE3sP5TLohhTSRrfJi74KT0JnhsUkU5rNxeaUCGo="; inherit version;
hash = "sha256-ZP3OE3sP5TLohhTSRrfJi74KT0JnhsUkU5rNxeaUCGo=";
}; };
propagatedBuildInputs = [ serpent ]; propagatedBuildInputs = [
serpent
];
nativeCheckInputs = [ pytestCheckHook ]; nativeCheckInputs = [
pytestCheckHook
];
# ignore network related tests, which fail in sandbox disabledTests = [
disabledTests = [ "StartNSfunc" "Broadcast" "GetIP" "TestNameServer" "TestBCSetup" ] # Ignore network related tests, which fail in sandbox
++ lib.optionals stdenv.hostPlatform.isDarwin [ "StartNSfunc"
"Broadcast"
"GetIP"
"TestNameServer"
"TestBCSetup"
] ++ lib.optionals stdenv.hostPlatform.isDarwin [
"Socket" "Socket"
]; ];
pythonImportsCheck = [
"Pyro5"
];
meta = with lib; { meta = with lib; {
description = "Distributed object middleware for Python (RPC)"; description = "Distributed object middleware for Python (RPC)";
homepage = "https://github.com/irmen/Pyro5"; homepage = "https://github.com/irmen/Pyro5";
changelog = "https://github.com/irmen/Pyro5/releases/tag/v${version}";
license = licenses.mit; license = licenses.mit;
maintainers = with maintainers; [ peterhoeg ]; maintainers = with maintainers; [ peterhoeg ];
}; };