From f3d2fb42b8eb91de6c9c87fccbf75e233566ce71 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 11 Feb 2021 11:06:31 +0000
Subject: [PATCH 1/2] python37Packages.marshmallow-sqlalchemy: 0.24.1 -> 0.24.2
---
.../python-modules/marshmallow-sqlalchemy/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/marshmallow-sqlalchemy/default.nix b/pkgs/development/python-modules/marshmallow-sqlalchemy/default.nix
index 4bf670082b6..e25e1992f56 100644
--- a/pkgs/development/python-modules/marshmallow-sqlalchemy/default.nix
+++ b/pkgs/development/python-modules/marshmallow-sqlalchemy/default.nix
@@ -4,7 +4,7 @@
buildPythonPackage rec {
pname = "marshmallow-sqlalchemy";
- version = "0.24.1";
+ version = "0.24.2";
meta = {
homepage = "https://github.com/marshmallow-code/marshmallow-sqlalchemy";
@@ -14,7 +14,7 @@ buildPythonPackage rec {
src = fetchPypi {
inherit pname version;
- sha256 = "d051cf013c075c43e1ee5c4b01f8fab6dd6b140dab6825be45875f674a0d289c";
+ sha256 = "ee3ead3b83de6608c6850ff60515691b0dc556ca226680f8a82b9f785cdb71b1";
};
propagatedBuildInputs = [ marshmallow sqlalchemy ];
From 0f4fecced88d78fb6558e67f854d00ff08652417 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 12 Feb 2021 00:55:45 +0100
Subject: [PATCH 2/2] python3Packages.marshmallow-sqlalchemy: enable tests
---
.../marshmallow-sqlalchemy/default.nix | 32 +++++++++++++------
1 file changed, 22 insertions(+), 10 deletions(-)
diff --git a/pkgs/development/python-modules/marshmallow-sqlalchemy/default.nix b/pkgs/development/python-modules/marshmallow-sqlalchemy/default.nix
index e25e1992f56..ba10c89e140 100644
--- a/pkgs/development/python-modules/marshmallow-sqlalchemy/default.nix
+++ b/pkgs/development/python-modules/marshmallow-sqlalchemy/default.nix
@@ -1,23 +1,35 @@
-{ lib, buildPythonPackage, fetchPypi,
- marshmallow, sqlalchemy
+{ lib
+, buildPythonPackage
+, fetchPypi
+, marshmallow
+, sqlalchemy
+, pytest-lazy-fixture
+, pytestCheckHook
}:
buildPythonPackage rec {
pname = "marshmallow-sqlalchemy";
version = "0.24.2";
- meta = {
- homepage = "https://github.com/marshmallow-code/marshmallow-sqlalchemy";
- description = "SQLAlchemy integration with marshmallow ";
- license = lib.licenses.mit;
- };
-
src = fetchPypi {
inherit pname version;
sha256 = "ee3ead3b83de6608c6850ff60515691b0dc556ca226680f8a82b9f785cdb71b1";
};
- propagatedBuildInputs = [ marshmallow sqlalchemy ];
+ propagatedBuildInputs = [
+ marshmallow
+ sqlalchemy
+ ];
+
+ checkInputs = [
+ pytest-lazy-fixture
+ pytestCheckHook
+ ];
+
+ meta = with lib; {
+ homepage = "https://github.com/marshmallow-code/marshmallow-sqlalchemy";
+ description = "SQLAlchemy integration with marshmallow ";
+ license = licenses.mit;
+ };
- doCheck = false;
}