From 1dcbf1f690b6a9da135a875bea9512ab94fb11b4 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 8 Jun 2023 19:53:22 +0200 Subject: [PATCH] python311Packages.py-multicodec: remove pytest-runner --- .../python-modules/py-multicodec/default.nix | 26 ++++++++++--------- 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/pkgs/development/python-modules/py-multicodec/default.nix b/pkgs/development/python-modules/py-multicodec/default.nix index 6619a5c3e39f..21f396d9c2a2 100644 --- a/pkgs/development/python-modules/py-multicodec/default.nix +++ b/pkgs/development/python-modules/py-multicodec/default.nix @@ -1,10 +1,9 @@ { lib , buildPythonPackage , fetchFromGitHub -, pytest-runner +, morphys , pytestCheckHook , pythonOlder -, morphys , six , varint }: @@ -12,36 +11,39 @@ buildPythonPackage rec { pname = "py-multicodec"; version = "0.2.1"; - disabled = pythonOlder "3.5"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "multiformats"; repo = pname; - rev = "v${version}"; + rev = "refs/tags/v${version}"; hash = "sha256-2aK+bfhqCMqSO+mtrHIfNQmQpQHpwd7yHseI/3O7Sp4="; }; # Error when not substituting: # Failed: [pytest] section in setup.cfg files is no longer supported, change to [tool:pytest] instead. postPatch = '' - substituteInPlace setup.cfg --replace "[pytest]" "[tool:pytest]" + substituteInPlace setup.cfg \ + --replace "[pytest]" "[tool:pytest]" + substituteInPlace setup.py \ + --replace "'pytest-runner'," "" ''; - nativeBuildInputs = [ - pytest-runner - ]; - propagatedBuildInputs = [ - varint - six morphys + six + varint ]; nativeCheckInputs = [ pytestCheckHook ]; - pythonImportsCheck = [ "multicodec" ]; + pythonImportsCheck = [ + "multicodec" + ]; meta = with lib; { description = "Compact self-describing codecs";