From 6f79f108682505c2d7942d343bd58748f3fae0f5 Mon Sep 17 00:00:00 2001 From: natsukium Date: Sat, 29 Jul 2023 21:40:06 +0900 Subject: [PATCH 1/3] python310Packages.zope-i18nmessageid: rename from zope_i18nmessageid --- pkgs/development/python-modules/zope-component/default.nix | 4 ++-- .../{zope_i18nmessageid => zope-i18nmessageid}/default.nix | 5 +++-- .../python-modules/zope_configuration/default.nix | 4 ++-- pkgs/development/python-modules/zope_size/default.nix | 4 ++-- pkgs/top-level/python-aliases.nix | 1 + pkgs/top-level/python-packages.nix | 2 +- 6 files changed, 11 insertions(+), 9 deletions(-) rename pkgs/development/python-modules/{zope_i18nmessageid => zope-i18nmessageid}/default.nix (86%) diff --git a/pkgs/development/python-modules/zope-component/default.nix b/pkgs/development/python-modules/zope-component/default.nix index 93373d8a310e..2b65136aaf83 100644 --- a/pkgs/development/python-modules/zope-component/default.nix +++ b/pkgs/development/python-modules/zope-component/default.nix @@ -6,7 +6,7 @@ , zope_deprecation , zope_event , zope-hookable -, zope_i18nmessageid +, zope-i18nmessageid , zope_interface }: @@ -27,7 +27,7 @@ buildPythonPackage rec { zope_deprecation zope_event zope-hookable - zope_i18nmessageid + zope-i18nmessageid zope_interface ]; diff --git a/pkgs/development/python-modules/zope_i18nmessageid/default.nix b/pkgs/development/python-modules/zope-i18nmessageid/default.nix similarity index 86% rename from pkgs/development/python-modules/zope_i18nmessageid/default.nix rename to pkgs/development/python-modules/zope-i18nmessageid/default.nix index 42aa31415e15..985634ad15a1 100644 --- a/pkgs/development/python-modules/zope_i18nmessageid/default.nix +++ b/pkgs/development/python-modules/zope-i18nmessageid/default.nix @@ -7,11 +7,12 @@ }: buildPythonPackage rec { - pname = "zope.i18nmessageid"; + pname = "zope-i18nmessageid"; version = "5.1.1"; src = fetchPypi { - inherit pname version; + pname = "zope.i18nmessageid"; + inherit version; hash = "sha256-R7djR7gOCytmxIbuZvP4bFdJOiB1uFqfuAJpD6cwvZI="; }; diff --git a/pkgs/development/python-modules/zope_configuration/default.nix b/pkgs/development/python-modules/zope_configuration/default.nix index 6b96708e221c..b6cc1c0f9998 100644 --- a/pkgs/development/python-modules/zope_configuration/default.nix +++ b/pkgs/development/python-modules/zope_configuration/default.nix @@ -1,7 +1,7 @@ { lib , buildPythonPackage , fetchPypi -, zope_i18nmessageid +, zope-i18nmessageid , zope_schema , zope_testrunner , manuel @@ -18,7 +18,7 @@ buildPythonPackage rec { nativeCheckInputs = [ zope_testrunner manuel ]; - propagatedBuildInputs = [ zope_i18nmessageid zope_schema ]; + propagatedBuildInputs = [ zope-i18nmessageid zope_schema ]; # Need to investigate how to run the tests with zope-testrunner doCheck = false; diff --git a/pkgs/development/python-modules/zope_size/default.nix b/pkgs/development/python-modules/zope_size/default.nix index 6480e91b730f..836d0fa66f82 100644 --- a/pkgs/development/python-modules/zope_size/default.nix +++ b/pkgs/development/python-modules/zope_size/default.nix @@ -1,7 +1,7 @@ { lib , buildPythonPackage , fetchPypi -, zope_i18nmessageid +, zope-i18nmessageid , zope_interface }: @@ -14,7 +14,7 @@ buildPythonPackage rec { hash = "sha256-bhv3QJdZtNpyAuL6/aZXWD1Acx8661VweWaItJPpkHk="; }; - propagatedBuildInputs = [ zope_i18nmessageid zope_interface ]; + propagatedBuildInputs = [ zope-i18nmessageid zope_interface ]; meta = with lib; { homepage = "https://github.com/zopefoundation/zope.size"; diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index a6ef2838bcb6..fa8ccf89984f 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -383,4 +383,5 @@ mapAliases ({ zc_buildout_nix = throw "zc_buildout_nix was pinned to a version no longer compatible with other modules"; zope_broken = throw "zope_broken has been removed because it is obsolete and not needed in zodb>=3.10"; # added 2023-07-26 zope_component = zope-component; # added 2023-07-28 + zope_i18nmessageid = zope-i18nmessageid; # added 2023-07-29 }) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 5fe2683244c6..e6b5c7783b31 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -13923,7 +13923,7 @@ self: super: with self; { zope-hookable = callPackage ../development/python-modules/zope-hookable { }; - zope_i18nmessageid = callPackage ../development/python-modules/zope_i18nmessageid { }; + zope-i18nmessageid = callPackage ../development/python-modules/zope-i18nmessageid { }; zope_interface = callPackage ../development/python-modules/zope_interface { }; From a2a660dc509644cb46b7af6b12a7067c5d6cae52 Mon Sep 17 00:00:00 2001 From: natsukium Date: Sat, 29 Jul 2023 21:52:11 +0900 Subject: [PATCH 2/3] python310Packages.zope-i18nmessageid: refactor --- .../zope-i18nmessageid/default.nix | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/zope-i18nmessageid/default.nix b/pkgs/development/python-modules/zope-i18nmessageid/default.nix index 985634ad15a1..ba6eebc63418 100644 --- a/pkgs/development/python-modules/zope-i18nmessageid/default.nix +++ b/pkgs/development/python-modules/zope-i18nmessageid/default.nix @@ -2,13 +2,14 @@ , buildPythonPackage , fetchPypi , six -, coverage , zope_testrunner +, unittestCheckHook }: buildPythonPackage rec { pname = "zope-i18nmessageid"; version = "5.1.1"; + format = "setuptools"; src = fetchPypi { pname = "zope.i18nmessageid"; @@ -18,13 +19,24 @@ buildPythonPackage rec { propagatedBuildInputs = [ six ]; - nativeCheckInputs = [ coverage zope_testrunner ]; + nativeCheckInputs = [ + unittestCheckHook + zope_testrunner + ]; + + unittestFlagsArray = [ + "src/zope/i18nmessageid" + ]; + + pythonImportsCheck = [ + "zope.i18nmessageid" + ]; meta = with lib; { homepage = "https://github.com/zopefoundation/zope.i18nmessageid"; description = "Message Identifiers for internationalization"; + changelog = "https://github.com/zopefoundation/zope.i18nmessageid/blob/${version}/CHANGES.rst"; license = licenses.zpl20; maintainers = with maintainers; [ goibhniu ]; }; - } From 83a7b7de26e2f21cf4b15468f2e0a41bd7d58a94 Mon Sep 17 00:00:00 2001 From: natsukium Date: Sat, 29 Jul 2023 21:54:07 +0900 Subject: [PATCH 3/3] python310Packages.zope-i18nmessageid: 5.1.1 -> 6.0.1 Changelog: https://github.com/zopefoundation/zope.i18nmessageid/blob/6.0.1/CHANGES.rst --- .../python-modules/zope-i18nmessageid/default.nix | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/zope-i18nmessageid/default.nix b/pkgs/development/python-modules/zope-i18nmessageid/default.nix index ba6eebc63418..fa8f4c1a30ee 100644 --- a/pkgs/development/python-modules/zope-i18nmessageid/default.nix +++ b/pkgs/development/python-modules/zope-i18nmessageid/default.nix @@ -1,24 +1,21 @@ { lib , buildPythonPackage , fetchPypi -, six , zope_testrunner , unittestCheckHook }: buildPythonPackage rec { pname = "zope-i18nmessageid"; - version = "5.1.1"; + version = "6.0.1"; format = "setuptools"; src = fetchPypi { pname = "zope.i18nmessageid"; inherit version; - hash = "sha256-R7djR7gOCytmxIbuZvP4bFdJOiB1uFqfuAJpD6cwvZI="; + hash = "sha256-LVvOb7MfHOoO+iZEZJvIZ9KXIwPx272f/vzlsuueAXY="; }; - propagatedBuildInputs = [ six ]; - nativeCheckInputs = [ unittestCheckHook zope_testrunner