From 9dbdba06180218bcfb78dbd1ca9e05a9d19e9aef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 29 Mar 2022 15:13:19 +0200 Subject: [PATCH] python310Packages.backports_functools_lru_cache: switch to pytestCheckHook, remove linters --- .../backports_functools_lru_cache/default.nix | 12 ++---------- .../python-modules/portend/black-19.10b0.patch | 13 ------------- 2 files changed, 2 insertions(+), 23 deletions(-) delete mode 100644 pkgs/development/python-modules/portend/black-19.10b0.patch diff --git a/pkgs/development/python-modules/backports_functools_lru_cache/default.nix b/pkgs/development/python-modules/backports_functools_lru_cache/default.nix index 21920c32b4d..680d23782f5 100644 --- a/pkgs/development/python-modules/backports_functools_lru_cache/default.nix +++ b/pkgs/development/python-modules/backports_functools_lru_cache/default.nix @@ -3,10 +3,7 @@ , fetchPypi , setuptools-scm , isPy3k -, pytest -, pytest-black -, pytest-flake8 -, pytest-cov +, pytestCheckHook }: buildPythonPackage rec { @@ -20,12 +17,7 @@ buildPythonPackage rec { nativeBuildInputs = [ setuptools-scm ]; - checkInputs = [ pytest pytest-flake8 pytest-black pytest-cov ]; - # ironically, they fail a linting test, and pytest.ini forces that test suite - checkPhase = '' - rm backports/functools_lru_cache.py - pytest -k 'not format' - ''; + checkInputs = [ pytestCheckHook ]; # Test fail on Python 2 doCheck = isPy3k; diff --git a/pkgs/development/python-modules/portend/black-19.10b0.patch b/pkgs/development/python-modules/portend/black-19.10b0.patch deleted file mode 100644 index e781139e319..00000000000 --- a/pkgs/development/python-modules/portend/black-19.10b0.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/test_portend.py b/test_portend.py -index b2de8c2..3f90276 100644 ---- a/test_portend.py -+++ b/test_portend.py -@@ -21,7 +21,7 @@ def socket_infos(): - - - def id_for_info(info): -- af, = info[:1] -+ (af,) = info[:1] - return str(af) - - \ No newline at end of file