git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #139010 from fabaff/bump-marshmallow

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

commitca6fa9b19a9f894b3671d24d98f07e47ccdea2ad authorFabian Affolter <fabian@affolter-engineering.ch> dateFri 24 Sep 2021, 12:14 (5 years ago) parentb20c184f89bdb5
2 files changed+28−17
pkgs/development/python-modules/marshmallow-polyfield/default.nix+20−9 pkgs/development/python-modules/marshmallow/default.nix+8−8
pkgs/development/python-modules/marshmallow-polyfield/default.nix+20−9
@@ -1,32 +1,43 @@
1−{ buildPythonPackage
1+{ lib
2+, buildPythonPackage
23, fetchFromGitHub
3−, lib
44, marshmallow
5− # Check Inputs
5+, pythonOlder
66, pytestCheckHook
7−, pytest-cov
87}:
98
109buildPythonPackage rec {
1110 pname = "marshmallow-polyfield";
12− version = "5.9";
11+ version = "5.10";
12+
13+ disabled = pythonOlder "3.6";
1314
1415 src = fetchFromGitHub {
1516 owner = "Bachmann1234";
1617 repo = pname;
1718 rev = "v${version}";
18− sha256 = "15yx8ib5yx1xx6kq8wnfdmv9zm43k7y33c6zpq5rba6a30v4lcnd";
19+ sha256 = "sha256-oF5LBuDK4kqsAcKwidju+wFjigjy4CNbJ6bfWpGO1yQ=";
1920 };
2021
2122 propagatedBuildInputs = [
2223 marshmallow
2324 ];
2425
25− # setuptools check can run, but won't find tests
26− checkInputs = [ pytestCheckHook pytest-cov ];
26+ checkInputs = [
27+ pytestCheckHook
28+ ];
29+
30+ postPatch = ''
31+ substituteInPlace setup.cfg \
32+ --replace "--cov=marshmallow_polyfield" ""
33+ '';
34+
35+ pythonImportsCheck = [
36+ "marshmallow"
37+ ];
2738
2839 meta = with lib; {
29− description = "An unofficial extension to Marshmallow to allow for polymorphic fields";
40+ description = "Extension to Marshmallow to allow for polymorphic fields";
3041 homepage = "https://github.com/Bachmann1234/marshmallow-polyfield";
3142 license = licenses.asl20;
3243 maintainers = with maintainers; [ drewrisinger ];
pkgs/development/python-modules/marshmallow/default.nix+8−8
@@ -9,26 +9,27 @@
99
1010buildPythonPackage rec {
1111 pname = "marshmallow";
12− version = "3.11.1";
13− disabled = pythonOlder "3.5";
12+ version = "3.13.0";
13+
14+ disabled = pythonOlder "3.6";
1415
1516 src = fetchFromGitHub {
1617 owner = "marshmallow-code";
1718 repo = pname;
1819 rev = version;
19− sha256 = "1ypm142y3giaqydc7fkigm9r057yp2sd1ng5zr2x3w3wbbj5yfm6";
20+ sha256 = "sha256-tP/RKo2Hzxz2bT7ybRs9wGzq7TpsmzmOPi3BGuSLDA0=";
2021 };
2122
22− pythonImportsCheck = [
23− "marshmallow"
24− ];
25−
2623 checkInputs = [
2724 pytestCheckHook
2825 pytz
2926 simplejson
3027 ];
3128
29+ pythonImportsCheck = [
30+ "marshmallow"
31+ ];
32+
3233 meta = with lib; {
3334 description = ''
3435 A lightweight library for converting complex objects to and from
@@ -38,5 +39,4 @@ buildPythonPackage rec {
3839 license = licenses.mit;
3940 maintainers = with maintainers; [ cript0nauta ];
4041 };
41−
4242}