From 3465a43303444e8fc6ebd1454c21a68ccda44e09 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 30 Jan 2021 16:49:29 +0100 Subject: [PATCH] pythonPackages.cached-property: 1.5.1 -> 1.5.2 (#110835) --- .../cached-property/default.nix | 25 ++++++++----------- 1 file changed, 11 insertions(+), 14 deletions(-) diff --git a/pkgs/development/python-modules/cached-property/default.nix b/pkgs/development/python-modules/cached-property/default.nix index d25e2e963dc3..72bf870c37b5 100644 --- a/pkgs/development/python-modules/cached-property/default.nix +++ b/pkgs/development/python-modules/cached-property/default.nix @@ -1,28 +1,25 @@ { lib , buildPythonPackage -, fetchFromGitHub -, pytest +, fetchPypi +, pytestCheckHook , freezegun }: buildPythonPackage rec { pname = "cached-property"; - version = "1.5.1"; + version = "1.5.2"; - # conftest.py is missing in PyPI tarball - src = fetchFromGitHub { - owner = "pydanny"; - repo = pname; - rev = version; - sha256 = "0xh0pwmiikx0il9nnfyf034ydmlw6992s0d209agd9j5d3s2k5q6"; + src = fetchPypi { + inherit pname version; + sha256 = "9fa5755838eecbb2d234c3aa390bd80fbd3ac6b6869109bfc1b499f7bd89a130"; }; - checkInputs = [ pytest freezegun ]; + checkInputs = [ pytestCheckHook freezegun ]; - # https://github.com/pydanny/cached-property/issues/131 - checkPhase = '' - py.test -k "not test_threads_ttl_expiry" - ''; + disabledTests = [ + # https://github.com/pydanny/cached-property/issues/131 + "test_threads_ttl_expiry" + ]; meta = { description = "A decorator for caching properties in classes";