From 46c341170f47b029ecf99fc1c2882ceed3592d18 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 6 Oct 2022 01:50:02 +0000 Subject: [PATCH 1/2] python310Packages.pyftpdlib: 1.5.6 -> 1.5.7 --- pkgs/development/python-modules/pyftpdlib/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyftpdlib/default.nix b/pkgs/development/python-modules/pyftpdlib/default.nix index b3aa456c4a9d..c25407afd661 100644 --- a/pkgs/development/python-modules/pyftpdlib/default.nix +++ b/pkgs/development/python-modules/pyftpdlib/default.nix @@ -8,12 +8,12 @@ }: buildPythonPackage rec { - version = "1.5.6"; + version = "1.5.7"; pname = "pyftpdlib"; src = fetchPypi { inherit pname version; - sha256 = "0pnv2byzmzg84q5nmmhn1xafvfil85qa5y52bj455br93zc5b9px"; + sha256 = "sha256-fqPOQTfbggmvH2ueoCBZD0YsY+18ehJAvVluTTp7ZW4="; }; checkInputs = [ mock psutil ]; From 46b344748bfbf7437ba7dcc93ddebbfb7455f2d1 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 6 Oct 2022 09:34:52 +0200 Subject: [PATCH 2/2] python310Packages.pyftpdlib: disable on older Python releases - update meta - add optional-dependencies - add pythonImportsCheck --- .../python-modules/pyftpdlib/default.nix | 34 +++++++++++++++---- 1 file changed, 27 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/pyftpdlib/default.nix b/pkgs/development/python-modules/pyftpdlib/default.nix index c25407afd661..b69b7acc99d4 100644 --- a/pkgs/development/python-modules/pyftpdlib/default.nix +++ b/pkgs/development/python-modules/pyftpdlib/default.nix @@ -5,28 +5,48 @@ , psutil , pyopenssl , pysendfile +, pythonOlder }: buildPythonPackage rec { - version = "1.5.7"; pname = "pyftpdlib"; + version = "1.5.7"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-fqPOQTfbggmvH2ueoCBZD0YsY+18ehJAvVluTTp7ZW4="; + hash = "sha256-fqPOQTfbggmvH2ueoCBZD0YsY+18ehJAvVluTTp7ZW4="; }; - checkInputs = [ mock psutil ]; - propagatedBuildInputs = [ pyopenssl pysendfile ]; + propagatedBuildInputs = [ + pysendfile + ]; - # impure filesystem-related tests cause timeouts + passthru.optional-dependencies = { + ssl = [ + pyopenssl + ]; + }; + + checkInputs = [ + mock + psutil + ]; + + # Impure filesystem-related tests cause timeouts # on Hydra: https://hydra.nixos.org/build/84374861 doCheck = false; + pythonImportsCheck = [ + "pyftpdlib" + ]; + meta = with lib; { + description = "Asynchronous FTP server library"; homepage = "https://github.com/giampaolo/pyftpdlib/"; - description = "Very fast asynchronous FTP server library"; license = licenses.mit; - maintainers = [ maintainers.costrouc ]; + maintainers = with maintainers; [ costrouc ]; }; }