movefasta/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-06-12 04:35:41 +03:00
Code Issues Projects Releases Packages Wiki Activity

Merge remote-tracking branch 'origin/master' into staging-next

Browse source
This commit is contained in:
K900 2025-04-29 21:47:54 +03:00
commit 5b10a3887c
1 changed files with 9 additions and 41 deletions
Download patch file Download diff file Expand all files Collapse all files

50
pkgs/development/python-modules/circus/default.nix
View file

@ -2,11 +2,10 @@
lib, lib,
stdenv, stdenv,
buildPythonPackage, buildPythonPackage,
fetchPypi, fetchFromGitHub,
flit-core, flit-core,
psutil, psutil,
pytestCheckHook, pytestCheckHook,
pythonOlder,
pyyaml, pyyaml,
pyzmq, pyzmq,
tornado, tornado,
@ -17,11 +16,11 @@ buildPythonPackage rec {
version = "0.19.0"; version = "0.19.0";
pyproject = true; pyproject = true;
disabled = pythonOlder "3.7"; src = fetchFromGitHub {
owner = "circus-tent";
src = fetchPypi { repo = "circus";
inherit pname version; tag = version;
hash = "sha256-++alApmYrBI5sX6904JRrIsiYn0w5OxvaMsQIzkRsPQ="; hash = "sha256-MiZXiGb6F8LAJLAdmEDBO8Y5cJxHJy7jMFi50Ac3Bsc=";
}; };
build-system = [ flit-core ]; build-system = [ flit-core ];
@ -43,42 +42,11 @@ buildPythonPackage rec {
''; '';
disabledTests = [ disabledTests = [
# these tests raise circus.tests.support.TimeoutException # Depends on the build machine configuration
"test_add_start"
"test_add"
"test_command_already_running"
"test_dummy"
"test_exits_within_graceful_timeout"
"test_full_stats"
"test_handler"
"test_handler"
"test_inherited"
"test_kills_after_graceful_timeout"
"test_launch_cli"
"test_max_age"
"test_reload_sequential"
"test_reload_uppercase"
"test_reload_wid_1_worker"
"test_reload_wid_4_workers"
"test_reload1"
"test_reload2"
"test_resource_watcher_max_cpu"
"test_resource_watcher_max_mem_abs"
"test_resource_watcher_max_mem" "test_resource_watcher_max_mem"
"test_resource_watcher_min_cpu"
"test_resource_watcher_min_mem_abs" "test_resource_watcher_min_mem_abs"
"test_resource_watcher_min_mem" # Compares with magic string
"test_set_before_launch" "test_streams"
"test_set_by_arbiter"
"test_signal"
"test_stdin_socket"
"test_stop_and_restart"
"test_stream"
"test_venv"
"test_watchdog_discovery_found"
"test_watchdog_discovery_not_found"
# this test requires socket communication
"test_plugins"
]; ];
pythonImportsCheck = [ "circus" ]; pythonImportsCheck = [ "circus" ];