ci: refactor requirements structure and improve dependabot config (#2198)

* remove old files

* fix

* fix

* fix

* fix

Author: dpgaspar

.github/dependabot.yml

@@ -0,0 +1,22 @@
+version: 2
+updates:
+  - package-ecosystem: github-actions
+    directory: /
+    schedule:
+      interval: weekly
+    groups:
+      github-actions:
+        patterns:
+          - '*'
+  - package-ecosystem: pip
+    directory: /requirements/
+    schedule:
+      interval: weekly
+    groups:
+      python-requirements:
+        patterns:
+          - '*'
+  - package-ecosystem: npm
+    directory: /requirements-fe/
+    schedule:
+      interval: weekly

.github/workflows/ci.yml

@@ -25,8 +25,7 @@ jobs:
           sudo apt-get update
           sudo apt-get install -y libldap2-dev libsasl2-dev libssl-dev
           pip install --upgrade pip
-          pip install -r requirements.txt
-          pip install -r requirements-dev.txt
+          pip install -r requirements/dev.txt
       - name: black
         run: black --check setup.py flask_appbuilder
       - name: flake8
@@ -78,9 +77,9 @@ jobs:
           sudo apt-get update
           sudo apt-get install -y libldap2-dev libsasl2-dev libssl-dev
           pip install --upgrade pip
-          pip install -r requirements.txt
-          pip install -r requirements-dev.txt
-          pip install -r requirements-extra.txt
+          pip install -r requirements/base.txt
+          pip install -r requirements/tests.txt
+          pip install -r requirements/extra.txt
       - name: Run tests
         run: |
           nose2 -c setup.cfg -F -v --with-coverage --coverage flask_appbuilder -A '!mongo,!openid' tests
@@ -129,9 +128,9 @@ jobs:
           sudo apt-get update
           sudo apt-get install -y libldap2-dev libsasl2-dev libssl-dev
           pip install --upgrade pip
-          pip install -r requirements.txt
-          pip install -r requirements-dev.txt
-          pip install -r requirements-extra.txt
+          pip install -r requirements/base.txt
+          pip install -r requirements/tests.txt
+          pip install -r requirements/extra.txt
       - name: Run tests
         run: |
           nose2 -c setup.cfg -F -v --with-coverage --coverage flask_appbuilder -A '!mongo,!openid' tests
@@ -178,9 +177,9 @@ jobs:
           sudo apt-get update
           sudo apt-get install -y libldap2-dev libsasl2-dev libssl-dev freetds-bin unixodbc-dev tdsodbc
           pip install --upgrade pip
-          pip install -r requirements.txt
-          pip install -r requirements-dev.txt
-          pip install -r requirements-extra.txt
+          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: |
@@ -210,10 +209,10 @@ jobs:
           sudo apt-get update
           sudo apt-get install -y libldap2-dev libsasl2-dev libssl-dev
           pip install --upgrade pip
-          pip install -r requirements.txt
-          pip install -r requirements-dev.txt
-          pip install -r requirements-extra.txt
-          pip install -r requirements-mongodb.txt
+          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
@@ -237,10 +236,10 @@ jobs:
           sudo apt-get update
           sudo apt-get install -y libldap2-dev libsasl2-dev libssl-dev
           pip install --upgrade pip
-          pip install -r requirements.txt
-          pip install -r requirements-dev.txt
-          pip install -r requirements-extra.txt
-          pip install -r requirements-openid.txt
+          pip install -r requirements/base.txt
+          pip install -r requirements/tests.txt
+          pip install -r requirements/extra.txt
+          pip install -r requirements/openid.txt
       - name: Run tests
         run: |
           nose2 -c setup.cfg -F -v --with-coverage --coverage flask_appbuilder -A 'openid' tests

.readthedocs.yaml

@@ -19,4 +19,4 @@ sphinx:
 # https://docs.readthedocs.io/en/stable/guides/reproducible-builds.html
 python:
   install:
-  - requirements: rtd_requirements.txt
+  - requirements: requirements/docs.txt

requirements-dev.txt

@@ -0,0 +1 @@
+-e .

requirements-extra.txt

@@ -1,61 +1,56 @@
 #
-# This file is autogenerated by pip-compile with python 3.8
-# To update, run:
+# This file is autogenerated by pip-compile with Python 3.11
+# by the following command:
 #
-#    pip-compile
+#    pip-compile requirements/base.in
 #
 apispec[yaml]==6.3.0
-    # via Flask-AppBuilder (setup.py)
+    # via flask-appbuilder
 attrs==23.1.0
     # via
     #   jsonschema
     #   referencing
 babel==2.13.0
     # via flask-babel
+blinker==1.7.0
+    # via flask
 click==8.1.7
     # via
-    #   Flask-AppBuilder (setup.py)
     #   flask
+    #   flask-appbuilder
 colorama==0.4.6
-    # via Flask-AppBuilder (setup.py)
+    # via flask-appbuilder
 deprecated==1.2.14
     # via limits
 dnspython==2.4.2
     # via email-validator
 email-validator==1.3.1
-    # via Flask-AppBuilder (setup.py)
+    # via flask-appbuilder
 flask==2.3.3
     # via
-    #   Flask-AppBuilder (setup.py)
+    #   flask-appbuilder
     #   flask-babel
     #   flask-jwt-extended
     #   flask-limiter
     #   flask-login
     #   flask-sqlalchemy
     #   flask-wtf
 flask-babel==2.0.0
-    # via Flask-AppBuilder (setup.py)
+    # via flask-appbuilder
 flask-jwt-extended==4.5.3
-    # via Flask-AppBuilder (setup.py)
+    # via flask-appbuilder
 flask-limiter==3.5.0
-    # via Flask-AppBuilder (setup.py)
+    # via flask-appbuilder
 flask-login==0.6.3
-    # via Flask-AppBuilder (setup.py)
+    # via flask-appbuilder
 flask-sqlalchemy==2.5.1
-    # via Flask-AppBuilder (setup.py)
+    # via flask-appbuilder
 flask-wtf==1.2.1
-    # via Flask-AppBuilder (setup.py)
-greenlet==3.0.0
-    # via sqlalchemy
+    # via flask-appbuilder
 idna==3.4
     # via email-validator
-importlib-metadata==6.8.0
-    # via flask
 importlib-resources==6.1.0
-    # via
-    #   jsonschema
-    #   jsonschema-specifications
-    #   limits
+    # via limits
 itsdangerous==2.1.2
     # via
     #   flask
@@ -65,7 +60,7 @@ jinja2==3.1.3
     #   flask
     #   flask-babel
 jsonschema==4.19.1
-    # via Flask-AppBuilder (setup.py)
+    # via flask-appbuilder
 jsonschema-specifications==2023.7.1
     # via jsonschema
 limits==3.6.0
@@ -79,7 +74,7 @@ markupsafe==2.1.3
     #   wtforms
 marshmallow==3.20.1
     # via
-    #   Flask-AppBuilder (setup.py)
+    #   flask-appbuilder
     #   marshmallow-sqlalchemy
 marshmallow-sqlalchemy==0.28.2
     # via Flask-AppBuilder (setup.py)
@@ -92,22 +87,18 @@ packaging==23.2
     #   apispec
     #   limits
     #   marshmallow
-pkgutil-resolve-name==1.3.10
-    # via jsonschema
 prison==0.2.1
-    # via Flask-AppBuilder (setup.py)
+    # via flask-appbuilder
 pygments==2.16.1
     # via rich
 pyjwt==2.8.0
     # via
-    #   Flask-AppBuilder (setup.py)
+    #   flask-appbuilder
     #   flask-jwt-extended
 python-dateutil==2.8.2
-    # via Flask-AppBuilder (setup.py)
+    # via flask-appbuilder
 pytz==2023.3.post1
-    # via
-    #   babel
-    #   flask-babel
+    # via flask-babel
 pyyaml==6.0.1
     # via apispec
 referencing==0.30.2
@@ -126,30 +117,25 @@ six==1.16.0
     #   python-dateutil
 sqlalchemy==1.4.49
     # via
-    #   Flask-AppBuilder (setup.py)
+    #   flask-appbuilder
     #   flask-sqlalchemy
     #   marshmallow-sqlalchemy
     #   sqlalchemy-utils
 sqlalchemy-utils==0.41.1
-    # via Flask-AppBuilder (setup.py)
+    # via flask-appbuilder
 typing-extensions==4.8.0
     # via
     #   flask-limiter
     #   limits
-    #   rich
 werkzeug==3.0.1
     # via
-    #   Flask-AppBuilder (setup.py)
     #   flask
+    #   flask-appbuilder
     #   flask-jwt-extended
     #   flask-login
 wrapt==1.15.0
     # via deprecated
 wtforms==3.1.0
     # via
-    #   Flask-AppBuilder (setup.py)
+    #   flask-appbuilder
     #   flask-wtf
-zipp==3.17.0
-    # via
-    #   importlib-metadata
-    #   importlib-resources

package-lock.json requirements-fe/package-lock.jsonpackage-lock.json renamed to requirements-fe/package-lock.json

@@ -0,0 +1,11 @@
+-r tests.in
+
+black
+coverage
+flake8-import-order
+flake8
+mypy
+mypy-extensions
+pip-tools
+tox
+types-PyYAML