pyrox.dev / nixpkgs
lol
fork atom

Merge pull request #139010 from fabaff/bump-marshmallow

python3Packages.marshmallow-polyfield: 5.9 -> 5.10, python3Packages.marshmallow: 3.11.1 -> 3.13.0

authored by

Fabian Affolter and committed by
GitHub ca6fa9b1 b20c1840

+28 -17
unified split
+20 -9
pkgs/development/python-modules/marshmallow-polyfield/default.nix
··· 1 - { buildPythonPackage 2 , fetchFromGitHub 3 - , lib 4 , marshmallow 5 - # Check Inputs 6 , pytestCheckHook 7 - , pytest-cov 8 }: 9 10 buildPythonPackage rec { 11 pname = "marshmallow-polyfield"; 12 - version = "5.9"; 13 14 src = fetchFromGitHub { 15 owner = "Bachmann1234"; 16 repo = pname; 17 rev = "v${version}"; 18 - sha256 = "15yx8ib5yx1xx6kq8wnfdmv9zm43k7y33c6zpq5rba6a30v4lcnd"; 19 }; 20 21 propagatedBuildInputs = [ 22 marshmallow 23 ]; 24 25 - # setuptools check can run, but won't find tests 26 - checkInputs = [ pytestCheckHook pytest-cov ]; 27 28 meta = with lib; { 29 - description = "An unofficial extension to Marshmallow to allow for polymorphic fields"; 30 homepage = "https://github.com/Bachmann1234/marshmallow-polyfield"; 31 license = licenses.asl20; 32 maintainers = with maintainers; [ drewrisinger ];
··· 1 + { lib 2 + , buildPythonPackage 3 , fetchFromGitHub 4 , marshmallow 5 + , pythonOlder 6 , pytestCheckHook 7 }: 8 9 buildPythonPackage rec { 10 pname = "marshmallow-polyfield"; 11 + version = "5.10"; 12 + 13 + disabled = pythonOlder "3.6"; 14 15 src = fetchFromGitHub { 16 owner = "Bachmann1234"; 17 repo = pname; 18 rev = "v${version}"; 19 + sha256 = "sha256-oF5LBuDK4kqsAcKwidju+wFjigjy4CNbJ6bfWpGO1yQ="; 20 }; 21 22 propagatedBuildInputs = [ 23 marshmallow 24 ]; 25 26 + checkInputs = [ 27 + pytestCheckHook 28 + ]; 29 + 30 + postPatch = '' 31 + substituteInPlace setup.cfg \ 32 + --replace "--cov=marshmallow_polyfield" "" 33 + ''; 34 + 35 + pythonImportsCheck = [ 36 + "marshmallow" 37 + ]; 38 39 meta = with lib; { 40 + description = "Extension to Marshmallow to allow for polymorphic fields"; 41 homepage = "https://github.com/Bachmann1234/marshmallow-polyfield"; 42 license = licenses.asl20; 43 maintainers = with maintainers; [ drewrisinger ];
+8 -8
pkgs/development/python-modules/marshmallow/default.nix
··· 9 10 buildPythonPackage rec { 11 pname = "marshmallow"; 12 - version = "3.11.1"; 13 - disabled = pythonOlder "3.5"; 14 15 src = fetchFromGitHub { 16 owner = "marshmallow-code"; 17 repo = pname; 18 rev = version; 19 - sha256 = "1ypm142y3giaqydc7fkigm9r057yp2sd1ng5zr2x3w3wbbj5yfm6"; 20 }; 21 22 - pythonImportsCheck = [ 23 - "marshmallow" 24 - ]; 25 - 26 checkInputs = [ 27 pytestCheckHook 28 pytz 29 simplejson 30 ]; 31 32 meta = with lib; { ··· 38 license = licenses.mit; 39 maintainers = with maintainers; [ cript0nauta ]; 40 }; 41 - 42 }
··· 9 10 buildPythonPackage rec { 11 pname = "marshmallow"; 12 + version = "3.13.0"; 13 + 14 + disabled = pythonOlder "3.6"; 15 16 src = fetchFromGitHub { 17 owner = "marshmallow-code"; 18 repo = pname; 19 rev = version; 20 + sha256 = "sha256-tP/RKo2Hzxz2bT7ybRs9wGzq7TpsmzmOPi3BGuSLDA0="; 21 }; 22 23 checkInputs = [ 24 pytestCheckHook 25 pytz 26 simplejson 27 + ]; 28 + 29 + pythonImportsCheck = [ 30 + "marshmallow" 31 ]; 32 33 meta = with lib; { ··· 39 license = licenses.mit; 40 maintainers = with maintainers; [ cript0nauta ]; 41 }; 42 }