Merge branch 'master' into update_azure_oauth

Author: sfirke

.github/workflows/ci.yml

@@ -31,7 +31,7 @@ jobs:
       - name: flake8
         run: flake8 flask_appbuilder
       - name: mypy
-        run: mypy flask_appbuilder
+        run: mypy flask_appbuilder/**/*.py
       - name: black
         run: black --check tests
       - name: flake8
@@ -71,7 +71,7 @@ jobs:
             -e LDAP_ADMIN_PASSWORD=admin_password \
             -e LDAP_EXTRA_SCHEMAS=cosine,inetorgperson,nis,memberof \
             -p 1389:1389 \
-            bitnami/openldap:2.6.4
+            bitnamilegacy/openldap:2.6
       - name: Install dependencies
         run: |
           sudo apt-get update
@@ -87,24 +87,23 @@ jobs:
         run: |
           bash <(curl -s https://codecov.io/bash) -cF python
 
-  test-mysql:
+  test-postgres-sqlalchemy1:
     runs-on: ubuntu-22.04
     strategy:
       matrix:
         python-version: ["3.10"]
     env:
-      SQLALCHEMY_DATABASE_URI: |
-        mysql+mysqldb://mysqluser:mysqluserpassword@127.0.0.1:13306/app?charset=utf8mb4&binary_prefix=true
+      SQLALCHEMY_DATABASE_URI:
+        postgresql+psycopg2://pguser:pguserpassword@127.0.0.1:15432/app
     services:
-      mysql:
-        image: mysql:5.7
+      postgres:
+        image: postgres:14-alpine
         env:
-          MYSQL_USER: mysqluser
-          MYSQL_PASSWORD: mysqluserpassword
-          MYSQL_ROOT_PASSWORD: root
-          MYSQL_DATABASE: app
+          POSTGRES_USER: pguser
+          POSTGRES_PASSWORD: pguserpassword
+          POSTGRES_DB: app
         ports:
-          - 13306:3306
+          - 15432:5432
     steps:
       - uses: actions/checkout@v4
       - name: Setup Python
@@ -122,13 +121,13 @@ jobs:
             -e LDAP_ADMIN_PASSWORD=admin_password \
             -e LDAP_EXTRA_SCHEMAS=cosine,inetorgperson,nis,memberof \
             -p 1389:1389 \
-            bitnami/openldap:2.6.4
+            bitnamilegacy/openldap:2.6
       - name: Install dependencies
         run: |
           sudo apt-get update
           sudo apt-get install -y libldap2-dev libsasl2-dev libssl-dev
           pip install --upgrade pip
-          pip install -r requirements/base.txt
+          pip install -r requirements/base_legacy.txt
           pip install -r requirements/tests.txt
           pip install -r requirements/extra.txt
       - name: Run tests
@@ -138,22 +137,24 @@ jobs:
         run: |
           bash <(curl -s https://codecov.io/bash) -cF python
 
-  test-mssql:
+  test-mysql:
     runs-on: ubuntu-22.04
     strategy:
       matrix:
         python-version: ["3.10"]
     env:
       SQLALCHEMY_DATABASE_URI: |
-        mssql+pyodbc://sa:Password_123@localhost:11433/master?driver=FreeTDS
+        mysql+mysqldb://mysqluser:mysqluserpassword@127.0.0.1:13306/app?charset=utf8mb4&binary_prefix=true
     services:
-      mssql:
-        image: mcr.microsoft.com/mssql/server:2019-CU31-ubuntu-20.04
+      mysql:
+        image: mysql:5.7
         env:
-          SA_PASSWORD: Password_123
-          ACCEPT_EULA: Y
+          MYSQL_USER: mysqluser
+          MYSQL_PASSWORD: mysqluserpassword
+          MYSQL_ROOT_PASSWORD: root
+          MYSQL_DATABASE: app
         ports:
-          - 11433:1433
+          - 13306:3306
     steps:
       - uses: actions/checkout@v4
       - name: Setup Python
@@ -171,78 +172,68 @@ jobs:
             -e LDAP_ADMIN_PASSWORD=admin_password \
             -e LDAP_EXTRA_SCHEMAS=cosine,inetorgperson,nis,memberof \
             -p 1389:1389 \
-            bitnami/openldap:2.6.4
+            bitnamilegacy/openldap:2.6
       - name: Install dependencies
         run: |
           sudo apt-get update
-          sudo apt-get install -y libldap2-dev libsasl2-dev libssl-dev freetds-bin freetds-dev unixodbc-dev tdsodbc
+          sudo apt-get install -y libldap2-dev libsasl2-dev libssl-dev
           pip install --upgrade pip
           pip install -r requirements/base.txt
           pip install -r requirements/tests.txt
           pip install -r requirements/extra.txt
-          sudo cp .github/workflows/odbcinst.ini /etc/odbcinst.ini
       - name: Run tests
         run: |
-          nose2 -c setup.cfg -F -v --with-coverage --coverage flask_appbuilder -A '!mongo,!openid'
+          nose2 -c setup.cfg -F -v --with-coverage --coverage flask_appbuilder -A '!mongo,!openid' tests
       - name: Upload code coverage
         run: |
           bash <(curl -s https://codecov.io/bash) -cF python
 
-  test-mongodb:
+  test-mssql:
     runs-on: ubuntu-22.04
     strategy:
       matrix:
         python-version: ["3.10"]
+    env:
+      SQLALCHEMY_DATABASE_URI: |
+        mssql+pyodbc://sa:Password_123@localhost:11433/master?driver=FreeTDS
     services:
-      mongo:
-        image: mongo:4.4.1-bionic
+      mssql:
+        image: mcr.microsoft.com/mssql/server:2019-CU31-ubuntu-20.04
+        env:
+          SA_PASSWORD: Password_123
+          ACCEPT_EULA: Y
         ports:
-          - 27017:27017
+          - 11433:1433
     steps:
       - uses: actions/checkout@v4
       - name: Setup Python
         uses: actions/setup-python@v5
         with:
           python-version: ${{ matrix.python-version }}
-      - name: Install dependencies
-        run: |
-          sudo apt-get update
-          sudo apt-get install -y libldap2-dev libsasl2-dev libssl-dev
-          pip install --upgrade pip
-          pip install -r requirements/base.txt
-          pip install -r requirements/tests.txt
-          pip install -r requirements/extra.txt
-          pip install -r requirements/mongodb.txt
-      - name: Run tests
-        run: |
-          nose2 -c setup.cfg -F -v --with-coverage --coverage flask_appbuilder -A 'mongo' tests
-      - name: Upload code coverage
+      - name: Run openldap
         run: |
-          bash <(curl -s https://codecov.io/bash) -cF python
-
-  test-openid:
-    runs-on: ubuntu-22.04
-    strategy:
-      matrix:
-        python-version: ["3.10"]
-    steps:
-      - uses: actions/checkout@v4
-      - name: Setup Python
-        uses: actions/setup-python@v5
-        with:
-          python-version: ${{ matrix.python-version }}
+          docker run -d \
+            -v '${{ github.workspace }}/docker/openldap/ldifs:/ldifs' \
+            -v '${{ github.workspace }}/docker/openldap/schemas/memberof.ldif:/opt/bitnami/openldap/etc/schema/memberof.ldif' \
+            -e LDAP_URI=ldap://openldap:1389 \
+            -e LDAP_BASE=dc=example,dc=org \
+            -e LDAP_ADMIN_USERNAME=admin \
+            -e LDAP_ADMIN_PASSWORD=admin_password \
+            -e LDAP_EXTRA_SCHEMAS=cosine,inetorgperson,nis,memberof \
+            -p 1389:1389 \
+            bitnamilegacy/openldap:2.6
       - name: Install dependencies
         run: |
           sudo apt-get update
-          sudo apt-get install -y libldap2-dev libsasl2-dev libssl-dev
+          sudo apt-get install -y libldap2-dev libsasl2-dev libssl-dev freetds-bin freetds-dev unixodbc-dev tdsodbc
           pip install --upgrade pip
           pip install -r requirements/base.txt
           pip install -r requirements/tests.txt
           pip install -r requirements/extra.txt
-          pip install -r requirements/openid.txt
+          sudo cp .github/workflows/odbcinst.ini /etc/odbcinst.ini
       - name: Run tests
         run: |
-          nose2 -c setup.cfg -F -v --with-coverage --coverage flask_appbuilder -A 'openid' tests
+          nose2 -c setup.cfg -F -v --with-coverage --coverage flask_appbuilder -A '!mongo,!openid'
       - name: Upload code coverage
         run: |
           bash <(curl -s https://codecov.io/bash) -cF python

.github/workflows/ptlint.yml .github/workflows/prlint.yml.github/workflows/ptlint.yml renamed to .github/workflows/prlint.yml

@@ -1,6 +1,51 @@
 Flask-AppBuilder ChangeLog
 ==========================
 
+Improvements and Bug fixes on 5.0.2
+-----------------------------------
+
+- fix: fix pkg name to comply with pypi (#2413) [Daniel Vaz Gaspar]
+- fix: setup pkg filename (#2412) [Daniel Vaz Gaspar]
+- fix: check user is active with is_active (#2410) [Daniel Vaz Gaspar]
+- chore: French translations update messages.po (#2371) [xavier-GitHub76]
+- chore(username): Expand username length (#2409) [Antonio Rivero]
+
+Improvements and Bug fixes on 5.0.1
+-----------------------------------
+
+- Import RequestLimit from public namespace (#2398) [Ali-Akber Saifee]
+- feat: support JSON columns (#2383) [Beto Dealmeida]
+- fix(ci): move ldap to bitnami legacy (#2402) [Daniel Vaz Gaspar]
+- chore: apply APPLICATION_ROOT to swagger URL (#2394) [Elizabeth Thompson]
+- docs: improve 5.0.0 version migration (#2392) [Daniel Vaz Gaspar]
+
+Improvements and Bug fixes on 5.0.0
+-----------------------------------
+
+- chore: remove mongodb and openid support (v2) (#2390) [Daniel Vaz Gaspar]
+- fix: Add missing items types get_list_schema (#2389) [Kamil Gabryjelski]
+- chore: support sqlalchemy 2.x and flask-sqlalchemy 3 (breaking) (#2241) [Daniel Vaz Gaspar]
+- fix: openapi list permissions return type (#2388) [jfo]
+
+Improvements and Bug fixes on 4.8.1
+-----------------------------------
+
+- fix: don't register reset my password when not on AUTH_DB (#2384) [Daniel Vaz Gaspar]
+- fix: Correct is_pk_composite method to return False instead of raising an error. False is not a base exception (#2378) [Kyle Lagerquist]
+
+Improvements and Bug fixes on 4.8.0
+-----------------------------------
+
+- feat: Support the select_columns arg on the Get Item method (#2372) [Vitor Avila]
+
+Improvements and Bug fixes on 4.7.0
+-----------------------------------
+
+- fix: group api, OAS and payload (#2358) [Daniel Vaz Gaspar]
+- fix: order by using mssql database (#2356) [ThomasP0815]
+- feat(filters): add "FilterIn" and "FilterNotIn" operators with unit tests (#2354) [Enzo Martellucci]
+- feat(GroupAPI): Add GroupAPI to FAB (#2339) [Enzo Martellucci]
+
 Improvements and Bug fixes on 4.6.4
 -----------------------------------
 

CHANGELOG.rst

@@ -12,17 +12,9 @@ services:
       POSTGRES_USER: pguser
     ports:
       - 5432:5432
-  mongo:
-    container_name: fab-mongo
-    image: mongo
-    restart: unless-stopped
-    environment:
-      MONGO_INITDB_DATABASE: app
-    ports:
-      - 27017:27017
   ldap:
     container_name: fab-ldap
-    image: bitnami/openldap:2.6.4
+    image: bitnamilegacy/openldap:2.6
     environment:
       LDAP_URI: ldap://openldap:1389
       LDAP_BASE: dc=example,dc=org

docker-compose.yml

@@ -62,8 +62,6 @@ On this next example we are filtering a view by the logged in user and with colu
     from flask_appbuilder import ModelView
     from flask_appbuilder.models.sqla.interface import SQLAInterface
     from flask_appbuilder.models.sqla.filters import FilterEqualFunction, FilterStartsWith
-    # If you're using Mongo Engine you should import filters like this, everything else is exactly the same
-    # from flask_appbuilder.models.mongoengine.filters import FilterStartsWith, FilterEqualFunction
 
     from .models import MyTable
 

docs/advanced.rst

@@ -6,7 +6,6 @@ Version 4.0.0
 
 - Drops python 3.6 support
 - Removed config key `AUTH_STRICT_RESPONSE_CODES`, it's always strict now.
-- Removes `Flask-OpenID` dependency (you can install it has an extra dependency `pip install flask-appbuilder[openid]`)
 - Major version bumps on following packages
 
 **Flask from 1.X to 2.X**

docs/breaking.rst

@@ -33,7 +33,7 @@ Take a quick look to the current possibilities. (The bold ones require app conte
 
   - **create-user** - Create user with arbitrary role
 
-  - create-app - Create a Skeleton application (SQLAlchemy or MongoEngine).
+  - create-app - Create a Skeleton application.
 
   - create-addon - Create a Skeleton AddOn.
 
@@ -69,15 +69,13 @@ Command Line uses the excellent click package, so you can have a detailed help f
     Options:
     --name TEXT                     Your application name, directory will have
                                   this name
-    --engine [SQLAlchemy|MongoEngine]
-                                  Write your engine type
     --help                          Show this message and exit.
 
 
 **create-app** - Create new Applications
 ----------------------------------------
 
-To create a ready to dev skeleton application, you can use this command for SQLAlchemy engine and MongoEngine (MongoDB).
+To create a ready to dev skeleton application.
 This commands needs an internet connection to **github.com**, because it will download a zip version of the skeleton repos.
 
 **create-admin** - Create an admin user