From 0689ff072f37a17fee31ec82dc945c178579902f Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 21 Feb 2023 10:51:33 +0100 Subject: [PATCH 1/9] python310Packages.flask-mongoengine: add changelog to meta --- pkgs/development/python-modules/flask-mongoengine/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/python-modules/flask-mongoengine/default.nix b/pkgs/development/python-modules/flask-mongoengine/default.nix index e411d1f55a78..b5ecde37d013 100644 --- a/pkgs/development/python-modules/flask-mongoengine/default.nix +++ b/pkgs/development/python-modules/flask-mongoengine/default.nix @@ -43,6 +43,7 @@ buildPythonPackage rec { meta = with lib; { description = "Flask-MongoEngine is a Flask extension that provides integration with MongoEngine and WTF model forms"; homepage = "https://github.com/mongoengine/flask-mongoengine"; + changelog = "https://github.com/MongoEngine/flask-mongoengine/releases/tag/v${version}"; license = licenses.bsd3; maintainers = [ maintainers.costrouc ]; }; From 17436a24612c38572449680c844c2e5a0cfe7a93 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 21 Feb 2023 10:52:36 +0100 Subject: [PATCH 2/9] python310Packages.flask-mongoengine: update description --- pkgs/development/python-modules/flask-mongoengine/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/flask-mongoengine/default.nix b/pkgs/development/python-modules/flask-mongoengine/default.nix index b5ecde37d013..dd9705c666cd 100644 --- a/pkgs/development/python-modules/flask-mongoengine/default.nix +++ b/pkgs/development/python-modules/flask-mongoengine/default.nix @@ -41,10 +41,10 @@ buildPythonPackage rec { doCheck = false; meta = with lib; { - description = "Flask-MongoEngine is a Flask extension that provides integration with MongoEngine and WTF model forms"; + description = "Flask extension that provides integration with MongoEngine and WTF model forms"; homepage = "https://github.com/mongoengine/flask-mongoengine"; changelog = "https://github.com/MongoEngine/flask-mongoengine/releases/tag/v${version}"; license = licenses.bsd3; - maintainers = [ maintainers.costrouc ]; + maintainers = with maintainers; [ costrouc ]; }; } From cbe4ff80030e6ebd96f2e3aaff15006c20f346b5 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 21 Feb 2023 10:54:03 +0100 Subject: [PATCH 3/9] python310Packages.flask-mongoengine: remove buildInputs buildInputs covered the inputs which should have been part of checkInputs. Tests are not executed, thus removed. --- .../python-modules/flask-mongoengine/default.nix | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/pkgs/development/python-modules/flask-mongoengine/default.nix b/pkgs/development/python-modules/flask-mongoengine/default.nix index dd9705c666cd..6a9598166c1c 100644 --- a/pkgs/development/python-modules/flask-mongoengine/default.nix +++ b/pkgs/development/python-modules/flask-mongoengine/default.nix @@ -5,9 +5,6 @@ , flask-wtf , mongoengine , six -, nose -, rednose -, coverage , email-validator }: @@ -30,16 +27,13 @@ buildPythonPackage rec { six ]; - # they set test requirements to setup_requirements... - buildInputs = [ - nose - rednose - coverage - ]; - - # tests require working mongodb connection + # Tests require working mongodb connection doCheck = false; + pythonImportsCheck = [ + "flask_mongoengine" + ]; + meta = with lib; { description = "Flask extension that provides integration with MongoEngine and WTF model forms"; homepage = "https://github.com/mongoengine/flask-mongoengine"; From ad9e4df440aa9bc388131593af142becadd53a76 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 21 Feb 2023 10:56:09 +0100 Subject: [PATCH 4/9] python310Packages.flask-mongoengine: disable on unsupported Python releases --- pkgs/development/python-modules/flask-mongoengine/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/python-modules/flask-mongoengine/default.nix b/pkgs/development/python-modules/flask-mongoengine/default.nix index 6a9598166c1c..efc6f64cea07 100644 --- a/pkgs/development/python-modules/flask-mongoengine/default.nix +++ b/pkgs/development/python-modules/flask-mongoengine/default.nix @@ -6,11 +6,15 @@ , mongoengine , six , email-validator +, pythonOlder }: buildPythonPackage rec { pname = "flask-mongoengine"; version = "1.0.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "MongoEngine"; From df8b681f4fd22832f307d42d5957694e1c63bad6 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 21 Feb 2023 11:00:46 +0100 Subject: [PATCH 5/9] python310Packages.flask-mongoengine: adjust inputs --- .../python-modules/flask-mongoengine/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/flask-mongoengine/default.nix b/pkgs/development/python-modules/flask-mongoengine/default.nix index efc6f64cea07..631aaa7c621e 100644 --- a/pkgs/development/python-modules/flask-mongoengine/default.nix +++ b/pkgs/development/python-modules/flask-mongoengine/default.nix @@ -4,9 +4,9 @@ , flask , flask-wtf , mongoengine -, six , email-validator , pythonOlder +, typing-extensions }: buildPythonPackage rec { @@ -19,8 +19,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "MongoEngine"; repo = pname; - rev = "v${version}"; - sha256 = "10g9b13ls2msnhv8j44gslrfxa2ppqz2y1xjn2a4gg4m9mdjv8b2"; + rev = "refs/tags/v${version}"; + hash = "sha256-YqEtW02VvEeUsLIHLz6+V6juMtWPEIk2tLoKTUdY6YE="; }; propagatedBuildInputs = [ @@ -28,7 +28,8 @@ buildPythonPackage rec { flask flask-wtf mongoengine - six + ] ++ lib.optionals (pythonOlder "3.8") [ + typing-extensions ]; # Tests require working mongodb connection From 06afd90a88aabc4fc67676d36616c5f862fb897d Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 21 Feb 2023 11:07:07 +0100 Subject: [PATCH 6/9] python310Packages.wtforms: disable on unsupported Python releases --- pkgs/development/python-modules/wtforms/default.nix | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/wtforms/default.nix b/pkgs/development/python-modules/wtforms/default.nix index 037bbb394e2e..719f45cca956 100644 --- a/pkgs/development/python-modules/wtforms/default.nix +++ b/pkgs/development/python-modules/wtforms/default.nix @@ -5,16 +5,20 @@ , babel , pytestCheckHook , email-validator +, pythonOlder }: buildPythonPackage rec { - version = "3.0.1"; pname = "wtforms"; + version = "3.0.1"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { pname = "WTForms"; inherit version; - sha256 = "1g654ghavds387hqxmhg9s8x222x89wbq1ggzxbsyn6x2axindbb"; + hash = "sha256-azUbuxLdWK9X/+8FvHhCXQjRkU4P1o7hQUO3reAjxbw="; }; propagatedBuildInputs = [ markupsafe babel ]; @@ -32,7 +36,7 @@ buildPythonPackage rec { homepage = "https://github.com/wtforms/wtforms"; changelog = "https://github.com/wtforms/wtforms/blob/${version}/CHANGES.rst"; license = licenses.bsd3; - maintainers = [ maintainers.bhipple ]; + maintainers = with maintainers; [ bhipple ]; }; } From 8a5a0711a5c8769277147766d78c052b1fd30823 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 21 Feb 2023 11:10:53 +0100 Subject: [PATCH 7/9] python310Packages.wtforms: add optional-dependencies --- .../python-modules/wtforms/default.nix | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/wtforms/default.nix b/pkgs/development/python-modules/wtforms/default.nix index 719f45cca956..deffda6ef5fe 100644 --- a/pkgs/development/python-modules/wtforms/default.nix +++ b/pkgs/development/python-modules/wtforms/default.nix @@ -21,15 +21,24 @@ buildPythonPackage rec { hash = "sha256-azUbuxLdWK9X/+8FvHhCXQjRkU4P1o7hQUO3reAjxbw="; }; - propagatedBuildInputs = [ markupsafe babel ]; + propagatedBuildInputs = [ + markupsafe + babel + ]; + passthru.optional-dependencies = { + email = [ + email-validator + ]; + }; nativeCheckInputs = [ pytestCheckHook - email-validator - ]; + ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); - pythonImportsCheck = [ "wtforms" ]; + pythonImportsCheck = [ + "wtforms" + ]; meta = with lib; { description = "A flexible forms validation and rendering library for Python"; From f0b8704f29830ec118520fe35c6c9e8e88bdfb48 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 21 Feb 2023 11:16:35 +0100 Subject: [PATCH 8/9] python310Packages.flask-mongoengine: add optional-dependencies --- .../flask-mongoengine/default.nix | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/flask-mongoengine/default.nix b/pkgs/development/python-modules/flask-mongoengine/default.nix index 631aaa7c621e..21003b9f9296 100644 --- a/pkgs/development/python-modules/flask-mongoengine/default.nix +++ b/pkgs/development/python-modules/flask-mongoengine/default.nix @@ -1,12 +1,14 @@ { lib , buildPythonPackage +, email-validator , fetchFromGitHub , flask , flask-wtf +, markupsafe , mongoengine -, email-validator , pythonOlder , typing-extensions +, wtforms }: buildPythonPackage rec { @@ -32,6 +34,19 @@ buildPythonPackage rec { typing-extensions ]; + passthru.optional-dependencies = { + wtf = [ + flask-wtf + wtforms + ] ++ wtforms.optional-dependencies.email; + # toolbar = [ + # flask-debugtoolbar + # ]; + legacy = [ + markupsafe + ]; + }; + # Tests require working mongodb connection doCheck = false; From a5affaae7e4cfdb88e173450e0e45c3239df886e Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 21 Feb 2023 11:18:44 +0100 Subject: [PATCH 9/9] python310Packages.flask-mongoengine: move to pyproject --- .../python-modules/flask-mongoengine/default.nix | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/flask-mongoengine/default.nix b/pkgs/development/python-modules/flask-mongoengine/default.nix index 21003b9f9296..9adecc5968d4 100644 --- a/pkgs/development/python-modules/flask-mongoengine/default.nix +++ b/pkgs/development/python-modules/flask-mongoengine/default.nix @@ -7,6 +7,8 @@ , markupsafe , mongoengine , pythonOlder +, setuptools +, setuptools-scm , typing-extensions , wtforms }: @@ -14,7 +16,7 @@ buildPythonPackage rec { pname = "flask-mongoengine"; version = "1.0.0"; - format = "setuptools"; + format = "pyproject"; disabled = pythonOlder "3.7"; @@ -25,6 +27,11 @@ buildPythonPackage rec { hash = "sha256-YqEtW02VvEeUsLIHLz6+V6juMtWPEIk2tLoKTUdY6YE="; }; + nativeBuildInputs = [ + setuptools + setuptools-scm + ]; + propagatedBuildInputs = [ email-validator flask