From 6cef3451e741bcbc4dfac9b450871ac7ca42cadf Mon Sep 17 00:00:00 2001 From: natsukium Date: Sat, 2 Sep 2023 11:17:44 +0900 Subject: [PATCH 1/3] python310Packages.logilab-common: 1.9.7 -> 1.10.0 Diff: https://forge.extranet.logilab.fr/open-source/logilab-common/-/compare/1.9.7...1.10.0 Changelog: https://forge.extranet.logilab.fr/open-source/logilab-common/-/blob/1.10.0/CHANGELOG.md --- pkgs/development/python-modules/logilab/common.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/logilab/common.nix b/pkgs/development/python-modules/logilab/common.nix index eef74d0695e..9467f003c70 100644 --- a/pkgs/development/python-modules/logilab/common.nix +++ b/pkgs/development/python-modules/logilab/common.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "logilab-common"; - version = "1.9.7"; + version = "1.10.0"; format = "pyproject"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-/JlN9RlIRLbi9TL9V6SgO6ddPeKqLzK402DqkLBRuxM="; + hash = "sha256-MoXt3tta5OimJUjOkWSMDCmXV0aS8N0W5bcANwAelYY="; }; nativeBuildInputs = [ @@ -27,6 +27,7 @@ buildPythonPackage rec { ]; propagatedBuildInputs = [ + setuptools mypy-extensions typing-extensions ] ++ lib.optionals (pythonOlder "3.8") [ From cfd8b8fe1dd8f8732a6e746327b59c6e862d0150 Mon Sep 17 00:00:00 2001 From: natsukium Date: Sat, 2 Sep 2023 10:45:47 +0900 Subject: [PATCH 2/3] python310Packages.logilab-constraint: add missing build dependencies --- pkgs/development/python-modules/logilab/constraint.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/logilab/constraint.nix b/pkgs/development/python-modules/logilab/constraint.nix index e609558d4c9..de8ad4fd022 100644 --- a/pkgs/development/python-modules/logilab/constraint.nix +++ b/pkgs/development/python-modules/logilab/constraint.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchPypi, logilab-common, six }: +{ lib, buildPythonPackage, fetchPypi, logilab-common, six, importlib-metadata, pip }: buildPythonPackage rec { pname = "logilab-constraint"; @@ -9,6 +9,11 @@ buildPythonPackage rec { hash = "sha256-Jk6wvvcDEeHfy7dUcjbnzFIeGBYm5tXzCI26yy+t2qs="; }; + nativeBuildInputs = [ + importlib-metadata + pip + ]; + propagatedBuildInputs = [ logilab-common six ]; From 6d24d4234b7f39c7ddeffe773ba7749a3e6209d8 Mon Sep 17 00:00:00 2001 From: natsukium Date: Sat, 2 Sep 2023 11:24:03 +0900 Subject: [PATCH 3/3] python310Packages.logilab-constraint: refactor - pretty formatting - enable checkPhase - update meta --- .../python-modules/logilab/constraint.nix | 36 +++++++++++++++++-- 1 file changed, 33 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/logilab/constraint.nix b/pkgs/development/python-modules/logilab/constraint.nix index de8ad4fd022..f97cb9593b6 100644 --- a/pkgs/development/python-modules/logilab/constraint.nix +++ b/pkgs/development/python-modules/logilab/constraint.nix @@ -1,8 +1,18 @@ -{ lib, buildPythonPackage, fetchPypi, logilab-common, six, importlib-metadata, pip }: +{ lib +, buildPythonPackage +, fetchPypi +, importlib-metadata +, logilab-common +, pip +, six +, pytestCheckHook +, setuptools +}: buildPythonPackage rec { pname = "logilab-constraint"; version = "0.6.2"; + format = "setuptools"; src = fetchPypi { inherit pname version; @@ -15,13 +25,33 @@ buildPythonPackage rec { ]; propagatedBuildInputs = [ - logilab-common six + logilab-common + setuptools + six ]; + nativeCheckInputs = [ + pytestCheckHook + ]; + + preCheck = '' + # avoid ModuleNotFoundError: No module named 'logilab.common' due to namespace + rm -r logilab + ''; + + disabledTests = [ + # these tests are abstract test classes intended to be inherited + "Abstract" + ]; + + pythonImportsCheck = [ "logilab.constraint" ]; meta = with lib; { description = "logilab-database provides some classes to make unified access to different"; - homepage = "https://www.logilab.org/project/logilab-database"; + homepage = "https://forge.extranet.logilab.fr/open-source/logilab-constraint"; + changelog = "https://forge.extranet.logilab.fr/open-source/logilab-constraint/-/blob/${version}/CHANGELOG.md"; + license = licenses.lgpl21Plus; + maintainers = with lib.maintainers; [ ]; }; }