Merge pull request #202157 from tjni/logilab

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

@@ -1,5 +1,9 @@
-{ lib, buildPythonPackage, fetchPypi
-, pep8, coverage, logilab_common, requests }:
+{ lib
+, buildPythonPackage
+, fetchPypi
+, requests
+, pytestCheckHook
+}:
 
 buildPythonPackage rec {
   pname = "bugzilla";
@@ -11,9 +15,12 @@ buildPythonPackage rec {
     sha256 = "0q8c3k0kdnd11g2s56cp8va9365x0xfr2m2zn9fgxjijdyhwdic5";
   };
 
-  buildInputs = [ pep8 coverage logilab_common ];
   propagatedBuildInputs = [ requests ];
 
+  checkInputs = [
+    pytestCheckHook
+  ];
+
   preCheck = ''
     mkdir -p check-phase
     export HOME=$(pwd)/check-phase
@@ -22,7 +29,7 @@ buildPythonPackage rec {
   meta = with lib; {
     homepage = "https://github.com/python-bugzilla/python-bugzilla";
     description = "Bugzilla XMLRPC access module";
-    license = licenses.gpl2;
+    license = licenses.gpl2Plus;
     platforms = platforms.all;
     maintainers = with maintainers; [ pierron ];
   };

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

@@ -1,24 +1,51 @@
-{ lib, buildPythonPackage, fetchPypi, isPy27, unittest2, six }:
+{ lib
+, buildPythonPackage
+, fetchPypi
+, pythonOlder
+, setuptools
+, importlib-metadata
+, mypy-extensions
+, typing-extensions
+, pytestCheckHook
+, pytz
+}:
 
 buildPythonPackage rec {
   pname = "logilab-common";
-  version = "1.6.1";
-  disabled = isPy27;
+  version = "1.9.7";
+  format = "pyproject";
+
+  disabled = pythonOlder "3.6";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0h0b2vg2xpfbnynrkg2yki4zjpscm6wgm6nhaahb088v98zxqbrk";
+    hash = "sha256-/JlN9RlIRLbi9TL9V6SgO6ddPeKqLzK402DqkLBRuxM=";
   };
 
-  propagatedBuildInputs = [ unittest2 six ];
+  nativeBuildInputs = [
+    setuptools
+  ];
 
-  # package supports 3.x but tests require egenix-mx-base which is python 2.x only
-  # and is not currently in nixos
-  doCheck = false;
+  propagatedBuildInputs = [
+    mypy-extensions
+    typing-extensions
+  ] ++ lib.optionals (pythonOlder "3.8") [
+    importlib-metadata
+  ];
+
+  checkInputs = [
+    pytestCheckHook
+    pytz
+  ];
+
+  preCheck = ''
+    export COLLECT_DEPRECATION_WARNINGS_PACKAGE_NAME=true
+  '';
 
   meta = with lib; {
     description = "Python packages and modules used by Logilab ";
-    homepage = "https://www.logilab.org/project/logilab-common";
-    license = licenses.lgpl21;
+    homepage = "https://logilab-common.readthedocs.io/";
+    changelog = "https://forge.extranet.logilab.fr/open-source/logilab-common/-/blob/branch/default/CHANGELOG.md";
+    license = licenses.lgpl21Plus;
   };
 }

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

@@ -1,4 +1,4 @@
-{ lib, buildPythonPackage, fetchPypi, logilab_common, six }:
+{ lib, buildPythonPackage, fetchPypi, logilab-common, six }:
 
 buildPythonPackage rec {
   pname = "logilab-constraint";
@@ -10,7 +10,7 @@ buildPythonPackage rec {
   };
 
   propagatedBuildInputs = [
-    logilab_common six
+    logilab-common six
   ];
 
 

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

@@ -1,7 +1,7 @@
 { lib
 , buildPythonPackage
 , fetchurl
-, logilab_common
+, logilab-common
 }:
 
 buildPythonPackage rec {
@@ -13,7 +13,7 @@ buildPythonPackage rec {
     sha256 = "0np4wpxyha7013vkkrdy54dvnil67gzi871lg60z8lap0l5h67wn";
   };
 
-  propagatedBuildInputs = [ logilab_common ];
+  propagatedBuildInputs = [ logilab-common ];
 
   meta = with lib; {
     homepage = "https://www.logilab.org/project/logilab-astng";

pkgs/top-level/python-aliases.nix

@@ -107,6 +107,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
+  logilab_common = logilab-common; # added 2022-11-21
   loo-py = loopy; # added 2022-05-03
   Markups = markups; # added 2022-02-14
   MechanicalSoup = mechanicalsoup; # added 2021-06-01

pkgs/top-level/python-packages.nix

@@ -5408,7 +5408,7 @@ self: super: with self; {
 
   logilab_astng = callPackage ../development/python-modules/logilab_astng { };
 
-  logilab_common = callPackage ../development/python-modules/logilab/common.nix { };
+  logilab-common = callPackage ../development/python-modules/logilab/common.nix { };
 
   logilab-constraint = callPackage ../development/python-modules/logilab/constraint.nix { };