From 0ece3c5d91eddb09161b3f0bcd509ab678f0e4e1 Mon Sep 17 00:00:00 2001 From: Theodore Ni <3806110+tjni@users.noreply.github.com> Date: Sun, 20 Nov 2022 23:55:36 -0800 Subject: [PATCH 1/3] python310Packages.logilab-common: 1.6.1 -> 1.9.7 --- .../python-modules/logilab/common.nix | 47 +++++++++++++++---- 1 file changed, 37 insertions(+), 10 deletions(-) diff --git a/pkgs/development/python-modules/logilab/common.nix b/pkgs/development/python-modules/logilab/common.nix index a1cb1b248ae3..df6a8b659a59 100644 --- a/pkgs/development/python-modules/logilab/common.nix +++ b/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; }; } From 10c2b21c3f8dea83cfa4304109eac00d00be707e Mon Sep 17 00:00:00 2001 From: Theodore Ni <3806110+tjni@users.noreply.github.com> Date: Mon, 21 Nov 2022 00:00:51 -0800 Subject: [PATCH 2/3] python310Packages.logilab-common: rename using hyphen --- pkgs/development/python-modules/bugzilla/default.nix | 12 +++++++++--- .../python-modules/logilab/constraint.nix | 4 ++-- .../python-modules/logilab_astng/default.nix | 4 ++-- pkgs/top-level/python-aliases.nix | 1 + pkgs/top-level/python-packages.nix | 2 +- 5 files changed, 15 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/bugzilla/default.nix b/pkgs/development/python-modules/bugzilla/default.nix index 03a1610ac7e4..567c1084c5d7 100644 --- a/pkgs/development/python-modules/bugzilla/default.nix +++ b/pkgs/development/python-modules/bugzilla/default.nix @@ -1,5 +1,11 @@ -{ lib, buildPythonPackage, fetchPypi -, pep8, coverage, logilab_common, requests }: +{ lib +, buildPythonPackage +, fetchPypi +, pep8 +, coverage +, logilab-common +, requests +}: buildPythonPackage rec { pname = "bugzilla"; @@ -11,7 +17,7 @@ buildPythonPackage rec { sha256 = "0q8c3k0kdnd11g2s56cp8va9365x0xfr2m2zn9fgxjijdyhwdic5"; }; - buildInputs = [ pep8 coverage logilab_common ]; + buildInputs = [ pep8 coverage logilab-common ]; propagatedBuildInputs = [ requests ]; preCheck = '' diff --git a/pkgs/development/python-modules/logilab/constraint.nix b/pkgs/development/python-modules/logilab/constraint.nix index ca9e5b17be85..9168d2ef8b06 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 }: buildPythonPackage rec { pname = "logilab-constraint"; @@ -10,7 +10,7 @@ buildPythonPackage rec { }; propagatedBuildInputs = [ - logilab_common six + logilab-common six ]; diff --git a/pkgs/development/python-modules/logilab_astng/default.nix b/pkgs/development/python-modules/logilab_astng/default.nix index dac5862324ab..573113dc2098 100644 --- a/pkgs/development/python-modules/logilab_astng/default.nix +++ b/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"; diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index cdfe972bfc83..d180d9c0f7a8 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -105,6 +105,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 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 8e25b0335c61..323c247c53d3 100644 --- a/pkgs/top-level/python-packages.nix +++ b/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 { }; From 36a0517448efa84116c03c2a6b76f89a443c11a9 Mon Sep 17 00:00:00 2001 From: Theodore Ni <3806110+tjni@users.noreply.github.com> Date: Sat, 26 Nov 2022 09:43:58 -0800 Subject: [PATCH 3/3] python310Packages.bugzilla: clean up dependencies and enable tests --- pkgs/development/python-modules/bugzilla/default.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/bugzilla/default.nix b/pkgs/development/python-modules/bugzilla/default.nix index 567c1084c5d7..3f201b876d4a 100644 --- a/pkgs/development/python-modules/bugzilla/default.nix +++ b/pkgs/development/python-modules/bugzilla/default.nix @@ -1,10 +1,8 @@ { lib , buildPythonPackage , fetchPypi -, pep8 -, coverage -, logilab-common , requests +, pytestCheckHook }: buildPythonPackage rec { @@ -17,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 @@ -28,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 ]; };