Merge pull request #303 from helloflask/upgrade-req

Author: greyli

.github/workflows/build.yml

@@ -22,7 +22,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest, macos-latest, windows-latest]
-        python: ['3.7', '3.8', '3.9', '3.10']
+        python: ['3.8', '3.9', '3.10', '3.11']
       fail-fast: false
     runs-on: ${{ matrix.os }}
     steps:

CHANGES.rst

@@ -7,10 +7,10 @@ Changelog
 
 Release date: -
 
+- Drop Python 3.7 support, and test against Python 3.11.
 - Render enums in tables by their labels.
 - Support creating action URLs for dict data (`#268 <https://github.com/helloflask/bootstrap-flask/issues/268>`__).
-- Updated Bootstrap to version 5.3.0
-- Updated Bootstrap Icons to version 1.10.5
+- Upgrade to Bootstrap 5.3.0, Bootstrap Icons 1.10.5, and Popper 2.11.8.
 
 
 2.2.0

flask_bootstrap/__init__.py

@@ -260,10 +260,10 @@ def create_app():
     .. versionadded:: 2.0.0
     """
     bootstrap_version = '5.3.0'
-    popper_version = '2.11.6'
+    popper_version = '2.11.8'
     bootstrap_css_integrity = 'sha384-9ndCyUaIbzAi2FUVXJi0CjmCapSmO7SnpJef0486qhLnuZ2cdeRhO02iuK6FUUVM'
     bootstrap_js_integrity = 'sha384-geWF76RCwLtnZ8qwWowPQNguL3RmwHVBC9FhGdlKrxdiJJigb/j/68SIy3Te4Bkz'
-    popper_integrity = 'sha384-oBqDVmMz9ATKxIep9tiCxS/Z9fNfEXiDAYTujMAeBAsjFuCZSmKbSSUnQlmh/jp3'
+    popper_integrity = 'sha384-I7E8VVD/ismYTF4hNIPjVp/Zjvgyol6VFvRkX/vR+Vc4jQkC+hVqc2pM8ODewa9r'
     popper_name = '@popperjs/core'
     static_folder = 'bootstrap5'
 

flask_bootstrap/static/bootstrap5/umd/popper.min.js

@@ -1,5 +1,5 @@
 -r tests.in
 -r docs.in
 -r style.in
-pip-tools
+pip-compile-multi
 tox

flask_bootstrap/static/bootstrap5/umd/popper.min.js.map

@@ -1,157 +1,47 @@
+# SHA1:862a5e687ccba7956bb09d428fcd447a7497bac8
 #
-# This file is autogenerated by pip-compile with python 3.8
+# This file is autogenerated by pip-compile-multi
 # To update, run:
 #
-#    pip-compile requirements/dev.in
+#    pip-compile-multi
 #
-alabaster==0.7.12
-    # via sphinx
-attrs==22.1.0
-    # via pytest
-babel==2.11.0
-    # via sphinx
-build==0.9.0
+-r docs.txt
+-r style.txt
+-r tests.txt
+build==0.10.0
     # via pip-tools
-certifi==2022.9.24
-    # via requests
-charset-normalizer==2.1.1
-    # via requests
-click==8.1.3
-    # via
-    #   flask
-    #   pip-tools
-coverage[toml]==6.5.0
-    # via pytest-cov
-distlib==0.3.6
+cachetools==5.3.1
+    # via tox
+chardet==5.1.0
+    # via tox
+colorama==0.4.6
+    # via tox
+distlib==0.3.7
     # via virtualenv
-docutils==0.19
-    # via sphinx
-exceptiongroup==1.0.4
-    # via pytest
-filelock==3.8.0
+filelock==3.12.2
     # via
     #   tox
     #   virtualenv
-flake8==5.0.4
-    # via -r requirements/style.in
-flask==2.2.2
-    # via
-    #   flask-sqlalchemy
-    #   flask-wtf
-flask-sqlalchemy==3.0.2
-    # via -r requirements/tests.in
-flask-wtf==1.0.1
-    # via -r requirements/tests.in
-idna==3.4
-    # via requests
-imagesize==1.4.1
-    # via sphinx
-importlib-metadata==5.0.0
-    # via
-    #   flask
-    #   sphinx
-iniconfig==1.1.1
-    # via pytest
-itsdangerous==2.1.2
-    # via
-    #   flask
-    #   flask-wtf
-jinja2==3.1.2
-    # via
-    #   flask
-    #   sphinx
-markupsafe==2.1.1
-    # via
-    #   jinja2
-    #   werkzeug
-    #   wtforms
-mccabe==0.7.0
-    # via flake8
-packaging==21.3
-    # via
-    #   build
-    #   pallets-sphinx-themes
-    #   pytest
-    #   sphinx
-    #   tox
-pallets-sphinx-themes==2.0.2
-    # via -r requirements/docs.in
-pep517==0.13.0
-    # via build
-pip-tools==6.10.0
+pip-compile-multi==2.6.3
     # via -r requirements/dev.in
-platformdirs==2.5.4
-    # via virtualenv
-pluggy==1.0.0
+pip-tools==7.1.0
+    # via pip-compile-multi
+platformdirs==3.9.1
     # via
-    #   pytest
     #   tox
-py==1.11.0
-    # via tox
-pycodestyle==2.9.1
-    # via flake8
-pyflakes==2.5.0
-    # via flake8
-pygments==2.13.0
-    # via sphinx
-pyparsing==3.0.9
-    # via packaging
-pytest==7.2.0
-    # via
-    #   -r requirements/tests.in
-    #   pytest-cov
-pytest-cov==4.0.0
-    # via -r requirements/tests.in
-pytz==2022.6
-    # via babel
-requests==2.28.1
-    # via sphinx
-six==1.16.0
+    #   virtualenv
+pyproject-api==1.5.3
     # via tox
-snowballstemmer==2.2.0
-    # via sphinx
-sphinx==5.3.0
-    # via
-    #   -r requirements/docs.in
-    #   pallets-sphinx-themes
-    #   sphinxcontrib-log-cabinet
-sphinxcontrib-applehelp==1.0.2
-    # via sphinx
-sphinxcontrib-devhelp==1.0.2
-    # via sphinx
-sphinxcontrib-htmlhelp==2.0.0
-    # via sphinx
-sphinxcontrib-jsmath==1.0.1
-    # via sphinx
-sphinxcontrib-log-cabinet==1.0.1
-    # via -r requirements/docs.in
-sphinxcontrib-qthelp==1.0.3
-    # via sphinx
-sphinxcontrib-serializinghtml==1.1.5
-    # via sphinx
-sqlalchemy==1.4.44
-    # via flask-sqlalchemy
-tomli==2.0.1
-    # via
-    #   build
-    #   coverage
-    #   pep517
-    #   pytest
-    #   tox
-tox==3.27.1
+pyproject-hooks==1.0.0
+    # via build
+toposort==1.10
+    # via pip-compile-multi
+tox==4.6.4
     # via -r requirements/dev.in
-urllib3==1.26.12
-    # via requests
-virtualenv==20.16.7
+virtualenv==20.24.1
     # via tox
-werkzeug==2.2.2
-    # via flask
-wheel==0.38.4
+wheel==0.41.0
     # via pip-tools
-wtforms==3.0.1
-    # via flask-wtf
-zipp==3.10.0
-    # via importlib-metadata
 
 # The following packages are considered to be unsafe in a requirements file:
 # pip

requirements/dev.in

@@ -1,55 +1,50 @@
+# SHA1:fe8b553275b50167be0306f00b20a03640317e49
 #
-# This file is autogenerated by pip-compile with python 3.8
+# This file is autogenerated by pip-compile-multi
 # To update, run:
 #
-#    pip-compile requirements/docs.in
+#    pip-compile-multi
 #
-alabaster==0.7.12
+alabaster==0.7.13
     # via sphinx
-babel==2.11.0
+babel==2.12.1
     # via sphinx
-certifi==2022.9.24
+certifi==2023.7.22
     # via requests
-charset-normalizer==2.1.1
+charset-normalizer==3.2.0
     # via requests
-docutils==0.19
+docutils==0.20.1
     # via sphinx
 idna==3.4
     # via requests
 imagesize==1.4.1
     # via sphinx
-importlib-metadata==5.0.0
-    # via sphinx
 jinja2==3.1.2
     # via sphinx
-markupsafe==2.1.1
+markupsafe==2.1.3
     # via jinja2
-packaging==21.3
+packaging==23.1
     # via
     #   pallets-sphinx-themes
     #   sphinx
-pallets-sphinx-themes==2.0.2
+pallets-sphinx-themes==2.1.1
     # via -r requirements/docs.in
-pygments==2.13.0
+pygments==2.15.1
     # via sphinx
-pyparsing==3.0.9
-    # via packaging
-pytz==2022.6
-    # via babel
-requests==2.28.1
+requests==2.31.0
     # via sphinx
 snowballstemmer==2.2.0
     # via sphinx
-sphinx==5.3.0
+sphinx==7.0.1
     # via
     #   -r requirements/docs.in
     #   pallets-sphinx-themes
     #   sphinxcontrib-log-cabinet
-sphinxcontrib-applehelp==1.0.2
+sphinxcontrib-applehelp==1.0.4
     # via sphinx
 sphinxcontrib-devhelp==1.0.2
     # via sphinx
-sphinxcontrib-htmlhelp==2.0.0
+sphinxcontrib-htmlhelp==2.0.1
     # via sphinx
 sphinxcontrib-jsmath==1.0.1
     # via sphinx
@@ -59,7 +54,5 @@ sphinxcontrib-qthelp==1.0.3
     # via sphinx
 sphinxcontrib-serializinghtml==1.1.5
     # via sphinx
-urllib3==1.26.12
+urllib3==2.0.4
     # via requests
-zipp==3.10.0
-    # via importlib-metadata

requirements/dev.txt

@@ -1,43 +1,46 @@
+# SHA1:ffb35e11eb78fc6d03fa35f64989abeeee4280e2
 #
-# This file is autogenerated by pip-compile with python 3.8
+# This file is autogenerated by pip-compile-multi
 # To update, run:
 #
-#    pip-compile requirements/examples.in
+#    pip-compile-multi
 #
-bootstrap-flask==2.1.0
+blinker==1.6.2
+    # via flask
+bootstrap-flask==2.2.0
     # via -r requirements/examples.in
-click==8.1.3
+click==8.1.6
     # via flask
-flask==2.2.2
+flask==2.3.2
     # via
     #   -r requirements/examples.in
     #   bootstrap-flask
     #   flask-sqlalchemy
     #   flask-wtf
-flask-sqlalchemy==3.0.2
+flask-sqlalchemy==3.0.5
     # via -r requirements/examples.in
-flask-wtf==1.0.1
+flask-wtf==1.1.1
     # via -r requirements/examples.in
-importlib-metadata==5.0.0
-    # via flask
+greenlet==2.0.2
+    # via sqlalchemy
 itsdangerous==2.1.2
     # via
     #   flask
     #   flask-wtf
 jinja2==3.1.2
     # via flask
-markupsafe==2.1.1
+markupsafe==2.1.3
     # via
     #   jinja2
     #   werkzeug
     #   wtforms
-sqlalchemy==1.4.44
+sqlalchemy==2.0.19
     # via flask-sqlalchemy
-werkzeug==2.2.2
+typing-extensions==4.7.1
+    # via sqlalchemy
+werkzeug==2.3.6
     # via flask
 wtforms==3.0.1
     # via
     #   bootstrap-flask
     #   flask-wtf
-zipp==3.10.0
-    # via importlib-metadata

requirements/docs.txt

@@ -1,14 +1,15 @@
+# SHA1:8f27e4f0b0e1fabc56425bc40b6e79fabb64c9af
 #
-# This file is autogenerated by pip-compile with python 3.8
+# This file is autogenerated by pip-compile-multi
 # To update, run:
 #
-#    pip-compile requirements/style.in
+#    pip-compile-multi
 #
-flake8==5.0.4
+flake8==6.0.0
     # via -r requirements/style.in
 mccabe==0.7.0
     # via flake8
-pycodestyle==2.9.1
+pycodestyle==2.10.0
     # via flake8
-pyflakes==2.5.0
+pyflakes==3.0.1
     # via flake8