From 09cc8b216e97a4ec0ff982856ffd3d1edc12f9db Mon Sep 17 00:00:00 2001 From: natsukium Date: Fri, 3 Nov 2023 21:03:56 +0900 Subject: [PATCH 1/6] python311Packages.lazr-config: rename from lazr_config --- pkgs/development/python-modules/lazr/config.nix | 5 +++-- pkgs/servers/mail/mailman/package.nix | 2 +- pkgs/top-level/python-aliases.nix | 1 + pkgs/top-level/python-packages.nix | 2 +- 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/lazr/config.nix b/pkgs/development/python-modules/lazr/config.nix index b10ad25972b5..061a34820caf 100644 --- a/pkgs/development/python-modules/lazr/config.nix +++ b/pkgs/development/python-modules/lazr/config.nix @@ -1,13 +1,14 @@ { buildPythonPackage, fetchPypi, lazr_delegates }: buildPythonPackage rec { - pname = "lazr.config"; + pname = "lazr-config"; version = "2.2.3"; propagatedBuildInputs = [ lazr_delegates ]; src = fetchPypi { - inherit pname version; + pname = "lazr.config"; + inherit version; sha256 = "b74a73f8b63e6dc6732fc1f3d88e2f236596ddf089ef6e1794ece060e8cfabe1"; }; } diff --git a/pkgs/servers/mail/mailman/package.nix b/pkgs/servers/mail/mailman/package.nix index 47d09bff6717..955c553d8a74 100644 --- a/pkgs/servers/mail/mailman/package.nix +++ b/pkgs/servers/mail/mailman/package.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { flufl_i18n flufl_lock gunicorn - lazr_config + lazr-config passlib requests sqlalchemy diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index 00f517bc5788..f13451b38d86 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -216,6 +216,7 @@ mapAliases ({ Keras = keras; # added 2021-11-25 ldap = python-ldap; # added 2022-09-16 lammps-cython = throw "lammps-cython no longer builds and is unmaintained"; # added 2021-07-04 + lazr_config = lazr-config; # added 2023-11-03 lazy_imports = lazy-imports; # added 2023-10-13 lektor = throw "lektor has been promoted to a top-level attribute"; # added 2023-08-01 logilab_astng = throw "logilab-astng has not been released since 2013 and is unmaintained"; # added 2022-11-29 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index baf3d17e8991..75312f0425c7 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6038,7 +6038,7 @@ self: super: with self; { layoutparser = callPackage ../development/python-modules/layoutparser { }; - lazr_config = callPackage ../development/python-modules/lazr/config.nix { }; + lazr-config = callPackage ../development/python-modules/lazr/config.nix { }; lazr_delegates = callPackage ../development/python-modules/lazr/delegates.nix { }; From 5d0f3d602595cb23f1e0901049b298926534df7e Mon Sep 17 00:00:00 2001 From: natsukium Date: Fri, 3 Nov 2023 22:46:01 +0900 Subject: [PATCH 2/6] python311Packages.lazr-config: refactor --- .../python-modules/lazr/config.nix | 48 +++++++++++++++++-- 1 file changed, 44 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/lazr/config.nix b/pkgs/development/python-modules/lazr/config.nix index 061a34820caf..a27ae1f82fd4 100644 --- a/pkgs/development/python-modules/lazr/config.nix +++ b/pkgs/development/python-modules/lazr/config.nix @@ -1,14 +1,54 @@ -{ buildPythonPackage, fetchPypi, lazr_delegates }: +{ lib +, buildPythonPackage +, fetchPypi +, setuptools +, lazr_delegates +, zope_interface +, pytestCheckHook +}: buildPythonPackage rec { pname = "lazr-config"; version = "2.2.3"; - - propagatedBuildInputs = [ lazr_delegates ]; + pyproject = true; src = fetchPypi { pname = "lazr.config"; inherit version; - sha256 = "b74a73f8b63e6dc6732fc1f3d88e2f236596ddf089ef6e1794ece060e8cfabe1"; + hash = "sha256-t0pz+LY+bcZzL8Hz2I4vI2WW3fCJ724XlOzgYOjPq+E="; + }; + + nativeBuildInputs = [ + setuptools + ]; + + propagatedBuildInputs = [ + lazr_delegates + zope_interface + ]; + + pythonImportsCheck = [ + "lazr.config" + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + # change the directory to avoid a namespace-related problem + # ModuleNotFoundError: No module named 'lazr.delegates' + preCheck = '' + cd $out + ''; + + pythonNamespaces = [ + "lazr" + ]; + + meta = with lib; { + description = "Create configuration schemas, and process and validate configurations"; + homepage = "https://launchpad.net/lazr.config"; + changelog = "https://git.launchpad.net/lazr.config/tree/NEWS.rst?h=${version}"; + license = licenses.lgpl3Only; }; } From 375e6a3c1dd6611fd5ea221d3a600ee8ae52db5b Mon Sep 17 00:00:00 2001 From: natsukium Date: Fri, 3 Nov 2023 22:48:20 +0900 Subject: [PATCH 3/6] python311Packages.lazr-config: 2.2.3 -> 3.0 Changelog: https://git.launchpad.net/lazr.config/tree/NEWS.rst?h=3.0 --- pkgs/development/python-modules/lazr/config.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/lazr/config.nix b/pkgs/development/python-modules/lazr/config.nix index a27ae1f82fd4..38b0ed3e02c0 100644 --- a/pkgs/development/python-modules/lazr/config.nix +++ b/pkgs/development/python-modules/lazr/config.nix @@ -9,13 +9,13 @@ buildPythonPackage rec { pname = "lazr-config"; - version = "2.2.3"; + version = "3.0"; pyproject = true; src = fetchPypi { pname = "lazr.config"; inherit version; - hash = "sha256-t0pz+LY+bcZzL8Hz2I4vI2WW3fCJ724XlOzgYOjPq+E="; + hash = "sha256-oU5PbMCa68HUCxdhWK6g7uIlLBQAO40O8LMcfFFMNkQ="; }; nativeBuildInputs = [ From 067e014f772c9bb486ba43dc0626001207304af3 Mon Sep 17 00:00:00 2001 From: natsukium Date: Fri, 3 Nov 2023 23:26:19 +0900 Subject: [PATCH 4/6] python311Packages.lazr-delegates: rename from lazr_delegates --- pkgs/development/python-modules/lazr/config.nix | 4 ++-- pkgs/development/python-modules/lazr/delegates.nix | 5 +++-- pkgs/top-level/python-aliases.nix | 1 + pkgs/top-level/python-packages.nix | 2 +- 4 files changed, 7 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/lazr/config.nix b/pkgs/development/python-modules/lazr/config.nix index 38b0ed3e02c0..bc369705e265 100644 --- a/pkgs/development/python-modules/lazr/config.nix +++ b/pkgs/development/python-modules/lazr/config.nix @@ -2,7 +2,7 @@ , buildPythonPackage , fetchPypi , setuptools -, lazr_delegates +, lazr-delegates , zope_interface , pytestCheckHook }: @@ -23,7 +23,7 @@ buildPythonPackage rec { ]; propagatedBuildInputs = [ - lazr_delegates + lazr-delegates zope_interface ]; diff --git a/pkgs/development/python-modules/lazr/delegates.nix b/pkgs/development/python-modules/lazr/delegates.nix index 40e2e47d517d..61646cd8bc2a 100644 --- a/pkgs/development/python-modules/lazr/delegates.nix +++ b/pkgs/development/python-modules/lazr/delegates.nix @@ -1,7 +1,7 @@ { buildPythonPackage, fetchPypi, nose, zope_interface }: buildPythonPackage rec { - pname = "lazr.delegates"; + pname = "lazr-delegates"; version = "2.0.4"; propagatedBuildInputs = [ nose zope_interface ]; @@ -9,7 +9,8 @@ buildPythonPackage rec { doCheck = false; # cannot import name 'ClassType' from 'types' src = fetchPypi { - inherit pname version; + pname = "lazr.delegates"; + inherit version; sha256 = "1rdnl85j9ayp8n85l0ciip621j9dcziz5qnmv2m7krgwgcn31vfx"; }; } diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index f13451b38d86..9e5ec5b3810a 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -217,6 +217,7 @@ mapAliases ({ ldap = python-ldap; # added 2022-09-16 lammps-cython = throw "lammps-cython no longer builds and is unmaintained"; # added 2021-07-04 lazr_config = lazr-config; # added 2023-11-03 + lazr_delegates = lazr-delegates; # added 2023-11-03 lazy_imports = lazy-imports; # added 2023-10-13 lektor = throw "lektor has been promoted to a top-level attribute"; # added 2023-08-01 logilab_astng = throw "logilab-astng has not been released since 2013 and is unmaintained"; # added 2022-11-29 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 75312f0425c7..da44a8efb570 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6040,7 +6040,7 @@ self: super: with self; { lazr-config = callPackage ../development/python-modules/lazr/config.nix { }; - lazr_delegates = callPackage ../development/python-modules/lazr/delegates.nix { }; + lazr-delegates = callPackage ../development/python-modules/lazr/delegates.nix { }; lazr-restfulclient = callPackage ../development/python-modules/lazr-restfulclient { }; From c8396e38c10d9a01bbe600bc64da4593f6071bfb Mon Sep 17 00:00:00 2001 From: natsukium Date: Fri, 3 Nov 2023 23:36:08 +0900 Subject: [PATCH 5/6] python311Packages.lazr-delegates: refactor --- .../python-modules/lazr/delegates.nix | 42 ++++++++++++++++--- 1 file changed, 36 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/lazr/delegates.nix b/pkgs/development/python-modules/lazr/delegates.nix index 61646cd8bc2a..d13640f9c116 100644 --- a/pkgs/development/python-modules/lazr/delegates.nix +++ b/pkgs/development/python-modules/lazr/delegates.nix @@ -1,16 +1,46 @@ -{ buildPythonPackage, fetchPypi, nose, zope_interface }: +{ lib +, buildPythonPackage +, fetchPypi +, setuptools +, zope_interface +, pytestCheckHook +}: buildPythonPackage rec { pname = "lazr-delegates"; version = "2.0.4"; - - propagatedBuildInputs = [ nose zope_interface ]; - - doCheck = false; # cannot import name 'ClassType' from 'types' + pyproject = true; src = fetchPypi { pname = "lazr.delegates"; inherit version; - sha256 = "1rdnl85j9ayp8n85l0ciip621j9dcziz5qnmv2m7krgwgcn31vfx"; + hash = "sha256-3e0wLHv85Xmq2NXi8uNnLckgzI2RAVqQRderJAuituU="; + }; + + nativeBuildInputs = [ + setuptools + ]; + + propagatedBuildInputs = [ + zope_interface + ]; + + pythonImportsCheck = [ + "lazr.delegates" + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + pythonNamespaces = [ + "lazr" + ]; + + meta = with lib; { + description = "Easily write objects that delegate behavior"; + homepage = "https://launchpad.net/lazr.delegates"; + changelog = "https://git.launchpad.net/lazr.delegates/tree/lazr/delegates/docs/NEWS.rst?h=${version}"; + license = licenses.lgpl3Only; }; } From 62ea868312bac1f6cc01a9996bc35bb658bea879 Mon Sep 17 00:00:00 2001 From: natsukium Date: Fri, 3 Nov 2023 23:36:36 +0900 Subject: [PATCH 6/6] python311Packages.lazr-delegates: 2.0.4 -> 2.1.0 Changelog: https://git.launchpad.net/lazr.delegates/tree/NEWS.rst?h=2.1.0 --- pkgs/development/python-modules/lazr/delegates.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/lazr/delegates.nix b/pkgs/development/python-modules/lazr/delegates.nix index d13640f9c116..e0b03e693194 100644 --- a/pkgs/development/python-modules/lazr/delegates.nix +++ b/pkgs/development/python-modules/lazr/delegates.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "lazr-delegates"; - version = "2.0.4"; + version = "2.1.0"; pyproject = true; src = fetchPypi { pname = "lazr.delegates"; inherit version; - hash = "sha256-3e0wLHv85Xmq2NXi8uNnLckgzI2RAVqQRderJAuituU="; + hash = "sha256-UNT7iHK5UuV6SOEmEOVQ+jBm7rV8bGx1tqUUJBi6wZw="; }; nativeBuildInputs = [ @@ -40,7 +40,7 @@ buildPythonPackage rec { meta = with lib; { description = "Easily write objects that delegate behavior"; homepage = "https://launchpad.net/lazr.delegates"; - changelog = "https://git.launchpad.net/lazr.delegates/tree/lazr/delegates/docs/NEWS.rst?h=${version}"; + changelog = "https://git.launchpad.net/lazr.delegates/tree/NEWS.rst?h=${version}"; license = licenses.lgpl3Only; }; }