From 7cb04b0d9b34d0ef3d16c2369ce332b6e3c32c1d Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Fri, 14 Feb 2025 12:02:52 +0100 Subject: [PATCH 1/3] python312Packages.textual: skip flaky tests also on linux --- .../python-modules/textual/default.nix | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/pkgs/development/python-modules/textual/default.nix b/pkgs/development/python-modules/textual/default.nix index ec4513f5e7d2..d730ddc3f23c 100644 --- a/pkgs/development/python-modules/textual/default.nix +++ b/pkgs/development/python-modules/textual/default.nix @@ -59,15 +59,14 @@ buildPythonPackage rec { tree-sitter ]; - disabledTestPaths = - [ - # Snapshot tests require syrupy<4 - "tests/snapshot_tests/test_snapshots.py" - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - # RuntimeError: There is no current event loop in thread 'MainThread'. - "tests/test_focus.py" - ]; + disabledTestPaths = [ + # Snapshot tests require syrupy<4 + "tests/snapshot_tests/test_snapshots.py" + + # Flaky + # RuntimeError: There is no current event loop in thread 'MainThread'. + "tests/test_focus.py" + ]; disabledTests = [ From 09c67a9eb2ebc6568fbaec3975f6fb0fb69184fe Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Fri, 14 Feb 2025 12:03:00 +0100 Subject: [PATCH 2/3] python312Packages.textual: cleanup --- .../python-modules/textual/default.nix | 27 ++++++++++++------- 1 file changed, 17 insertions(+), 10 deletions(-) diff --git a/pkgs/development/python-modules/textual/default.nix b/pkgs/development/python-modules/textual/default.nix index d730ddc3f23c..7f70b2b6b5bd 100644 --- a/pkgs/development/python-modules/textual/default.nix +++ b/pkgs/development/python-modules/textual/default.nix @@ -1,22 +1,29 @@ { lib, - stdenv, buildPythonPackage, fetchFromGitHub, - jinja2, + + # build-system + poetry-core, + + # dependencies markdown-it-py, platformdirs, - poetry-core, + rich, + typing-extensions, + + # optional-dependencies + tree-sitter, + tree-sitter-languages, + + # tests + jinja2, pytest-aiohttp, pytest-xdist, pytestCheckHook, - pythonAtLeast, - rich, syrupy, time-machine, - tree-sitter, - tree-sitter-languages, - typing-extensions, + pythonAtLeast, }: buildPythonPackage rec { @@ -35,8 +42,8 @@ buildPythonPackage rec { dependencies = [ - platformdirs markdown-it-py + platformdirs rich typing-extensions ] @@ -63,7 +70,7 @@ buildPythonPackage rec { # Snapshot tests require syrupy<4 "tests/snapshot_tests/test_snapshots.py" - # Flaky + # Flaky: https://github.com/Textualize/textual/issues/5511 # RuntimeError: There is no current event loop in thread 'MainThread'. "tests/test_focus.py" ]; From ef183ce7b5b1efc8ae8142adbb4cf77e610a15ab Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Fri, 14 Feb 2025 12:11:02 +0100 Subject: [PATCH 3/3] python312Packages.textual: add gepbird as maintainer --- pkgs/development/python-modules/textual/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/textual/default.nix b/pkgs/development/python-modules/textual/default.nix index 7f70b2b6b5bd..288d4d1e297f 100644 --- a/pkgs/development/python-modules/textual/default.nix +++ b/pkgs/development/python-modules/textual/default.nix @@ -107,6 +107,6 @@ buildPythonPackage rec { homepage = "https://github.com/Textualize/textual"; changelog = "https://github.com/Textualize/textual/releases/tag/v${version}"; license = lib.licenses.mit; - maintainers = [ ]; + maintainers = with lib.maintainers; [ gepbird ]; }; }