From 226a5af9a7717ec3ff7b31a009aa7e1a7be4460c Mon Sep 17 00:00:00 2001 From: Grey Li Date: Wed, 11 Oct 2023 20:41:13 +0800 Subject: [PATCH 1/2] Re-organize example requirements file --- examples/README.rst | 5 +- .../examples.in => examples/requirements.txt | 0 requirements/examples.txt | 46 ------------------- 3 files changed, 2 insertions(+), 49 deletions(-) rename requirements/examples.in => examples/requirements.txt (100%) delete mode 100644 requirements/examples.txt diff --git a/examples/README.rst b/examples/README.rst index b290342d..1b7f446d 100644 --- 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. diff --git a/requirements/examples.in b/examples/requirements.txt similarity index 100% rename from requirements/examples.in rename to examples/requirements.txt diff --git a/requirements/examples.txt b/requirements/examples.txt deleted file mode 100644 index 76cbe6de..00000000 --- a/requirements/examples.txt +++ /dev/null @@ -1,46 +0,0 @@ -# SHA1:ffb35e11eb78fc6d03fa35f64989abeeee4280e2 -# -# This file is autogenerated by pip-compile-multi -# To update, run: -# -# pip-compile-multi -# -blinker==1.6.2 - # via flask -bootstrap-flask==2.2.0 - # via -r requirements/examples.in -click==8.1.6 - # via flask -flask==2.3.2 - # via - # -r requirements/examples.in - # bootstrap-flask - # flask-sqlalchemy - # flask-wtf -flask-sqlalchemy==3.0.5 - # via -r requirements/examples.in -flask-wtf==1.1.1 - # via -r requirements/examples.in -greenlet==2.0.2 - # via sqlalchemy -itsdangerous==2.1.2 - # via - # flask - # flask-wtf -jinja2==3.1.2 - # via flask -markupsafe==2.1.3 - # via - # jinja2 - # werkzeug - # wtforms -sqlalchemy==2.0.19 - # via flask-sqlalchemy -typing-extensions==4.7.1 - # via sqlalchemy -werkzeug==2.3.6 - # via flask -wtforms==3.0.1 - # via - # bootstrap-flask - # flask-wtf From bc5f9bcbc9dd488f8c1b129c21fe6f8620cda651 Mon Sep 17 00:00:00 2001 From: Grey Li Date: Wed, 11 Oct 2023 20:47:24 +0800 Subject: [PATCH 2/2] Update deps --- requirements/dev.txt | 18 +++++++------- requirements/docs.txt | 27 +++++++++++--------- requirements/style.txt | 6 ++--- requirements/tests.txt | 30 +++++++++++------------ tests/test_bootstrap4/test_render_form.py | 4 +-- 5 files changed, 44 insertions(+), 41 deletions(-) diff --git a/requirements/dev.txt b/requirements/dev.txt index 6bef48d1..fe1d9ad6 100644 --- 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 index 640ec085..f60cd341 100644 --- 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 diff --git a/requirements/style.txt b/requirements/style.txt index 92cc95d5..5cedb992 100644 --- a/requirements/style.txt +++ b/requirements/style.txt @@ -5,11 +5,11 @@ # # pip-compile-multi # -flake8==6.0.0 +flake8==6.1.0 # via -r requirements/style.in mccabe==0.7.0 # via flake8 -pycodestyle==2.10.0 +pycodestyle==2.11.0 # via flake8 -pyflakes==3.0.1 +pyflakes==3.1.0 # via flake8 diff --git a/requirements/tests.txt b/requirements/tests.txt index c6619d91..52188e45 100644 --- a/requirements/tests.txt +++ b/requirements/tests.txt @@ -5,24 +5,22 @@ # # pip-compile-multi # -blinker==1.6.2 +blinker==1.6.3 # via flask -click==8.1.6 +click==8.1.7 # via flask -coverage[toml]==7.2.7 +coverage[toml]==7.3.2 # via pytest-cov -exceptiongroup==1.1.2 +exceptiongroup==1.1.3 # via pytest -flask==2.3.2 +flask==3.0.0 # via # flask-sqlalchemy # flask-wtf -flask-sqlalchemy==3.0.5 +flask-sqlalchemy==3.1.1 # via -r requirements/tests.in -flask-wtf==1.1.1 +flask-wtf==1.2.1 # via -r requirements/tests.in -greenlet==2.0.2 - # via sqlalchemy iniconfig==2.0.0 # via pytest itsdangerous==2.1.2 @@ -36,25 +34,25 @@ markupsafe==2.1.3 # jinja2 # werkzeug # wtforms -packaging==23.1 +packaging==23.2 # via pytest -pluggy==1.2.0 +pluggy==1.3.0 # via pytest -pytest==7.4.0 +pytest==7.4.2 # via # -r requirements/tests.in # pytest-cov pytest-cov==4.1.0 # via -r requirements/tests.in -sqlalchemy==2.0.19 +sqlalchemy==2.0.21 # via flask-sqlalchemy tomli==2.0.1 # via # coverage # pytest -typing-extensions==4.7.1 +typing-extensions==4.8.0 # via sqlalchemy -werkzeug==2.3.6 +werkzeug==3.0.0 # via flask -wtforms==3.0.1 +wtforms==3.1.0 # via flask-wtf diff --git a/tests/test_bootstrap4/test_render_form.py b/tests/test_bootstrap4/test_render_form.py index 863f399f..82fa738c 100644 --- a/tests/test_bootstrap4/test_render_form.py +++ b/tests/test_bootstrap4/test_render_form.py @@ -1,7 +1,7 @@ from flask import current_app, render_template_string from flask_wtf import FlaskForm -from wtforms import BooleanField, FileField, MultipleFileField,\ - PasswordField, RadioField, StringField, SubmitField, IntegerRangeField,\ +from wtforms import BooleanField, FileField, MultipleFileField, \ + PasswordField, RadioField, StringField, SubmitField, IntegerRangeField, \ DecimalRangeField from wtforms.validators import DataRequired from flask_bootstrap import SwitchField