From cd49f6378c53e3815dd87ed6bca1dccc6981f4c0 Mon Sep 17 00:00:00 2001 From: natsukium Date: Sun, 12 Nov 2023 02:38:44 +0900 Subject: [PATCH 1/3] python311Packages.zope-configuration: rename frome zope_configuration --- pkgs/development/python-modules/zope-component/default.nix | 4 ++-- .../{zope_configuration => zope-configuration}/default.nix | 5 +++-- pkgs/servers/mail/mailman/package.nix | 2 +- pkgs/top-level/python-aliases.nix | 1 + pkgs/top-level/python-packages.nix | 2 +- 5 files changed, 8 insertions(+), 6 deletions(-) rename pkgs/development/python-modules/{zope_configuration => zope-configuration}/default.nix (88%) diff --git a/pkgs/development/python-modules/zope-component/default.nix b/pkgs/development/python-modules/zope-component/default.nix index 522b2817a845..44f01efa8d2e 100644 --- a/pkgs/development/python-modules/zope-component/default.nix +++ b/pkgs/development/python-modules/zope-component/default.nix @@ -1,7 +1,7 @@ { lib , buildPythonPackage , fetchPypi -, zope_configuration +, zope-configuration , zope-deferredimport , zope-deprecation , zope_event @@ -22,7 +22,7 @@ buildPythonPackage rec { }; propagatedBuildInputs = [ - zope_configuration + zope-configuration zope-deferredimport zope-deprecation zope_event diff --git a/pkgs/development/python-modules/zope_configuration/default.nix b/pkgs/development/python-modules/zope-configuration/default.nix similarity index 88% rename from pkgs/development/python-modules/zope_configuration/default.nix rename to pkgs/development/python-modules/zope-configuration/default.nix index b6cc1c0f9998..ac2db40e0b13 100644 --- a/pkgs/development/python-modules/zope_configuration/default.nix +++ b/pkgs/development/python-modules/zope-configuration/default.nix @@ -8,11 +8,12 @@ }: buildPythonPackage rec { - pname = "zope.configuration"; + pname = "zope-configuration"; version = "4.4.1"; src = fetchPypi { - inherit pname version; + pname = "zope.configuration"; + inherit version; hash = "sha256-giPqSvU5hmznqccwrH6xjlHRfrUVk6p3c7NZPI1tdgg="; }; diff --git a/pkgs/servers/mail/mailman/package.nix b/pkgs/servers/mail/mailman/package.nix index 955c553d8a74..f64c3f1a29c8 100644 --- a/pkgs/servers/mail/mailman/package.nix +++ b/pkgs/servers/mail/mailman/package.nix @@ -34,7 +34,7 @@ buildPythonPackage rec { requests sqlalchemy zope-component - zope_configuration + zope-configuration ]; checkInputs = [ diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index b23c39627f81..766b9aec93f8 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -455,6 +455,7 @@ 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_configuration = zope-configuration; # added 2023-11-12 zope_contenttype = zope-contenttype; # added 2023-10-11 zope_deprecation = zope-deprecation; # added 2023-10-07 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 8d631c0e2f6a..6e8361b4b065 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -16077,7 +16077,7 @@ self: super: with self; { zope-component = callPackage ../development/python-modules/zope-component { }; - zope_configuration = callPackage ../development/python-modules/zope_configuration { }; + zope-configuration = callPackage ../development/python-modules/zope-configuration { }; zope-contenttype = callPackage ../development/python-modules/zope-contenttype { }; From e5317b9352594a61f0070f797f17974852e0cff7 Mon Sep 17 00:00:00 2001 From: natsukium Date: Sun, 12 Nov 2023 02:52:26 +0900 Subject: [PATCH 2/3] python311Packages.zope-configuration: refactor --- .../zope-configuration/default.nix | 34 ++++++++++++++++--- 1 file changed, 30 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/zope-configuration/default.nix b/pkgs/development/python-modules/zope-configuration/default.nix index ac2db40e0b13..c3593f46146c 100644 --- a/pkgs/development/python-modules/zope-configuration/default.nix +++ b/pkgs/development/python-modules/zope-configuration/default.nix @@ -1,8 +1,12 @@ { lib , buildPythonPackage , fetchPypi +, setuptools , zope-i18nmessageid +, zope_interface , zope_schema +, pytestCheckHook +, zope_testing , zope_testrunner , manuel }: @@ -10,6 +14,7 @@ buildPythonPackage rec { pname = "zope-configuration"; version = "4.4.1"; + pyproject = true; src = fetchPypi { pname = "zope.configuration"; @@ -17,18 +22,39 @@ buildPythonPackage rec { hash = "sha256-giPqSvU5hmznqccwrH6xjlHRfrUVk6p3c7NZPI1tdgg="; }; - nativeCheckInputs = [ zope_testrunner manuel ]; + nativeBuildInputs = [ + setuptools + ]; - propagatedBuildInputs = [ zope-i18nmessageid zope_schema ]; + nativeCheckInputs = [ + manuel + pytestCheckHook + zope_testing + zope_testrunner + ]; + + propagatedBuildInputs = [ + zope-i18nmessageid + zope_interface + zope_schema + ]; # Need to investigate how to run the tests with zope-testrunner doCheck = false; + pythonImportsCheck = [ + "zope.configuration" + ]; + + pythonNamespaces = [ + "zope" + ]; + meta = with lib; { description = "Zope Configuration Markup Language (ZCML)"; homepage = "https://github.com/zopefoundation/zope.configuration"; - license = licenses.zpl20; + changelog = "https://github.com/zopefoundation/zope.configuration/blob/${version}/CHANGES.rst"; + license = licenses.zpl21; maintainers = with maintainers; [ goibhniu ]; }; - } From 98b74e8ae768e0e8d5df13966b591a225aeaacda Mon Sep 17 00:00:00 2001 From: natsukium Date: Sun, 12 Nov 2023 02:54:03 +0900 Subject: [PATCH 3/3] python311Packages.zope-configuration: 4.4.1 -> 5.0 Changelog: https://github.com/zopefoundation/zope.configuration/blob/5.0/CHANGES.rst --- .../python-modules/zope-configuration/default.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/zope-configuration/default.nix b/pkgs/development/python-modules/zope-configuration/default.nix index c3593f46146c..b1c6e027a36d 100644 --- a/pkgs/development/python-modules/zope-configuration/default.nix +++ b/pkgs/development/python-modules/zope-configuration/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchPypi +, pythonOlder , setuptools , zope-i18nmessageid , zope_interface @@ -13,13 +14,15 @@ buildPythonPackage rec { pname = "zope-configuration"; - version = "4.4.1"; + version = "5.0"; pyproject = true; + disabled = pythonOlder "3.7"; + src = fetchPypi { pname = "zope.configuration"; inherit version; - hash = "sha256-giPqSvU5hmznqccwrH6xjlHRfrUVk6p3c7NZPI1tdgg="; + hash = "sha256-I0tKGMcfazub9rzyJSZLrgFJrGjeoHsHLw9pmkzsJuc="; }; nativeBuildInputs = [