Merge pull request #245808 from natsukium/zope-component/update

python310Packages.zope-component: 5.1.0 -> 6.0
NixOS · Jul 28, 2023 · cf9d024 · cf9d024
2 parents eb6249c + 0da71c3
commit cf9d024
Show file tree

Hide file tree

Showing 8 changed files with 31 additions and 18 deletions.
diff --git a/pkgs/development/python-modules/certbot/default.nix b/pkgs/development/python-modules/certbot/default.nix
@@ -15,7 +15,7 @@
 , pytz
 , requests
 , six
-, zope_component
+, zope-component
 , zope_interface
 , dialog
 , gnureadline
@@ -50,7 +50,7 @@ buildPythonPackage rec {
     pytz
     requests
     six
-    zope_component
+    zope-component
     zope_interface
   ];
 

diff --git a/pkgs/development/python-modules/pyramid/default.nix b/pkgs/development/python-modules/pyramid/default.nix
@@ -2,7 +2,7 @@
 , buildPythonPackage
 , fetchPypi
 , webtest
-, zope_component
+, zope-component
 , hupper
 , pastedeploy
 , plaster
@@ -43,7 +43,7 @@ buildPythonPackage rec {
 
   nativeCheckInputs = [
     webtest
-    zope_component
+    zope-component
   ];
 
   pythonImportsCheck = [

diff --git a/pkgs/development/python-modules/testfixtures/default.nix b/pkgs/development/python-modules/testfixtures/default.nix
@@ -7,7 +7,7 @@
 , pythonOlder
 , sybil
 , twisted
-, zope_component
+, zope-component
 }:
 
 buildPythonPackage rec {
@@ -33,7 +33,7 @@ buildPythonPackage rec {
     pytestCheckHook
     sybil
     twisted
-    zope_component
+    zope-component
   ];
 
   disabledTestPaths = [

diff --git a/...python-modules/zope_component/default.nix → ...python-modules/zope-component/default.nix b/...python-modules/zope_component/default.nix → ...python-modules/zope-component/default.nix
@@ -1,35 +1,47 @@
 { lib
 , buildPythonPackage
 , fetchPypi
+, zope_configuration
 , zope-deferredimport
 , zope_deprecation
 , zope_event
 , zope-hookable
-, zope_interface
-, zope_configuration
 , zope_i18nmessageid
+, zope_interface
 }:
 
 buildPythonPackage rec {
-  pname = "zope.component";
-  version = "5.1.0";
+  pname = "zope-component";
+  version = "6.0";
+  format = "setuptools";
 
   src = fetchPypi {
-    inherit pname version;
-    hash = "sha256-pQj5/vG29ShkYtM0DNif+rXHiZ3KBAEzcjnLa6fGuwo=";
+    pname = "zope.component";
+    inherit version;
+    hash = "sha256-mgoEcq0gG5S0/mdBzprCwwuLsixRYHe/A2kt7E37aQY=";
   };
 
   propagatedBuildInputs = [
-    zope-deferredimport zope_deprecation zope_event zope-hookable zope_interface
-    zope_configuration zope_i18nmessageid
+    zope_configuration
+    zope-deferredimport
+    zope_deprecation
+    zope_event
+    zope-hookable
+    zope_i18nmessageid
+    zope_interface
   ];
 
   # ignore tests because of a circular dependency on zope_security
   doCheck = false;
 
+  pythonImportsCheck = [
+    "zope.component"
+  ];
+
   meta = with lib; {
     homepage = "https://github.com/zopefoundation/zope.component";
     description = "Zope Component Architecture";
+    changelog = "https://github.com/zopefoundation/zope.component/blob/${version}/CHANGES.rst";
     license = licenses.zpl20;
     maintainers = with maintainers; [ goibhniu ];
   };

diff --git a/pkgs/development/python-modules/zope_lifecycleevent/default.nix b/pkgs/development/python-modules/zope_lifecycleevent/default.nix
@@ -3,7 +3,7 @@
 , fetchPypi
 , isPy3k
 , zope_event
-, zope_component
+, zope-component
 }:
 
 buildPythonPackage rec {
@@ -15,7 +15,7 @@ buildPythonPackage rec {
     hash = "sha256-9ahU6J/5fe6ke/vqN4u77yeJ0uDMkKHB2lfZChzmfLU=";
   };
 
-  propagatedBuildInputs = [ zope_event zope_component ];
+  propagatedBuildInputs = [ zope_event zope-component ];
 
   # namespace colides with local directory
   doCheck = false;

diff --git a/pkgs/servers/mail/mailman/package.nix b/pkgs/servers/mail/mailman/package.nix
@@ -36,7 +36,7 @@ buildPythonPackage rec {
     passlib
     requests
     sqlalchemy
-    zope_component
+    zope-component
     zope_configuration
   ];
 

diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix
@@ -382,4 +382,5 @@ mapAliases ({
   zc-buildout221 = zc-buildout; # added 2021-07-21
   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
 })
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
@@ -13901,7 +13901,7 @@ self: super: with self; {
 
   zope-cachedescriptors = callPackage ../development/python-modules/zope-cachedescriptors { };
 
-  zope_component = callPackage ../development/python-modules/zope_component { };
+  zope-component = callPackage ../development/python-modules/zope-component { };
 
   zope_configuration = callPackage ../development/python-modules/zope_configuration { };