From a5fa51015c7e10500fc4c5d01280e8a5f5e57b4e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Mon, 26 Aug 2024 15:09:30 -0700 Subject: [PATCH 1/3] python312Packages.flask-security: rename from flask-security-too see https://github.com/pallets-eco/flask-security/blob/main/README.rst#notes-on-this-repo --- .../{flask-security-too => flask-security}/default.nix | 8 ++++---- pkgs/tools/admin/pgadmin/default.nix | 2 +- pkgs/top-level/python-aliases.nix | 1 + pkgs/top-level/python-packages.nix | 2 +- 4 files changed, 7 insertions(+), 6 deletions(-) rename pkgs/development/python-modules/{flask-security-too => flask-security}/default.nix (88%) diff --git a/pkgs/development/python-modules/flask-security-too/default.nix b/pkgs/development/python-modules/flask-security/default.nix similarity index 88% rename from pkgs/development/python-modules/flask-security-too/default.nix rename to pkgs/development/python-modules/flask-security/default.nix index 98eb55379493..dbb611a9c683 100644 --- a/pkgs/development/python-modules/flask-security-too/default.nix +++ b/pkgs/development/python-modules/flask-security/default.nix @@ -47,7 +47,7 @@ }: buildPythonPackage rec { - pname = "flask-security-too"; + pname = "flask-security"; version = "5.5.0"; pyproject = true; @@ -123,9 +123,9 @@ buildPythonPackage rec { pythonImportsCheck = [ "flask_security" ]; meta = with lib; { - changelog = "https://github.com/Flask-Middleware/flask-security/blob/${version}/CHANGES.rst"; - homepage = "https://github.com/Flask-Middleware/flask-security"; - description = "Simple security for Flask apps (fork)"; + changelog = "https://github.com/pallets-eco/flask-security/blob/${version}/CHANGES.rst"; + homepage = "https://github.com/pallets-eco/flask-security"; + description = "Quickly add security features to your Flask application"; license = licenses.mit; maintainers = with maintainers; [ gador ]; }; diff --git a/pkgs/tools/admin/pgadmin/default.nix b/pkgs/tools/admin/pgadmin/default.nix index 6e45cafdc340..4325040dd683 100644 --- a/pkgs/tools/admin/pgadmin/default.nix +++ b/pkgs/tools/admin/pgadmin/default.nix @@ -173,7 +173,7 @@ pythonPackages.buildPythonApplication rec { python-dateutil sqlalchemy itsdangerous - flask-security-too + flask-security bcrypt cryptography sshtunnel diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index da0bc901b89a..d210b6970090 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -195,6 +195,7 @@ mapAliases ({ flask_principal = flask-principal; # added 2023-08-23 flask-restplus = throw "flask-restplus is no longer maintained, use flask-restx instead"; # added 2023-02-21 flask_script = flask-script; # added 2023-08-23 + flask-security-too = flask-security; # added 2024-08-26 flask_sqlalchemy = flask-sqlalchemy; # added 2022-07-20 flask_testing = flask-testing; # added 2022-04-25 flask_wtf = flask-wtf; # added 2022-05-24 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 7fca1b3036eb..3155021c1c0f 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4512,7 +4512,7 @@ self: super: with self; { flask-session-captcha = callPackage ../development/python-modules/flask-session-captcha { }; - flask-security-too = callPackage ../development/python-modules/flask-security-too { }; + flask-security = callPackage ../development/python-modules/flask-security { }; flask-silk = callPackage ../development/python-modules/flask-silk { }; From b2f84b2b9dbb4aee2b8bdc19eecb23e1008d4444 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Mon, 26 Aug 2024 15:29:18 -0700 Subject: [PATCH 2/3] python312Packages.flask-sqlalchemy-lite: init at 0.1.0 --- .../flask-sqlalchemy-lite/default.nix | 45 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 47 insertions(+) create mode 100644 pkgs/development/python-modules/flask-sqlalchemy-lite/default.nix diff --git a/pkgs/development/python-modules/flask-sqlalchemy-lite/default.nix b/pkgs/development/python-modules/flask-sqlalchemy-lite/default.nix new file mode 100644 index 000000000000..a6afc09f4edf --- /dev/null +++ b/pkgs/development/python-modules/flask-sqlalchemy-lite/default.nix @@ -0,0 +1,45 @@ +{ + aiosqlite, + buildPythonPackage, + fetchFromGitHub, + flask, + flit-core, + lib, + pytestCheckHook, + sqlalchemy, +}: + +buildPythonPackage rec { + pname = "flask-sqlalchemy-lite"; + version = "0.1.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "pallets-eco"; + repo = "flask-sqlalchemy-lite"; + rev = "refs/tags/${version}"; + hash = "sha256-LpdPp5Gp74DSJqD1DJqwNeaMKdN5pEAUkxnKGYZcVis="; + }; + + build-system = [ flit-core ]; + + dependencies = [ + flask + sqlalchemy + ] ++ flask.optional-dependencies.async ++ sqlalchemy.optional-dependencies.asyncio; + + pythonImportsCheck = [ "flask_sqlalchemy_lite" ]; + + nativeCheckInputs = [ + aiosqlite + pytestCheckHook + ]; + + meta = { + changelog = "https://github.com/pallets-eco/flask-sqlalchemy-lite/blob/${src.rev}/CHANGES.md"; + description = "Integrate SQLAlchemy with Flask"; + homepage = "https://github.com/pallets-eco/flask-sqlalchemy-lite"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ dotlambda ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 3155021c1c0f..28531c091cce 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4524,6 +4524,8 @@ self: super: with self; { flask-sqlalchemy = callPackage ../development/python-modules/flask-sqlalchemy { }; + flask-sqlalchemy-lite = callPackage ../development/python-modules/flask-sqlalchemy-lite { }; + flask-sslify = callPackage ../development/python-modules/flask-sslify { }; flask-swagger = callPackage ../development/python-modules/flask-swagger { }; From 51d6bd06b170fb94a287fcf2f5c529fca6921981 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Mon, 26 Aug 2024 15:18:06 -0700 Subject: [PATCH 3/3] python312Packages.flask-security: 5.5.0 -> 5.5.2 Diff: https://github.com/pallets-eco/flask-security/compare/refs/tags/5.5.0...5.5.2 Changelog: https://github.com/pallets-eco/flask-security/blob/5.5.2/CHANGES.rst --- .../python-modules/flask-security/default.nix | 49 ++++++++++++------- 1 file changed, 32 insertions(+), 17 deletions(-) diff --git a/pkgs/development/python-modules/flask-security/default.nix b/pkgs/development/python-modules/flask-security/default.nix index dbb611a9c683..e202a68ab480 100644 --- a/pkgs/development/python-modules/flask-security/default.nix +++ b/pkgs/development/python-modules/flask-security/default.nix @@ -1,15 +1,16 @@ { lib, buildPythonPackage, - fetchPypi, + fetchFromGitHub, pythonOlder, - setuptools, + flit-core, # extras: babel babel, flask-babel, # extras: common + argon2-cffi, bcrypt, bleach, flask-mailman, @@ -31,12 +32,14 @@ flask-login, flask-principal, flask-wtf, + markupsafe, passlib, importlib-resources, wtforms, # tests - argon2-cffi, + authlib, + flask-sqlalchemy-lite, freezegun, mongoengine, mongomock, @@ -48,18 +51,24 @@ buildPythonPackage rec { pname = "flask-security"; - version = "5.5.0"; + version = "5.5.2"; pyproject = true; - disabled = pythonOlder "3.8"; + disabled = pythonOlder "3.9"; - src = fetchPypi { - pname = "flask_security_too"; - inherit version; - hash = "sha256-nuYOqKgH3Wfk2IFEDUhWUB6aP1xZ+c4DK7n0zB01TSk="; + src = fetchFromGitHub { + owner = "pallets-eco"; + repo = "flask-security"; + rev = "refs/tags/${version}"; + hash = "sha256-RGRwgrDFe+0v8NYyajMikdoi1DQf1I+B5y8KJyF+cZs="; }; - build-system = [ setuptools ]; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace-fail phonenumberslite phonenumbers + ''; + + build-system = [ flit-core ]; # flask-login>=0.6.2 not satisfied by version 0.7.0.dev0 pythonRelaxDeps = [ "flask-login" ]; @@ -70,17 +79,19 @@ buildPythonPackage rec { flask-login flask-principal flask-wtf + markupsafe passlib importlib-resources wtforms ]; - passthru.optional-dependencies = { + optional-dependencies = { babel = [ babel flask-babel ]; common = [ + argon2-cffi bcrypt bleach flask-mailman @@ -100,7 +111,8 @@ buildPythonPackage rec { nativeCheckInputs = [ - argon2-cffi + authlib + flask-sqlalchemy-lite freezegun mongoengine mongomock @@ -108,12 +120,15 @@ buildPythonPackage rec { pony pytestCheckHook zxcvbn - freezegun ] - ++ passthru.optional-dependencies.babel - ++ passthru.optional-dependencies.common - ++ passthru.optional-dependencies.fsqla - ++ passthru.optional-dependencies.mfa; + ++ optional-dependencies.babel + ++ optional-dependencies.common + ++ optional-dependencies.fsqla + ++ optional-dependencies.mfa; + + preCheck = '' + pybabel compile --domain flask_security -d flask_security/translations + ''; disabledTests = [ # needs /etc/resolv.conf