From a98087d710aa7b874ac0686f7ae02fdb8790169f Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 22 Sep 2021 23:04:33 +0200 Subject: [PATCH 1/2] python3Packages.marshmallow-polyfield: 5.9 -> 5.10 --- .../marshmallow-polyfield/default.nix | 29 +++++++++++++------ 1 file changed, 20 insertions(+), 9 deletions(-) diff --git a/pkgs/development/python-modules/marshmallow-polyfield/default.nix b/pkgs/development/python-modules/marshmallow-polyfield/default.nix index aa2784cd1db..6b5394ac277 100644 --- a/pkgs/development/python-modules/marshmallow-polyfield/default.nix +++ b/pkgs/development/python-modules/marshmallow-polyfield/default.nix @@ -1,32 +1,43 @@ -{ buildPythonPackage +{ lib +, buildPythonPackage , fetchFromGitHub -, lib , marshmallow - # Check Inputs +, pythonOlder , pytestCheckHook -, pytest-cov }: buildPythonPackage rec { pname = "marshmallow-polyfield"; - version = "5.9"; + version = "5.10"; + + disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "Bachmann1234"; repo = pname; rev = "v${version}"; - sha256 = "15yx8ib5yx1xx6kq8wnfdmv9zm43k7y33c6zpq5rba6a30v4lcnd"; + sha256 = "sha256-oF5LBuDK4kqsAcKwidju+wFjigjy4CNbJ6bfWpGO1yQ="; }; propagatedBuildInputs = [ marshmallow ]; - # setuptools check can run, but won't find tests - checkInputs = [ pytestCheckHook pytest-cov ]; + checkInputs = [ + pytestCheckHook + ]; + + postPatch = '' + substituteInPlace setup.cfg \ + --replace "--cov=marshmallow_polyfield" "" + ''; + + pythonImportsCheck = [ + "marshmallow" + ]; meta = with lib; { - description = "An unofficial extension to Marshmallow to allow for polymorphic fields"; + description = "Extension to Marshmallow to allow for polymorphic fields"; homepage = "https://github.com/Bachmann1234/marshmallow-polyfield"; license = licenses.asl20; maintainers = with maintainers; [ drewrisinger ]; From f89bdb5bc362e33c28b6bb42a06637ad7a5cb31a Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 22 Sep 2021 23:07:19 +0200 Subject: [PATCH 2/2] python3Packages.marshmallow: 3.11.1 -> 3.13.0 --- .../python-modules/marshmallow/default.nix | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/marshmallow/default.nix b/pkgs/development/python-modules/marshmallow/default.nix index 3de64fea37f..a4f60d8202a 100644 --- a/pkgs/development/python-modules/marshmallow/default.nix +++ b/pkgs/development/python-modules/marshmallow/default.nix @@ -9,26 +9,27 @@ buildPythonPackage rec { pname = "marshmallow"; - version = "3.11.1"; - disabled = pythonOlder "3.5"; + version = "3.13.0"; + + disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "marshmallow-code"; repo = pname; rev = version; - sha256 = "1ypm142y3giaqydc7fkigm9r057yp2sd1ng5zr2x3w3wbbj5yfm6"; + sha256 = "sha256-tP/RKo2Hzxz2bT7ybRs9wGzq7TpsmzmOPi3BGuSLDA0="; }; - pythonImportsCheck = [ - "marshmallow" - ]; - checkInputs = [ pytestCheckHook pytz simplejson ]; + pythonImportsCheck = [ + "marshmallow" + ]; + meta = with lib; { description = '' A lightweight library for converting complex objects to and from @@ -38,5 +39,4 @@ buildPythonPackage rec { license = licenses.mit; maintainers = with maintainers; [ cript0nauta ]; }; - }