From 65ff0831c6f13d16461313f2fd44ed2e93efbfd1 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Fri, 22 Dec 2023 11:09:37 +0200 Subject: [PATCH 1/2] stig: 0.12.5a0 -> 0.12.8a0 Diff: https://github.com/rndusr/stig/compare/v0.12.5a0...v0.12.8a0 --- pkgs/applications/networking/p2p/stig/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/p2p/stig/default.nix b/pkgs/applications/networking/p2p/stig/default.nix index 61d42989705f..3ce297e832fd 100644 --- a/pkgs/applications/networking/p2p/stig/default.nix +++ b/pkgs/applications/networking/p2p/stig/default.nix @@ -10,13 +10,13 @@ python3Packages.buildPythonApplication rec { pname = "stig"; # This project has a different concept for pre release / alpha, # Read the project's README for details: https://github.com/rndusr/stig#stig - version = "0.12.5a0"; + version = "0.12.8a0"; src = fetchFromGitHub { owner = "rndusr"; repo = "stig"; rev = "v${version}"; - sha256 = "sha256-e27DBzing38llFxPIsMGkZJXp2q7jjFlQdtfsqLXNHw="; + sha256 = "sha256-vfmuA6DqWvAygcS6N+qX1h+Ag+P4eOwm41DhAFZR3r8="; }; propagatedBuildInputs = with python3Packages; [ From 8f3db30c7902f3b9e24d4cd3f2a780223da628f1 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Fri, 22 Dec 2023 11:20:40 +0200 Subject: [PATCH 2/2] stig: fix build, close #275914 - Refresh list of disabled tests. - Use Python310 since asynctest doesn't support Python311. --- .../networking/p2p/stig/default.nix | 27 +++++++++---------- 1 file changed, 13 insertions(+), 14 deletions(-) diff --git a/pkgs/applications/networking/p2p/stig/default.nix b/pkgs/applications/networking/p2p/stig/default.nix index 3ce297e832fd..2119e80a93f4 100644 --- a/pkgs/applications/networking/p2p/stig/default.nix +++ b/pkgs/applications/networking/p2p/stig/default.nix @@ -1,12 +1,12 @@ { lib , stdenv , fetchFromGitHub -, python3Packages +, python310Packages , testers , stig }: -python3Packages.buildPythonApplication rec { +python310Packages.buildPythonApplication rec { pname = "stig"; # This project has a different concept for pre release / alpha, # Read the project's README for details: https://github.com/rndusr/stig#stig @@ -19,7 +19,7 @@ python3Packages.buildPythonApplication rec { sha256 = "sha256-vfmuA6DqWvAygcS6N+qX1h+Ag+P4eOwm41DhAFZR3r8="; }; - propagatedBuildInputs = with python3Packages; [ + propagatedBuildInputs = with python310Packages; [ urwid urwidtrees aiohttp @@ -30,7 +30,7 @@ python3Packages.buildPythonApplication rec { setproctitle ]; - nativeCheckInputs = with python3Packages; [ + nativeCheckInputs = with python310Packages; [ asynctest pytestCheckHook ]; @@ -41,16 +41,15 @@ python3Packages.buildPythonApplication rec { export LC_ALL=C ''; - pytestFlagsArray = [ - "tests" - # TestScrollBarWithScrollable.test_wrapping_bug fails - "--deselect=tests/tui_test/scroll_test.py::TestScrollBarWithScrollable::test_wrapping_bug" - # https://github.com/rndusr/stig/issues/214 - "--deselect=tests/completion_test/classes_test.py::TestCandidates::test_candidates_are_sorted_case_insensitively" - ] ++ lib.optionals stdenv.isDarwin [ - "--deselect=tests/client_test/ttypes_test.py::TestTimestamp::test_string__month_day_hour_minute_second" - "--deselect=tests/client_test/aiotransmission_test/api_torrent_test.py" - "--deselect=tests/client_test/aiotransmission_test/rpc_test.py" + disabledTestPaths = [ + # Almost all tests fail in this file, it is reported upstream in: + # https://github.com/rndusr/stig/issues/214 , and upstream fails to + # reproduce the issue unfortunately. + "tests/client_test/aiotransmission_test/api_settings_test.py" + ]; + disabledTests = [ + # Another failure with similar circumstances to the above + "test_candidates_are_sorted_case_insensitively" ]; passthru.tests = testers.testVersion {