Merge pull request #252873 from natsukium/logilab/fix

python310Packages.logilab-common: 1.9.7 -> 1.10.0

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") [

pkgs/development/python-modules/logilab/constraint.nix

@@ -1,22 +1,57 @@
-{ lib, buildPythonPackage, fetchPypi, logilab-common, six }:
+{ 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;
     hash = "sha256-Jk6wvvcDEeHfy7dUcjbnzFIeGBYm5tXzCI26yy+t2qs=";
   };
 
-  propagatedBuildInputs = [
+  nativeBuildInputs = [
-    logilab-common six
+    importlib-metadata
+    pip
   ];
 
+  propagatedBuildInputs = [
+    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; [ ];
   };
 }