Unverified Commit 4af447d1 authored by Fabian Affolter's avatar Fabian Affolter Committed by GitHub
Browse files

Merge pull request #217294 from fabaff/flask-appbuilder-fix 

python310Packages.flask-sqlalchemy: 3.0.2 -> 3.0.3, python310Packages.flask-appbuilder: mark as broken
parents 4fa6026e 94a9f076

pkgs/development/python-modules/apispec/default.nix

+16 −5
Original line number Diff line number Diff line
@@ -4,6 +4,7 @@ 
, marshmallow

, mock

, openapi-spec-validator

, packaging

, prance

, pytestCheckHook

, pythonOlder
@@ -23,16 +24,26 @@ buildPythonPackage rec { 
  };



  propagatedBuildInputs = [

    packaging

  ];



  passthru.optional-dependencies = {

    marshmallow = [

      marshmallow

    ];

    yaml = [

      pyyaml

    ];

    validation = [

      openapi-spec-validator

      prance

    ];

  };



  nativeCheckInputs = [

    openapi-spec-validator

    marshmallow

    mock

    pytestCheckHook

  ];

  ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies);



  pythonImportsCheck = [

    "apispec"

pkgs/development/python-modules/flask-appbuilder/default.nix

+9 −21
Original line number Diff line number Diff line 
{ lib

, buildPythonPackage

, fetchPypi

, fetchpatch

, apispec

, colorama

, click
@@ -27,7 +26,7 @@ 


buildPythonPackage rec {

  pname = "flask-appbuilder";

  version = "4.1.3";

  version = "4.2.1";

  format = "setuptools";



  disabled = pythonOlder "3.7";
@@ -35,23 +34,9 @@ buildPythonPackage rec { 
  src = fetchPypi {

    pname = "Flask-AppBuilder";

    inherit version;

    hash = "sha256-8NaTr0RcnsVik/AB4g8QL+FkcRlgkkASFe8fXIvFt/A=";

    hash = "sha256-rZbu0Bif5pOa/zu6MCrbGJpkqUdYzWyVgp6tqRzGyIc=";

  };



  patches = [

    (fetchpatch {

      # https://github.com/dpgaspar/Flask-AppBuilder/pull/1734

      name = "flask-appbuilder-wtf3.patch";

      url = "https://github.com/dpgaspar/Flask-AppBuilder/commit/bccb3d719cd3ceb872fe74a9ab304d74664fbf43.patch";

      hash = "sha256-24mlS3HIs77wKOlwdHah5oks31OOmCBHmcafZT2ITOc=";

      excludes = [

        "requirements.txt"

        "setup.py"

        "examples/employees/app/views.py"

      ];

    })

  ];



  propagatedBuildInputs = [

    apispec

    colorama
@@ -73,13 +58,13 @@ buildPythonPackage rec { 
    pyjwt

    pyyaml

    sqlalchemy-utils

  ];

  ] ++ apispec.optional-dependencies.yaml;



  postPatch = ''

    substituteInPlace setup.py \

      --replace "apispec[yaml]>=3.3, <4" "apispec[yaml] >=3.3" \

      --replace "Flask-WTF>=0.14.2, <1.0.0" "Flask-WTF" \

      --replace "WTForms<3.0.0" "WTForms" \

      --replace "apispec[yaml]>=3.3, <6" "apispec[yaml]" \

      --replace "Flask-SQLAlchemy>=2.4, <3" "Flask-SQLAlchemy" \

      --replace "Flask-Babel>=1, <3" "Flask-Babel" \

      --replace "marshmallow-sqlalchemy>=0.22.0, <0.27.0" "marshmallow-sqlalchemy" \

      --replace "prison>=0.2.1, <1.0.0" "prison"

  '';
@@ -94,7 +79,10 @@ buildPythonPackage rec { 
  meta = with lib; {

    description = "Application development framework, built on top of Flask";

    homepage = "https://github.com/dpgaspar/flask-appbuilder/";

    changelog = "https://github.com/dpgaspar/Flask-AppBuilder/blob/v${version}/CHANGELOG.rst";

    license = licenses.bsd3;

    maintainers = with maintainers; [ costrouc ];

    # Support for flask-sqlalchemy >= 3.0 is missing, https://github.com/dpgaspar/Flask-AppBuilder/pull/1940

    broken = true;

  };

}

pkgs/development/python-modules/flask-sqlalchemy/default.nix

+2 −2
Original line number Diff line number Diff line 
{ lib

, buildPythonPackage

, fetchPypi

, pdm-pep517

, flask

, mock

, sqlalchemy

, pdm-pep517

, pytestCheckHook

, pythonOlder

, sqlalchemy

}:



buildPythonPackage rec {