mirror of
https://github.com/SebastianWendel/nixpkgs.git
synced 2024-09-29 08:30:21 +02:00
Merge pull request #173429 from fabaff/marshmallow-bump
python310Packages.marshmallow: 3.13.0 -> 3.15.0
This commit is contained in:
commit
cb97c3ad8f
|
@ -8,19 +8,20 @@
|
|||
, numpy
|
||||
, pytestCheckHook
|
||||
, pyyaml
|
||||
, pythonOlder
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "deepdiff";
|
||||
version = "5.7.0";
|
||||
version = "5.8.2";
|
||||
format = "setuptools";
|
||||
|
||||
# pypi source does not contain all fixtures required for tests
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "seperman";
|
||||
repo = "deepdiff";
|
||||
# 5.7.0 release not tagged https://github.com/seperman/deepdiff/issues/300
|
||||
rev = "f2ffdb83b2993f4f0bb7e854620f0acd0bf6339e";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-0UBx7sH2iMrLVl5FtHNTwoecLHi8GbInn75G3FSg4gk=";
|
||||
};
|
||||
|
||||
|
@ -48,10 +49,15 @@ buildPythonPackage rec {
|
|||
pyyaml
|
||||
];
|
||||
|
||||
disabledTests = [
|
||||
# Assertion issue with the decimal places
|
||||
"test_get_numeric_types_distance"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Deep Difference and Search of any Python object/data";
|
||||
homepage = "https://github.com/seperman/deepdiff";
|
||||
license = licenses.mit;
|
||||
maintainers = [ maintainers.mic92 ];
|
||||
maintainers = with maintainers; [ mic92 ];
|
||||
};
|
||||
}
|
||||
|
|
|
@ -1,22 +1,43 @@
|
|||
{ lib, buildPythonPackage, fetchPypi, marshmallow, setuptools }:
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, marshmallow
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
, setuptools
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "marshmallow-oneofschema";
|
||||
version = "3.0.1";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "62cd2099b29188c92493c2940ee79d1bf2f2619a71721664e5a98ec2faa58237";
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "marshmallow-code";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-x0v8WkfjGkP2668QIQiewQViYFDIS2zBWMULcDThWas=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ marshmallow setuptools ];
|
||||
propagatedBuildInputs = [
|
||||
marshmallow
|
||||
setuptools
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "marshmallow_oneofschema" ];
|
||||
checkInputs = [
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"marshmallow_oneofschema"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/marshmallow-code/marshmallow-oneofschema";
|
||||
description = "Marshmallow library extension that allows schema (de)multiplexing";
|
||||
homepage = "https://github.com/marshmallow-code/marshmallow-oneofschema";
|
||||
license = licenses.mit;
|
||||
maintainers = [ maintainers.ivan-tkatchev ];
|
||||
maintainers = with maintainers; [ ivan-tkatchev ];
|
||||
};
|
||||
}
|
||||
|
|
|
@ -1,15 +1,17 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, pythonOlder
|
||||
, fetchFromGitHub
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
, pytz
|
||||
, simplejson
|
||||
, packaging
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "marshmallow";
|
||||
version = "3.13.0";
|
||||
version = "3.15.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
|
@ -17,9 +19,13 @@ buildPythonPackage rec {
|
|||
owner = "marshmallow-code";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-tP/RKo2Hzxz2bT7ybRs9wGzq7TpsmzmOPi3BGuSLDA0=";
|
||||
hash = "sha256-ZqMrMNfP/RKW2jQDNPgfhyeqmSc40pZbnrcXHbw2emc=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
packaging
|
||||
];
|
||||
|
||||
checkInputs = [
|
||||
pytestCheckHook
|
||||
pytz
|
||||
|
@ -31,10 +37,7 @@ buildPythonPackage rec {
|
|||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = ''
|
||||
A lightweight library for converting complex objects to and from
|
||||
simple Python datatypes.
|
||||
'';
|
||||
description = "Library for converting complex objects to and from simple Python datatypes";
|
||||
homepage = "https://github.com/marshmallow-code/marshmallow";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ cript0nauta ];
|
||||
|
|
Loading…
Reference in a new issue