diff --git a/pkgs/development/python-modules/dvc/default.nix b/pkgs/development/python-modules/dvc/default.nix index b4cad5f2b206b..bdb86f445373a 100644 --- a/pkgs/development/python-modules/dvc/default.nix +++ b/pkgs/development/python-modules/dvc/default.nix @@ -19,7 +19,7 @@ , fetchFromGitHub , fetchpatch , flatten-dict -, flufl_lock +, flufl-lock , funcy , grandalf , gto @@ -99,7 +99,7 @@ buildPythonPackage rec { dvc-studio-client dvc-task flatten-dict - flufl_lock + flufl-lock funcy grandalf gto diff --git a/pkgs/development/python-modules/flufl/bounce.nix b/pkgs/development/python-modules/flufl/bounce.nix index 81d2d4840cf13..7c6738bc3cd65 100644 --- a/pkgs/development/python-modules/flufl/bounce.nix +++ b/pkgs/development/python-modules/flufl/bounce.nix @@ -1,14 +1,49 @@ -{ buildPythonPackage, fetchPypi, atpublic, zope-interface, nose2 }: +{ lib +, buildPythonPackage +, fetchPypi +, setuptools +, atpublic +, zope-interface +, pytestCheckHook +}: buildPythonPackage rec { - pname = "flufl.bounce"; + pname = "flufl-bounce"; version = "4.0"; - - buildInputs = [ nose2 ]; - propagatedBuildInputs = [ atpublic zope-interface ]; + pyproject = true; src = fetchPypi { - inherit pname version; + pname = "flufl.bounce"; + inherit version; hash = "sha256-JVBK65duwP5aGc1sQTo0EMtRT9zb3Kn5tdjTQ6hgODE="; }; + + nativeBuildInputs = [ + setuptools + ]; + + propagatedBuildInputs = [ + atpublic + zope-interface + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "flufl.bounce" + ]; + + pythonNamespaces = [ + "flufl" + ]; + + meta = with lib; { + description = "Email bounce detectors"; + homepage = "https://gitlab.com/warsaw/flufl.bounce"; + changelog = "https://gitlab.com/warsaw/flufl.bounce/-/blob/${version}/flufl/bounce/NEWS.rst"; + maintainers = with maintainers; [ ]; + license = licenses.asl20; + }; } diff --git a/pkgs/development/python-modules/flufl/i18n.nix b/pkgs/development/python-modules/flufl/i18n.nix index 57a33e233cf60..bd5bcb62fe6c7 100644 --- a/pkgs/development/python-modules/flufl/i18n.nix +++ b/pkgs/development/python-modules/flufl/i18n.nix @@ -1,26 +1,45 @@ { lib , buildPythonPackage , fetchPypi +, pythonOlder , atpublic , pdm-pep517 +, pytestCheckHook +, sybil }: buildPythonPackage rec { - pname = "flufl.i18n"; + pname = "flufl-i18n"; version = "4.1.1"; - format = "pyproject"; + pyproject = true; + + disabled = pythonOlder "3.7"; + + src = fetchPypi { + pname = "flufl.i18n"; + inherit version; + hash = "sha256-wKz6aggkJ9YBJ+o75XjC4Ddnn+Zi9hlYDnliwTc7DNs="; + }; + + postPatch = '' + substituteInPlace pyproject.toml \ + --replace "--cov=flufl --cov-report=term --cov-report=xml" "" + ''; nativeBuildInputs = [ pdm-pep517 ]; - propagatedBuildInputs = [ atpublic ]; - doCheck = false; + propagatedBuildInputs = [ atpublic ]; pythonImportsCheck = [ "flufl.i18n" ]; - src = fetchPypi { - inherit pname version; - hash = "sha256-wKz6aggkJ9YBJ+o75XjC4Ddnn+Zi9hlYDnliwTc7DNs="; - }; + nativeCheckInputs = [ + pytestCheckHook + sybil + ]; + + pythonNamespaces = [ + "flufl" + ]; meta = with lib; { description = "A high level API for internationalizing Python libraries and applications"; diff --git a/pkgs/development/python-modules/flufl/lock.nix b/pkgs/development/python-modules/flufl/lock.nix index 1b4a575e760a5..8a3e391fee15d 100644 --- a/pkgs/development/python-modules/flufl/lock.nix +++ b/pkgs/development/python-modules/flufl/lock.nix @@ -1,15 +1,18 @@ -{ lib, buildPythonPackage, fetchPypi, pytestCheckHook +{ lib, buildPythonPackage, fetchPypi, pytestCheckHook, pythonOlder , atpublic, psutil, pytest-cov, sybil , pdm-pep517 }: buildPythonPackage rec { - pname = "flufl.lock"; + pname = "flufl-lock"; version = "7.1.1"; - format = "pyproject"; + pyproject = true; + + disabled = pythonOlder "3.7"; src = fetchPypi { - inherit pname version; + pname = "flufl.lock"; + inherit version; hash = "sha256-rxQXKzW7xYaHvQa3DRaT/Y1Iy/D/3n5RphjBSK4kBC0="; }; @@ -22,11 +25,19 @@ buildPythonPackage rec { # relevant to the user. pytestFlagsArray = [ "--no-cov" ]; + pythonImportsCheck = [ + "flufl.lock" + ]; + + pythonNamespaces = [ + "flufl" + ]; + meta = with lib; { homepage = "https://flufllock.readthedocs.io/"; description = "NFS-safe file locking with timeouts for POSIX and Windows"; + changelog = "https://gitlab.com/warsaw/flufl.lock/-/blob/${version}/docs/NEWS.rst"; maintainers = with maintainers; [ qyliss ]; license = licenses.asl20; - platforms = platforms.all; }; } diff --git a/pkgs/servers/mail/mailman/hyperkitty.nix b/pkgs/servers/mail/mailman/hyperkitty.nix index 89195e5937376..52c7497f5a6d3 100644 --- a/pkgs/servers/mail/mailman/hyperkitty.nix +++ b/pkgs/servers/mail/mailman/hyperkitty.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { django-compressor django-extensions djangorestframework - flufl_lock + flufl-lock mistune networkx psycopg2 diff --git a/pkgs/servers/mail/mailman/package.nix b/pkgs/servers/mail/mailman/package.nix index f38a182461acc..9a082040c96c1 100644 --- a/pkgs/servers/mail/mailman/package.nix +++ b/pkgs/servers/mail/mailman/package.nix @@ -26,9 +26,9 @@ buildPythonPackage rec { click dnspython falcon - flufl_bounce - flufl_i18n - flufl_lock + flufl-bounce + flufl-i18n + flufl-lock gunicorn lazr-config passlib diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index c6bbb79ce3677..3cb2e13185313 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -165,6 +165,9 @@ mapAliases ({ flask_testing = flask-testing; # added 2022-04-25 flask_wtf = flask-wtf; # added 2022-05-24 flowlogs_reader = flowlogs-reader; # added 2024-01-03 + flufl_bounce = flufl-bounce; # added 2023-11-03 + flufl_i18n = flufl-i18n; # added 2023-11-03 + flufl_lock = flufl-lock; # added 2023-11-03 FormEncode = formencode; # added 2023-02-19 foundationdb51 = throw "foundationdb51 is no longer maintained, use foundationdb71 instead"; # added 2023-06-06 foundationdb52 = throw "foundationdb52 is no longer maintained, use foundationdb71 instead"; # added 2023-06-06 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index f06c38f06d89e..04e17572a7eda 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4257,11 +4257,11 @@ self: super: with self; { fluent-logger = callPackage ../development/python-modules/fluent-logger { }; - flufl_bounce = callPackage ../development/python-modules/flufl/bounce.nix { }; + flufl-bounce = callPackage ../development/python-modules/flufl/bounce.nix { }; - flufl_i18n = callPackage ../development/python-modules/flufl/i18n.nix { }; + flufl-i18n = callPackage ../development/python-modules/flufl/i18n.nix { }; - flufl_lock = callPackage ../development/python-modules/flufl/lock.nix { }; + flufl-lock = callPackage ../development/python-modules/flufl/lock.nix { }; flux-led = callPackage ../development/python-modules/flux-led { };