Skip to content

flask-{wtf,admin} fixes #156188

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
SuperSandro2000 merged 3 commits into from
Feb 2, 2022
Merged

flask-{wtf,admin} fixes #156188

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
53a0218
python3Packages.wtf-peewee: patch for wtforms 3.0
arcnmx Jan 20, 2022
ea59f20
python3Packages.flask-appbuilder: patch for wtforms 3.0
arcnmx Jan 22, 2022
39b2cf9
python3Packages.flask-admin: 1.5.8 -> 1.6.0
arcnmx Jan 22, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions pkgs/development/python-modules/flask-admin/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,13 +26,13 @@

buildPythonPackage rec {
pname = "flask-admin";
version = "1.5.8";
version = "1.6.0";
format = "setuptools";

src = fetchPypi {
pname = "Flask-Admin";
inherit version;
sha256 = "sha256-6wah8xuYiB3uU6VcZPrr0ZkNaqw4gmNksoDfCyZ5/3Q=";
sha256 = "1209qhm51d4z66mbw55cmkzqvr465shnws2m2l2zzpxhnxwzqks2";
};

propagatedBuildInputs = [
Expand Down Expand Up @@ -69,6 +69,7 @@ buildPythonPackage rec {
"flask_admin/tests/pymongo/test_basic.py"
"flask_admin/tests/sqla/test_basic.py"
"flask_admin/tests/sqla/test_form_rules.py"
"flask_admin/tests/sqla/test_inlineform.py"
"flask_admin/tests/sqla/test_postgres.py"
"flask_admin/tests/sqla/test_translation.py"
];
Expand Down
17 changes: 16 additions & 1 deletion pkgs/development/python-modules/flask-appbuilder/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{ lib
, buildPythonPackage
, fetchPypi
, fetchpatch
, apispec
, colorama
, click
Expand Down Expand Up @@ -36,7 +37,20 @@ buildPythonPackage rec {
# See here: https://github.com/dpgaspar/Flask-AppBuilder/commit/7097a7b133f27c78d2b54d2a46e4a4c24478a066.patch
# https://github.com/dpgaspar/Flask-AppBuilder/pull/1610
# The patch from the PR doesn't apply cleanly so I edited it manually.
patches = [ ./upgrade-to-flask_jwt_extended-4.patch ];
patches = [
./upgrade-to-flask_jwt_extended-4.patch
(fetchpatch {
# https://github.com/dpgaspar/Flask-AppBuilder/pull/1734
name = "flask-appbuilder-wtf3.patch";
url = "https://github.com/dpgaspar/Flask-AppBuilder/commit/bccb3d719cd3ceb872fe74a9ab304d74664fbf43.patch";
sha256 = "1rsci0ynb7y6k53j164faggjr2g6l5v78w7953qbxcy8f55sb2fv";
excludes = [
"requirements.txt"
"setup.py"
"examples/employees/app/views.py"
];
})
];

propagatedBuildInputs = [
apispec
Expand Down Expand Up @@ -68,6 +82,7 @@ buildPythonPackage rec {
--replace "Flask-Login>=0.3, <0.5" "Flask-Login >=0.3, <0.6" \
--replace "Flask-Babel>=1, <2" "Flask-Babel >=1, <3" \
--replace "Flask-WTF>=0.14.2, <0.15.0" "Flask-WTF" \
--replace "WTForms<3.0.0" "WTForms" \
--replace "marshmallow-sqlalchemy>=0.22.0, <0.24.0" "marshmallow-sqlalchemy" \
--replace "Flask-JWT-Extended>=3.18, <4" "Flask-JWT-Extended>=4.1.0" \
--replace "PyJWT>=1.7.1, <2.0.0" "PyJWT>=2.0.1" \
Expand Down
9 changes: 9 additions & 0 deletions pkgs/development/python-modules/wtf-peewee/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{ lib
, buildPythonPackage
, fetchPypi
, fetchpatch
, peewee
, wtforms
, python
Expand All @@ -15,6 +16,14 @@ buildPythonPackage rec {
sha256 = "faa953fe3f705d4f2b48f3c1a81c5c5a6a38f9ed1378c9a830e6efc1b0fccb15";
};

patches = [
(fetchpatch {
name = "fix-wtforms3.patch";
url = "https://github.com/coleifer/wtf-peewee/commit/b1764f4474c73a9a2b34ae6b7db61274f5252a7f.patch";
sha256 = "0maz3fm9bi8p80nk9sdb34xq55xq8ihm51y7k0m8ck9aaypvwbig";
})
];

propagatedBuildInputs = [
peewee
wtforms
Expand Down