From 520ca935405c108b02cad79be66f7f842effbdca Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 17 May 2022 20:47:29 +0200 Subject: [PATCH 1/4] python310Packages.marshmallow: 3.13.0 -> 3.15.0 --- .../python-modules/marshmallow/default.nix | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/marshmallow/default.nix b/pkgs/development/python-modules/marshmallow/default.nix index a4f60d8202a..c08916e4368 100644 --- a/pkgs/development/python-modules/marshmallow/default.nix +++ b/pkgs/development/python-modules/marshmallow/default.nix @@ -1,15 +1,16 @@ { lib , buildPythonPackage -, pythonOlder , fetchFromGitHub , pytestCheckHook +, pythonOlder , pytz , simplejson }: buildPythonPackage rec { pname = "marshmallow"; - version = "3.13.0"; + version = "3.15.0"; + format = "setuptools"; disabled = pythonOlder "3.6"; @@ -17,7 +18,7 @@ buildPythonPackage rec { owner = "marshmallow-code"; repo = pname; rev = version; - sha256 = "sha256-tP/RKo2Hzxz2bT7ybRs9wGzq7TpsmzmOPi3BGuSLDA0="; + hash = "sha256-ZqMrMNfP/RKW2jQDNPgfhyeqmSc40pZbnrcXHbw2emc="; }; checkInputs = [ @@ -31,10 +32,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 ]; From 6a6cfdc9f8e53b03fc9e7cdccbe537ffbb536fcc Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 18 May 2022 08:28:56 +0200 Subject: [PATCH 2/4] python310Packages.marshmallow: add missing input --- pkgs/development/python-modules/marshmallow/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/python-modules/marshmallow/default.nix b/pkgs/development/python-modules/marshmallow/default.nix index c08916e4368..50e7e71cc9e 100644 --- a/pkgs/development/python-modules/marshmallow/default.nix +++ b/pkgs/development/python-modules/marshmallow/default.nix @@ -5,6 +5,7 @@ , pythonOlder , pytz , simplejson +, packaging }: buildPythonPackage rec { @@ -21,6 +22,10 @@ buildPythonPackage rec { hash = "sha256-ZqMrMNfP/RKW2jQDNPgfhyeqmSc40pZbnrcXHbw2emc="; }; + propagatedBuildInputs = [ + packaging + ]; + checkInputs = [ pytestCheckHook pytz From 1bd9ff368f1b59f405a7cd950fd43bc336e29016 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 18 May 2022 08:34:55 +0200 Subject: [PATCH 3/4] python310Packages.marshmallow-oneofschema: enable tests --- .../marshmallow-oneofschema/default.nix | 37 +++++++++++++++---- 1 file changed, 29 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/marshmallow-oneofschema/default.nix b/pkgs/development/python-modules/marshmallow-oneofschema/default.nix index a4b15ce9a54..8fc946305bc 100644 --- a/pkgs/development/python-modules/marshmallow-oneofschema/default.nix +++ b/pkgs/development/python-modules/marshmallow-oneofschema/default.nix @@ -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 + ]; + + checkInputs = [ + pytestCheckHook + ]; - pythonImportsCheck = [ "marshmallow_oneofschema" ]; + 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 ]; }; } From 53466092bf227d5de3e4b581c58fea4d63c44525 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 18 May 2022 12:57:17 +0200 Subject: [PATCH 4/4] python310Packages.deepdiff: 5.7.0 -> 5.8.2 --- .../python-modules/deepdiff/default.nix | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/deepdiff/default.nix b/pkgs/development/python-modules/deepdiff/default.nix index 2601eedc2fa..cba0ac56396 100644 --- a/pkgs/development/python-modules/deepdiff/default.nix +++ b/pkgs/development/python-modules/deepdiff/default.nix @@ -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 ]; }; }