Unverified Commit f19fb329 authored by Martin Weinelt's avatar Martin Weinelt Committed by GitHub
Browse files

Merge pull request #259591 from natsukium/zope-proxy 

python311Packages.zope-proxy: 5.0.0 -> 5.1; rename from zope_proxy
parents 19658025 c9462cf9

pkgs/development/python-modules/zope-deferredimport/default.nix

+2 −2
Original line number Diff line number Diff line 
{ lib

, buildPythonPackage

, fetchPypi

, zope_proxy

, zope-proxy

, zope_testrunner

}:
@@ -15,7 +15,7 @@ buildPythonPackage rec { 
    sha256 = "2ae3257256802787e52ad840032f39c1496d3ce0b7e11117f663420e4a4c9add";

  };



  propagatedBuildInputs = [ zope_proxy ];

  propagatedBuildInputs = [ zope-proxy ];



  nativeCheckInputs = [ zope_testrunner ];

pkgs/development/python-modules/zope_proxy/default.nix→pkgs/development/python-modules/zope-proxy/default.nix

+42 −0
Original line number Diff line number Diff line 
{ lib

, buildPythonPackage

, fetchPypi

, pythonOlder

, setuptools

, zope_interface

}:



buildPythonPackage rec {

  pname = "zope.proxy";

  version = "5.0.0";

  pname = "zope-proxy";

  version = "5.1";

  pyproject = true;



  disabled = pythonOlder "3.7";



  src = fetchPypi {

    inherit pname version;

    hash = "sha256-b6RMl6QStNxR4vX9Tcc8W9SZ01KA+IzSvNJviuHkV3s=";

    pname = "zope.proxy";

    inherit version;

    hash = "sha256-d3e9P4986nRSFyYgLhptUVPb9knyBOJQBYrQOvRqQxg=";

  };



  nativeBuildInputs = [

    setuptools

  ];



  propagatedBuildInputs = [ zope_interface ];



  # circular deps

  doCheck = false;



  pythonImportsCheck = [

    "zope.proxy"

  ];



  meta = with lib; {

    homepage = "https://github.com/zopefoundation/zope.proxy";

    description = "Generic Transparent Proxies";

    license = licenses.zpl20;

    changelog = "https://github.com/zopefoundation/zope.proxy/blob/${version}/CHANGES.rst";

    license = licenses.zpl21;

    maintainers = with maintainers; [ goibhniu ];

  };



}

pkgs/development/python-modules/zope_location/default.nix

+2 −2
Original line number Diff line number Diff line 
{ lib

, buildPythonPackage

, fetchPypi

, zope_proxy

, zope-proxy

}:



buildPythonPackage rec {
@@ -13,7 +13,7 @@ buildPythonPackage rec { 
    hash = "sha256-Fx7tyKIOw6isJxOaqQzyd/93dy6gMrVLaicBp5J7OsU=";

  };



  propagatedBuildInputs = [ zope_proxy ];

  propagatedBuildInputs = [ zope-proxy ];



  # ignore circular dependency on zope_schema

  preBuild = ''

pkgs/top-level/python-aliases.nix

+1 −0
Original line number Diff line number Diff line
@@ -412,4 +412,5 @@ mapAliases ({ 
  zope_component = zope-component; # added 2023-07-28

  zope_deprecation = zope-deprecation; # added 2023-10-07

  zope_i18nmessageid = zope-i18nmessageid; # added 2023-07-29

  zope_proxy = zope-proxy; # added 2023-10-07

})

pkgs/top-level/python-packages.nix

+1 −1
Original line number Diff line number Diff line
@@ -15922,7 +15922,7 @@ self: super: with self; { 














  zope_location = callPackage ../development/python-modules/zope_location { };



























  zope_proxy = callPackage ../development/python-modules/zope_proxy { };













  zope-proxy = callPackage ../development/python-modules/zope-proxy { };





























  zope_schema = callPackage ../development/python-modules/zope_schema { };