From d42e03d24ff407bda6d8292369f4857fceb1b62a Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Mon, 10 Mar 2025 14:13:39 +0200 Subject: [PATCH 1/5] python312Packages.enlighten: no with lib; in meta --- pkgs/development/python-modules/enlighten/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/enlighten/default.nix b/pkgs/development/python-modules/enlighten/default.nix index 13f4a36420cc..d16713dbcc9f 100644 --- a/pkgs/development/python-modules/enlighten/default.nix +++ b/pkgs/development/python-modules/enlighten/default.nix @@ -43,11 +43,11 @@ buildPythonPackage rec { "test_autorefresh" ]; - meta = with lib; { + meta = { description = "Enlighten Progress Bar for Python Console Apps"; homepage = "https://github.com/Rockhopper-Technologies/enlighten"; changelog = "https://github.com/Rockhopper-Technologies/enlighten/releases/tag/${version}"; - license = with licenses; [ mpl20 ]; - maintainers = with maintainers; [ veprbl ]; + license = with lib.licenses; [ mpl20 ]; + maintainers = with lib.maintainers; [ veprbl ]; }; } From 218b2dec73a2f7d54837d36aac05b1bf7b319088 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Mon, 10 Mar 2025 14:14:02 +0200 Subject: [PATCH 2/5] python312Packages.enlighten: add doronbehar as co-maintainer --- pkgs/development/python-modules/enlighten/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/enlighten/default.nix b/pkgs/development/python-modules/enlighten/default.nix index d16713dbcc9f..e927966efab2 100644 --- a/pkgs/development/python-modules/enlighten/default.nix +++ b/pkgs/development/python-modules/enlighten/default.nix @@ -48,6 +48,9 @@ buildPythonPackage rec { homepage = "https://github.com/Rockhopper-Technologies/enlighten"; changelog = "https://github.com/Rockhopper-Technologies/enlighten/releases/tag/${version}"; license = with lib.licenses; [ mpl20 ]; - maintainers = with lib.maintainers; [ veprbl ]; + maintainers = with lib.maintainers; [ + veprbl + doronbehar + ]; }; } From 986d046ca8df02da4c731088f6a77502c0f28847 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Mon, 10 Mar 2025 14:14:53 +0200 Subject: [PATCH 3/5] python312Packages.enlighten: 1.13.0 -> 1.14.0 Changelog: https://github.com/Rockhopper-Technologies/enlighten/releases/tag/1.14.0 --- .../python-modules/enlighten/default.nix | 18 ++---------------- 1 file changed, 2 insertions(+), 16 deletions(-) diff --git a/pkgs/development/python-modules/enlighten/default.nix b/pkgs/development/python-modules/enlighten/default.nix index e927966efab2..c16218d76254 100644 --- a/pkgs/development/python-modules/enlighten/default.nix +++ b/pkgs/development/python-modules/enlighten/default.nix @@ -1,6 +1,5 @@ { lib, - stdenv, buildPythonPackage, fetchPypi, blessed, @@ -11,14 +10,14 @@ buildPythonPackage rec { pname = "enlighten"; - version = "1.13.0"; + version = "1.14.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-7nGNqsaHPIP9Nwa8532kcsd2pR4Nb1+G9+YeJ/mtFmo="; + hash = "sha256-qfpY4o5i3+9wg5D+6w7jxOZHgsACdGqUhzOQ/sF3/v4="; }; propagatedBuildInputs = [ @@ -30,19 +29,6 @@ buildPythonPackage rec { pythonImportsCheck = [ "enlighten" ]; - disabledTests = - [ - # AssertionError: <_io.TextIOWrapper name='' mode='w' encoding='utf-8'> is not... - "test_init" - # AssertionError: Invalid format specifier (deprecated since prefixed 0.4.0) - "test_floats_prefixed" - "test_subcounter_prefixed" - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - # https://github.com/Rockhopper-Technologies/enlighten/issues/44 - "test_autorefresh" - ]; - meta = { description = "Enlighten Progress Bar for Python Console Apps"; homepage = "https://github.com/Rockhopper-Technologies/enlighten"; From 20054d16adb862e5c1ccc2a9d23d243086a29c9a Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Mon, 10 Mar 2025 14:17:42 +0200 Subject: [PATCH 4/5] python312Packages.enlighten: reorder inputs & modernize attributes --- .../development/python-modules/enlighten/default.nix | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/enlighten/default.nix b/pkgs/development/python-modules/enlighten/default.nix index c16218d76254..28cbe32cb474 100644 --- a/pkgs/development/python-modules/enlighten/default.nix +++ b/pkgs/development/python-modules/enlighten/default.nix @@ -2,10 +2,14 @@ lib, buildPythonPackage, fetchPypi, + pythonOlder, + + # dependencies blessed, prefixed, + + # tests pytestCheckHook, - pythonOlder, }: buildPythonPackage rec { @@ -20,12 +24,14 @@ buildPythonPackage rec { hash = "sha256-qfpY4o5i3+9wg5D+6w7jxOZHgsACdGqUhzOQ/sF3/v4="; }; - propagatedBuildInputs = [ + dependencies = [ blessed prefixed ]; - nativeCheckInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ + pytestCheckHook + ]; pythonImportsCheck = [ "enlighten" ]; From f58e9aec6763da2f418d2685656c117f623ea16d Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Tue, 11 Mar 2025 09:00:57 +0200 Subject: [PATCH 5/5] python312Packages.enlighten: 1.14.0 -> 1.14.1 Changelog: https://github.com/Rockhopper-Technologies/enlighten/releases/tag/1.14.1 --- pkgs/development/python-modules/enlighten/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/enlighten/default.nix b/pkgs/development/python-modules/enlighten/default.nix index 28cbe32cb474..9da7e0858967 100644 --- a/pkgs/development/python-modules/enlighten/default.nix +++ b/pkgs/development/python-modules/enlighten/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "enlighten"; - version = "1.14.0"; + version = "1.14.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-qfpY4o5i3+9wg5D+6w7jxOZHgsACdGqUhzOQ/sF3/v4="; + hash = "sha256-hcNUEqmk84hrMzfUH4E0Qfq5ow2fW18MAVvQeKRBFHM="; }; dependencies = [