Merge branch 'master' into python12

helloflask · Oct 13, 2023 · f70705a · f70705a
2 parents d89b1ef + 35c12a8
commit f70705a
Show file tree

Hide file tree

Showing 21 changed files with 148 additions and 112 deletions.
diff --git a/.github/workflows/master_bootstrap-flask-example.yml b/.github/workflows/master_bootstrap-flask-example.yml
@@ -0,0 +1,65 @@
+# Docs for the Azure Web Apps Deploy action: https://github.com/Azure/webapps-deploy
+# More GitHub Actions for Azure: https://github.com/Azure/actions
+# More info on Python, GitHub Actions, and Azure App Service: https://aka.ms/python-webapps-actions
+
+name: Build and deploy Python app to Azure Web App - bootstrap-flask-example
+
+on:
+  push:
+    branches:
+      - master
+  workflow_dispatch:
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v2
+
+      - name: Set up Python version
+        uses: actions/setup-python@v1
+        with:
+          python-version: '3.11'
+
+      - name: Create and start virtual environment
+        run: |
+          python -m venv venv
+          source venv/bin/activate
+      
+      - name: Install dependencies
+        run: |
+          pip install -r examples/requirements.txt
+          cp examples/requirements.txt examples/bootstrap5/requirements.txt
+        
+      # Optional: Add step to run tests here (PyTest, Django test suites, etc.)
+
+      - name: Upload artifact for deployment jobs
+        uses: actions/upload-artifact@v2
+        with:
+          name: python-app
+          path: |
+            ./examples/bootstrap5/
+            !venv/
+
+  deploy:
+    runs-on: ubuntu-latest
+    needs: build
+    environment:
+      name: 'Production'
+      url: ${{ steps.deploy-to-webapp.outputs.webapp-url }}
+
+    steps:
+      - name: Download artifact from build job
+        uses: actions/download-artifact@v2
+        with:
+          name: python-app
+          path: .
+
+      - name: 'Deploy to Azure Web App'
+        uses: azure/webapps-deploy@v2
+        id: deploy-to-webapp
+        with:
+          app-name: 'bootstrap-flask-example'
+          slot-name: 'Production'
+          publish-profile: ${{ secrets.AZUREAPPSERVICE_PUBLISHPROFILE_EA24F62410C243EEA4968476E7017059 }}
diff --git a/CHANGES.rst b/CHANGES.rst
@@ -14,7 +14,22 @@ Release date: -
 
 Release date: -
 
+
+2.3.2
+-----
+
+Release date: 2023/10/11
+
+- Fix the incorrect JS file integrity value.
+
+
+2.3.1
+-----
+
+Release date: 2023/10/11
+
 - Upgrade to Bootstrap 5.3.2, Bootswatch 5.3.1, and Bootstrap Icons 1.11.1.
+- Set up the Azure web app for the example application.
 
 
 2.3.0
@@ -327,4 +342,4 @@ Release date: 2018/7/1
 
 Release date: 2018/6/11
 
-Initial release.
+Initial release.
diff --git a/README.md b/README.md
@@ -78,9 +78,7 @@ docs for more details.
 
 ## Live demo
 
-Live demos of the latest release are:
-- [Examples with Bootstrap 4](http://173.212.198.217/)
-- [Examples with Bootstrap 5](http://109.205.179.12/)
+https://bootstrap-flask-example.azurewebsites.net/
 
 
 ## Donate

diff --git a/docs/conf.py b/docs/conf.py
@@ -19,9 +19,9 @@
 
 # -- Project information -----------------------------------------------------
 
-project = u'Bootstrap-Flask'
-copyright = u'2017, Grey Li'
-author = u'Grey Li'
+project = 'Bootstrap-Flask'
+copyright = '2017, Grey Li'
+author = 'Grey Li'
 
 version, release = get_version('Bootstrap-Flask')
 
@@ -63,7 +63,7 @@
 # List of patterns, relative to source directory, that match files and
 # directories to ignore when looking for source files.
 # This pattern also affects html_static_path and html_extra_path .
-exclude_patterns = [u'_build', 'Thumbs.db', '.DS_Store']
+exclude_patterns = ['_build', 'Thumbs.db', '.DS_Store']
 
 # The name of the Pygments (syntax highlighting) style to use.
 pygments_style = 'sphinx'
@@ -107,8 +107,8 @@
 
 # Output file base name for HTML help builder.
 htmlhelp_basename = 'Bootstrap-Flaskdoc'
-html_favicon = "_static/bootstrap-flask-favicon.png"
-html_logo = "_static/bootstrap-flask-logo.png"
+html_favicon = '_static/bootstrap-flask-favicon.png'
+html_logo = '_static/bootstrap-flask-logo.png'
 
 html_css_files = [
     'css/custom.css',
@@ -137,8 +137,8 @@
 # (source start file, target name, title,
 #  author, documentclass [howto, manual, or own class]).
 latex_documents = [
-    (master_doc, 'Bootstrap-Flask.tex', u'Bootstrap-Flask Documentation',
-     u'Grey Li', 'manual'),
+    (master_doc, 'Bootstrap-Flask.tex', 'Bootstrap-Flask Documentation',
+     'Grey Li', 'manual'),
 ]
 
 
@@ -147,7 +147,7 @@
 # One entry per manual page. List of tuples
 # (source start file, name, description, authors, manual section).
 man_pages = [
-    (master_doc, 'bootstrap-flask', u'Bootstrap-Flask Documentation',
+    (master_doc, 'bootstrap-flask', 'Bootstrap-Flask Documentation',
      [author], 1)
 ]
 
@@ -158,7 +158,7 @@
 # (source start file, target name, title, author,
 #  dir menu entry, description, category)
 texinfo_documents = [
-    (master_doc, 'Bootstrap-Flask', u'Bootstrap-Flask Documentation',
+    (master_doc, 'Bootstrap-Flask', 'Bootstrap-Flask Documentation',
      author, 'Bootstrap-Flask', 'One line description of project.',
      'Miscellaneous'),
 ]

diff --git a/docs/macros.rst b/docs/macros.rst
@@ -576,7 +576,7 @@ Here is the full example:
 
     {{ render_table(data, view_url=('view_message', [('message_id', ':id')])) }}
 
-The following arguments are expect to accpet an URL tuple:
+The following arguments are expected to accept a URL tuple:
 
 - ``custom_actions``
 - ``view_url``

diff --git a/examples/README.rst b/examples/README.rst
@@ -6,9 +6,8 @@ Type these commands in the terminal:
 .. code-block:: bash
 
     $ git clone https://github.com/helloflask/bootstrap-flask.git
-    $ cd bootstrap-flask
-    $ pip install -r requirements/examples.txt
-    $ cd examples
+    $ cd bootstrap-flask/examples
+    $ pip install -r requirements.txt
 
 Then based on the Bootstrap version you want to use to run the application.
 
@@ -26,10 +25,8 @@ Bootstrap 5:
 
 Now go to http://localhost:5000.
 
-Live demos of the latest release are:
+Live demos for the example application: https://bootstrap-flask-example.azurewebsites.net/
 
-- `Examples with Bootstrap 4 <http://173.212.198.217/>`_
-- `Examples with Bootstrap 5 <http://109.205.179.12/>`_
 
 Overview of icons
 -----------------

diff --git a/examples/bootstrap4/app.py b/examples/bootstrap4/app.py
@@ -36,6 +36,7 @@ class ExampleForm(FlaskForm):
     datetime_local = DateTimeLocalField()
     time = TimeField()
     month = MonthField()
+    color = ColorField()
     floating = FloatField()
     integer = IntegerField()
     decimal_slider = DecimalRangeField()

diff --git a/examples/bootstrap4/templates/form.html b/examples/bootstrap4/templates/form.html
@@ -11,6 +11,7 @@ <h2>Example Form</h2>
     datetimelocal = DateTimeLocalField()
     time = TimeField()
     month = MonthField()
+    color = ColorField()
     floating = FloatField()
     integer = IntegerField()
     decimalslider = DecimalRangeField()

diff --git a/examples/bootstrap5/app.py b/examples/bootstrap5/app.py
@@ -36,6 +36,7 @@ class ExampleForm(FlaskForm):
     datetime_local = DateTimeLocalField()
     time = TimeField()
     month = MonthField()
+    color = ColorField()
     floating = FloatField()
     integer = IntegerField()
     decimal_slider = DecimalRangeField()

diff --git a/examples/bootstrap5/templates/form.html b/examples/bootstrap5/templates/form.html
@@ -11,6 +11,7 @@ <h2>Example Form</h2>
     datetimelocal = DateTimeLocalField()
     time = TimeField()
     month = MonthField()
+    color = ColorField()
     floating = FloatField()
     integer = IntegerField()
     decimalslider = DecimalRangeField()

diff --git a/requirements/examples.in → examples/requirements.txt b/requirements/examples.in → examples/requirements.txt
diff --git a/flask_bootstrap/__init__.py b/flask_bootstrap/__init__.py
@@ -262,7 +262,7 @@ def create_app():
     bootstrap_version = '5.3.2'
     popper_version = '2.11.8'
     bootstrap_css_integrity = 'sha384-T3c6CoIi6uLrA9TneNEoa7RxnatzjcDSCmG1MXxSR1GAsXEV/Dwwykc2MPK8M2HN'
-    bootstrap_js_integrity = 'sha384-C6RzsynM9kWDrMNeT87bh95OGNyZPhcTNXj1NW7RuBCsyN/o0jlpcV8Qyq46cDfL'
+    bootstrap_js_integrity = 'sha384-BBtl+eGJRgqQAUMxJ7pMwbEyER4l1g+O15P+16Ep7Q9Q+zqX6gSbd85u4mG4QzX+'
     popper_integrity = 'sha384-I7E8VVD/ismYTF4hNIPjVp/Zjvgyol6VFvRkX/vR+Vc4jQkC+hVqc2pM8ODewa9r'
     popper_name = '@popperjs/core'
     static_folder = 'bootstrap5'

diff --git a/requirements/dev.txt b/requirements/dev.txt
@@ -8,39 +8,39 @@
 -r docs.txt
 -r style.txt
 -r tests.txt
-build==0.10.0
+build==1.0.3
     # via pip-tools
 cachetools==5.3.1
     # via tox
-chardet==5.1.0
+chardet==5.2.0
     # via tox
 colorama==0.4.6
     # via tox
 distlib==0.3.7
     # via virtualenv
-filelock==3.12.2
+filelock==3.12.4
     # via
     #   tox
     #   virtualenv
 pip-compile-multi==2.6.3
     # via -r requirements/dev.in
-pip-tools==7.1.0
+pip-tools==7.3.0
     # via pip-compile-multi
-platformdirs==3.9.1
+platformdirs==3.11.0
     # via
     #   tox
     #   virtualenv
-pyproject-api==1.5.3
+pyproject-api==1.6.1
     # via tox
 pyproject-hooks==1.0.0
     # via build
 toposort==1.10
     # via pip-compile-multi
-tox==4.6.4
+tox==4.11.3
     # via -r requirements/dev.in
-virtualenv==20.24.1
+virtualenv==20.24.5
     # via tox
-wheel==0.41.0
+wheel==0.41.2
     # via pip-tools
 
 # The following packages are considered to be unsafe in a requirements file:

diff --git a/requirements/docs.txt b/requirements/docs.txt
@@ -7,11 +7,11 @@
 #
 alabaster==0.7.13
     # via sphinx
-babel==2.12.1
+babel==2.13.0
     # via sphinx
 certifi==2023.7.22
     # via requests
-charset-normalizer==3.2.0
+charset-normalizer==3.3.0
     # via requests
 docutils==0.20.1
     # via sphinx
@@ -23,36 +23,41 @@ jinja2==3.1.2
     # via sphinx
 markupsafe==2.1.3
     # via jinja2
-packaging==23.1
+packaging==23.2
     # via
     #   pallets-sphinx-themes
     #   sphinx
 pallets-sphinx-themes==2.1.1
     # via -r requirements/docs.in
-pygments==2.15.1
+pygments==2.16.1
     # via sphinx
 requests==2.31.0
     # via sphinx
 snowballstemmer==2.2.0
     # via sphinx
-sphinx==7.0.1
+sphinx==7.2.6
     # via
     #   -r requirements/docs.in
     #   pallets-sphinx-themes
+    #   sphinxcontrib-applehelp
+    #   sphinxcontrib-devhelp
+    #   sphinxcontrib-htmlhelp
     #   sphinxcontrib-log-cabinet
-sphinxcontrib-applehelp==1.0.4
+    #   sphinxcontrib-qthelp
+    #   sphinxcontrib-serializinghtml
+sphinxcontrib-applehelp==1.0.7
     # via sphinx
-sphinxcontrib-devhelp==1.0.2
+sphinxcontrib-devhelp==1.0.5
     # via sphinx
-sphinxcontrib-htmlhelp==2.0.1
+sphinxcontrib-htmlhelp==2.0.4
     # 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
+sphinxcontrib-qthelp==1.0.6
     # via sphinx
-sphinxcontrib-serializinghtml==1.1.5
+sphinxcontrib-serializinghtml==1.1.9
     # via sphinx
-urllib3==2.0.4
+urllib3==2.0.6
     # via requests