From 72e6c99cf979db10cf8200abe8c8c86f50b98c57 Mon Sep 17 00:00:00 2001 From: Louis Sautier Date: Sun, 14 Nov 2021 14:54:45 +0100 Subject: [PATCH 01/40] Include CONTRIBUTING.rst in source distributions Fixes the following error: Flask-WTF-1.0.0/docs/contributing.rst:1: WARNING: Problems with "include" directive path: InputError: [Errno 2] No such file or directory: 'CONTRIBUTING.rst'. --- MANIFEST.in | 1 + 1 file changed, 1 insertion(+) diff --git a/MANIFEST.in b/MANIFEST.in index 2396de84..ef078db9 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -1,5 +1,6 @@ include tox.ini include requirements/*.txt +include CONTRIBUTING.rst graft docs prune docs/_build graft examples From 50417f61c9e8c5808db3c9d34cb0c317aafecbda Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 1 Dec 2021 08:04:49 +0000 Subject: [PATCH 02/40] Bump pallets-sphinx-themes from 2.0.1 to 2.0.2 in /requirements Bumps [pallets-sphinx-themes](https://github.com/pallets/pallets-sphinx-themes) from 2.0.1 to 2.0.2. - [Release notes](https://github.com/pallets/pallets-sphinx-themes/releases) - [Changelog](https://github.com/pallets/pallets-sphinx-themes/blob/main/CHANGES.rst) - [Commits](https://github.com/pallets/pallets-sphinx-themes/compare/2.0.1...2.0.2) --- updated-dependencies: - dependency-name: pallets-sphinx-themes dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- requirements/dev.txt | 2 +- requirements/docs.txt | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/requirements/dev.txt b/requirements/dev.txt index eeab9150..67d3fe6d 100644 --- a/requirements/dev.txt +++ b/requirements/dev.txt @@ -58,7 +58,7 @@ packaging==21.0 # pytest # sphinx # tox -pallets-sphinx-themes==2.0.1 +pallets-sphinx-themes==2.0.2 # via -r docs.in pep517==0.11.0 # via pip-tools diff --git a/requirements/docs.txt b/requirements/docs.txt index aa2df231..97ab1b2f 100644 --- a/requirements/docs.txt +++ b/requirements/docs.txt @@ -26,8 +26,8 @@ packaging==21.0 # via # pallets-sphinx-themes # sphinx -pallets-sphinx-themes==2.0.1 - # via -r requirements/docs.in +pallets-sphinx-themes==2.0.2 + # via -r docs.in pygments==2.10.0 # via sphinx pyparsing==2.4.7 @@ -38,14 +38,14 @@ requests==2.26.0 # via sphinx snowballstemmer==2.1.0 # via sphinx -sphinx-issues==1.2.0 - # via -r requirements/docs.in sphinx==4.2.0 # via - # -r requirements/docs.in + # -r docs.in # pallets-sphinx-themes # sphinx-issues # sphinxcontrib-log-cabinet +sphinx-issues==1.2.0 + # via -r docs.in sphinxcontrib-applehelp==1.0.2 # via sphinx sphinxcontrib-devhelp==1.0.2 @@ -55,7 +55,7 @@ sphinxcontrib-htmlhelp==2.0.0 sphinxcontrib-jsmath==1.0.1 # via sphinx sphinxcontrib-log-cabinet==1.0.1 - # via -r requirements/docs.in + # via -r docs.in sphinxcontrib-qthelp==1.0.3 # via sphinx sphinxcontrib-serializinghtml==1.1.5 From cd35c31800f335bc7325a20e88fb7e149bd724f5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 1 Dec 2021 08:05:14 +0000 Subject: [PATCH 03/40] Bump sphinx from 4.2.0 to 4.3.1 in /requirements Bumps [sphinx](https://github.com/sphinx-doc/sphinx) from 4.2.0 to 4.3.1. - [Release notes](https://github.com/sphinx-doc/sphinx/releases) - [Changelog](https://github.com/sphinx-doc/sphinx/blob/4.x/CHANGES) - [Commits](https://github.com/sphinx-doc/sphinx/compare/v4.2.0...v4.3.1) --- updated-dependencies: - dependency-name: sphinx dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- requirements/dev.txt | 2 +- requirements/docs.txt | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/requirements/dev.txt b/requirements/dev.txt index eeab9150..14d39f65 100644 --- a/requirements/dev.txt +++ b/requirements/dev.txt @@ -94,7 +94,7 @@ six==1.16.0 # virtualenv snowballstemmer==2.1.0 # via sphinx -sphinx==4.2.0 +sphinx==4.3.1 # via # -r docs.in # pallets-sphinx-themes diff --git a/requirements/docs.txt b/requirements/docs.txt index aa2df231..ec53335c 100644 --- a/requirements/docs.txt +++ b/requirements/docs.txt @@ -27,7 +27,7 @@ packaging==21.0 # pallets-sphinx-themes # sphinx pallets-sphinx-themes==2.0.1 - # via -r requirements/docs.in + # via -r docs.in pygments==2.10.0 # via sphinx pyparsing==2.4.7 @@ -38,14 +38,14 @@ requests==2.26.0 # via sphinx snowballstemmer==2.1.0 # via sphinx -sphinx-issues==1.2.0 - # via -r requirements/docs.in -sphinx==4.2.0 +sphinx==4.3.1 # via - # -r requirements/docs.in + # -r docs.in # pallets-sphinx-themes # sphinx-issues # sphinxcontrib-log-cabinet +sphinx-issues==1.2.0 + # via -r docs.in sphinxcontrib-applehelp==1.0.2 # via sphinx sphinxcontrib-devhelp==1.0.2 @@ -55,7 +55,7 @@ sphinxcontrib-htmlhelp==2.0.0 sphinxcontrib-jsmath==1.0.1 # via sphinx sphinxcontrib-log-cabinet==1.0.1 - # via -r requirements/docs.in + # via -r docs.in sphinxcontrib-qthelp==1.0.3 # via sphinx sphinxcontrib-serializinghtml==1.1.5 From 6a36255cb95e0d84c285ca95d588004d2cd1ef15 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 1 Dec 2021 08:05:32 +0000 Subject: [PATCH 04/40] Bump pre-commit from 2.15.0 to 2.16.0 in /requirements Bumps [pre-commit](https://github.com/pre-commit/pre-commit) from 2.15.0 to 2.16.0. - [Release notes](https://github.com/pre-commit/pre-commit/releases) - [Changelog](https://github.com/pre-commit/pre-commit/blob/master/CHANGELOG.md) - [Commits](https://github.com/pre-commit/pre-commit/compare/v2.15.0...v2.16.0) --- updated-dependencies: - dependency-name: pre-commit dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- requirements/dev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements/dev.txt b/requirements/dev.txt index eeab9150..17a62992 100644 --- a/requirements/dev.txt +++ b/requirements/dev.txt @@ -70,7 +70,7 @@ pluggy==1.0.0 # via # pytest # tox -pre-commit==2.15.0 +pre-commit==2.16.0 # via -r dev.in py==1.10.0 # via From 560c54507957310f74fe648d4e8ecb5c5c706250 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Mon, 6 Dec 2021 19:43:49 +0000 Subject: [PATCH 05/40] [pre-commit.ci] pre-commit autoupdate MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit updates: - [github.com/asottile/pyupgrade: v2.29.0 → v2.29.1](https://github.com/asottile/pyupgrade/compare/v2.29.0...v2.29.1) - [github.com/psf/black: 21.10b0 → 21.12b0](https://github.com/psf/black/compare/21.10b0...21.12b0) --- .pre-commit-config.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 4bf99c6e..dbe990d8 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -2,7 +2,7 @@ ci: autoupdate_schedule: monthly repos: - repo: https://github.com/asottile/pyupgrade - rev: v2.29.0 + rev: v2.29.1 hooks: - id: pyupgrade args: ["--py36-plus"] @@ -12,7 +12,7 @@ repos: - id: reorder-python-imports args: ["--application-directories", "src"] - repo: https://github.com/psf/black - rev: 21.10b0 + rev: 21.12b0 hooks: - id: black - repo: https://github.com/PyCQA/flake8 From dfd764e82f99d05084eed78354a5e9da2d1f42e7 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 1 Jan 2022 08:06:36 +0000 Subject: [PATCH 06/40] Bump sphinx from 4.3.1 to 4.3.2 in /requirements Bumps [sphinx](https://github.com/sphinx-doc/sphinx) from 4.3.1 to 4.3.2. - [Release notes](https://github.com/sphinx-doc/sphinx/releases) - [Changelog](https://github.com/sphinx-doc/sphinx/blob/4.x/CHANGES) - [Commits](https://github.com/sphinx-doc/sphinx/compare/v4.3.1...v4.3.2) --- updated-dependencies: - dependency-name: sphinx dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- requirements/dev.txt | 2 +- requirements/docs.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/requirements/dev.txt b/requirements/dev.txt index 875264af..3a68acc7 100644 --- a/requirements/dev.txt +++ b/requirements/dev.txt @@ -94,7 +94,7 @@ six==1.16.0 # virtualenv snowballstemmer==2.1.0 # via sphinx -sphinx==4.3.1 +sphinx==4.3.2 # via # -r docs.in # pallets-sphinx-themes diff --git a/requirements/docs.txt b/requirements/docs.txt index 2d81cff9..da95ac64 100644 --- a/requirements/docs.txt +++ b/requirements/docs.txt @@ -38,7 +38,7 @@ requests==2.26.0 # via sphinx snowballstemmer==2.1.0 # via sphinx -sphinx==4.3.1 +sphinx==4.3.2 # via # -r docs.in # pallets-sphinx-themes From 37150ce475ee08798dcaa9b8055521075de03a73 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 1 Jan 2022 08:07:08 +0000 Subject: [PATCH 07/40] Bump tox from 3.24.4 to 3.24.5 in /requirements Bumps [tox](https://github.com/tox-dev/tox) from 3.24.4 to 3.24.5. - [Release notes](https://github.com/tox-dev/tox/releases) - [Changelog](https://github.com/tox-dev/tox/blob/master/docs/changelog.rst) - [Commits](https://github.com/tox-dev/tox/compare/3.24.4...3.24.5) --- updated-dependencies: - dependency-name: tox dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- requirements/dev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements/dev.txt b/requirements/dev.txt index 875264af..99b33aba 100644 --- a/requirements/dev.txt +++ b/requirements/dev.txt @@ -123,7 +123,7 @@ toml==0.10.2 # tox tomli==1.2.1 # via pep517 -tox==3.24.4 +tox==3.24.5 # via -r dev.in urllib3==1.26.7 # via requests From f97645b9bfae35e78ad7d0966ce91a13132b3fb8 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Mon, 3 Jan 2022 19:33:26 +0000 Subject: [PATCH 08/40] [pre-commit.ci] pre-commit autoupdate MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit updates: - [github.com/asottile/pyupgrade: v2.29.1 → v2.31.0](https://github.com/asottile/pyupgrade/compare/v2.29.1...v2.31.0) - [github.com/pre-commit/pre-commit-hooks: v4.0.1 → v4.1.0](https://github.com/pre-commit/pre-commit-hooks/compare/v4.0.1...v4.1.0) --- .pre-commit-config.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index dbe990d8..353ef898 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -2,7 +2,7 @@ ci: autoupdate_schedule: monthly repos: - repo: https://github.com/asottile/pyupgrade - rev: v2.29.1 + rev: v2.31.0 hooks: - id: pyupgrade args: ["--py36-plus"] @@ -23,7 +23,7 @@ repos: - flake8-bugbear - flake8-implicit-str-concat - repo: https://github.com/pre-commit/pre-commit-hooks - rev: v4.0.1 + rev: v4.1.0 hooks: - id: fix-byte-order-marker - id: trailing-whitespace From ab052e16b5c64d17bde0670a5568feadd21454e1 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 1 Feb 2022 08:02:30 +0000 Subject: [PATCH 09/40] Bump sphinx-issues from 1.2.0 to 3.0.1 in /requirements Bumps [sphinx-issues](https://github.com/sloria/sphinx-issues) from 1.2.0 to 3.0.1. - [Release notes](https://github.com/sloria/sphinx-issues/releases) - [Commits](https://github.com/sloria/sphinx-issues/compare/1.2.0...3.0.1) --- updated-dependencies: - dependency-name: sphinx-issues dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- requirements/dev.txt | 2 +- requirements/docs.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/requirements/dev.txt b/requirements/dev.txt index 4c75c45b..1d6e1430 100644 --- a/requirements/dev.txt +++ b/requirements/dev.txt @@ -100,7 +100,7 @@ sphinx==4.3.2 # pallets-sphinx-themes # sphinx-issues # sphinxcontrib-log-cabinet -sphinx-issues==1.2.0 +sphinx-issues==3.0.1 # via -r docs.in sphinxcontrib-applehelp==1.0.2 # via sphinx diff --git a/requirements/docs.txt b/requirements/docs.txt index da95ac64..5f7d4e14 100644 --- a/requirements/docs.txt +++ b/requirements/docs.txt @@ -44,7 +44,7 @@ sphinx==4.3.2 # pallets-sphinx-themes # sphinx-issues # sphinxcontrib-log-cabinet -sphinx-issues==1.2.0 +sphinx-issues==3.0.1 # via -r docs.in sphinxcontrib-applehelp==1.0.2 # via sphinx From c1ac1ad680e2f3c299f5fec078360fb5c67fce02 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 1 Feb 2022 08:02:50 +0000 Subject: [PATCH 10/40] Bump pre-commit from 2.16.0 to 2.17.0 in /requirements Bumps [pre-commit](https://github.com/pre-commit/pre-commit) from 2.16.0 to 2.17.0. - [Release notes](https://github.com/pre-commit/pre-commit/releases) - [Changelog](https://github.com/pre-commit/pre-commit/blob/master/CHANGELOG.md) - [Commits](https://github.com/pre-commit/pre-commit/compare/v2.16.0...v2.17.0) --- updated-dependencies: - dependency-name: pre-commit dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- requirements/dev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements/dev.txt b/requirements/dev.txt index 4c75c45b..3a317651 100644 --- a/requirements/dev.txt +++ b/requirements/dev.txt @@ -70,7 +70,7 @@ pluggy==1.0.0 # via # pytest # tox -pre-commit==2.16.0 +pre-commit==2.17.0 # via -r dev.in py==1.10.0 # via From c443c8a3e22ec41cb919e789d8f1c8ab079c96d7 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 1 Feb 2022 08:03:16 +0000 Subject: [PATCH 11/40] Bump sphinx from 4.3.2 to 4.4.0 in /requirements Bumps [sphinx](https://github.com/sphinx-doc/sphinx) from 4.3.2 to 4.4.0. - [Release notes](https://github.com/sphinx-doc/sphinx/releases) - [Changelog](https://github.com/sphinx-doc/sphinx/blob/4.x/CHANGES) - [Commits](https://github.com/sphinx-doc/sphinx/compare/v4.3.2...v4.4.0) --- updated-dependencies: - dependency-name: sphinx dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- requirements/dev.txt | 2 +- requirements/docs.txt | 5 +---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/requirements/dev.txt b/requirements/dev.txt index 4c75c45b..253b8690 100644 --- a/requirements/dev.txt +++ b/requirements/dev.txt @@ -94,7 +94,7 @@ six==1.16.0 # virtualenv snowballstemmer==2.1.0 # via sphinx -sphinx==4.3.2 +sphinx==4.4.0 # via # -r docs.in # pallets-sphinx-themes diff --git a/requirements/docs.txt b/requirements/docs.txt index da95ac64..5125d1e6 100644 --- a/requirements/docs.txt +++ b/requirements/docs.txt @@ -38,7 +38,7 @@ requests==2.26.0 # via sphinx snowballstemmer==2.1.0 # via sphinx -sphinx==4.3.2 +sphinx==4.4.0 # via # -r docs.in # pallets-sphinx-themes @@ -62,6 +62,3 @@ sphinxcontrib-serializinghtml==1.1.5 # via sphinx urllib3==1.26.7 # via requests - -# The following packages are considered to be unsafe in a requirements file: -# setuptools From 27f60adc0986309d34aa0304e54ce2bb14d03d8b Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Mon, 7 Feb 2022 19:42:31 +0000 Subject: [PATCH 12/40] [pre-commit.ci] pre-commit autoupdate MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit updates: - [github.com/asottile/reorder_python_imports: v2.6.0 → v2.7.1](https://github.com/asottile/reorder_python_imports/compare/v2.6.0...v2.7.1) - [github.com/psf/black: 21.12b0 → 22.1.0](https://github.com/psf/black/compare/21.12b0...22.1.0) --- .pre-commit-config.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 353ef898..53218773 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -7,12 +7,12 @@ repos: - id: pyupgrade args: ["--py36-plus"] - repo: https://github.com/asottile/reorder_python_imports - rev: v2.6.0 + rev: v2.7.1 hooks: - id: reorder-python-imports args: ["--application-directories", "src"] - repo: https://github.com/psf/black - rev: 21.12b0 + rev: 22.1.0 hooks: - id: black - repo: https://github.com/PyCQA/flake8 From b2121675768bc4e39434075a9ae226f00f641bec Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 1 Mar 2022 08:03:42 +0000 Subject: [PATCH 13/40] Bump pip-tools from 6.4.0 to 6.5.1 in /requirements Bumps [pip-tools](https://github.com/jazzband/pip-tools) from 6.4.0 to 6.5.1. - [Release notes](https://github.com/jazzband/pip-tools/releases) - [Changelog](https://github.com/jazzband/pip-tools/blob/master/CHANGELOG.md) - [Commits](https://github.com/jazzband/pip-tools/compare/6.4.0...6.5.1) --- updated-dependencies: - dependency-name: pip-tools dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- requirements/dev.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/requirements/dev.txt b/requirements/dev.txt index aaa99835..10f76fc8 100644 --- a/requirements/dev.txt +++ b/requirements/dev.txt @@ -10,7 +10,7 @@ attrs==21.2.0 # via pytest babel==2.9.1 # via sphinx -backports.entry-points-selectable==1.1.0 +backports-entry-points-selectable==1.1.0 # via virtualenv certifi==2021.5.30 # via requests @@ -62,7 +62,7 @@ pallets-sphinx-themes==2.0.2 # via -r docs.in pep517==0.11.0 # via pip-tools -pip-tools==6.4.0 +pip-tools==6.5.1 # via -r dev.in platformdirs==2.4.0 # via virtualenv From 515bac9b45823d60a06931f43b14ce7b500aff0c Mon Sep 17 00:00:00 2001 From: David Lord Date: Thu, 31 Mar 2022 11:15:33 -0700 Subject: [PATCH 14/40] start version 1.1.0 --- docs/changes.rst | 6 ++++++ src/flask_wtf/__init__.py | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/docs/changes.rst b/docs/changes.rst index b1096623..9ea7724f 100644 --- a/docs/changes.rst +++ b/docs/changes.rst @@ -1,6 +1,12 @@ Changes ======= +Version 1.1.0 +------------- + +Unreleased + + Version 1.0.1 ------------- diff --git a/src/flask_wtf/__init__.py b/src/flask_wtf/__init__.py index 8efb3643..be3ec557 100644 --- a/src/flask_wtf/__init__.py +++ b/src/flask_wtf/__init__.py @@ -5,4 +5,4 @@ from .recaptcha import RecaptchaField from .recaptcha import RecaptchaWidget -__version__ = "1.0.1" +__version__ = "1.1.0.dev0" From ff7529ce1b5b8131d714d8ae494a9e7a6eb17a07 Mon Sep 17 00:00:00 2001 From: David Lord Date: Thu, 31 Mar 2022 11:17:02 -0700 Subject: [PATCH 15/40] unpin pytest --- requirements/dev.txt | 6 ++++-- requirements/tests.in | 2 +- requirements/tests.txt | 6 +++--- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/requirements/dev.txt b/requirements/dev.txt index 53977845..f79a7c84 100644 --- a/requirements/dev.txt +++ b/requirements/dev.txt @@ -39,8 +39,10 @@ six==1.16.0 # via # tox # virtualenv -tomli==2.0.1 - # via pep517 +toml==0.10.2 + # via + # pre-commit + # tox toposort==1.7 # via pip-compile-multi tox==3.24.5 diff --git a/requirements/tests.in b/requirements/tests.in index a8241a63..e079f8a6 100644 --- a/requirements/tests.in +++ b/requirements/tests.in @@ -1 +1 @@ -pytest<7 +pytest diff --git a/requirements/tests.txt b/requirements/tests.txt index 33a73a89..ad11afe0 100644 --- a/requirements/tests.txt +++ b/requirements/tests.txt @@ -1,4 +1,4 @@ -# SHA1:43b07f68ee4dcf187dce9de79fc8dd462f1c99d6 +# SHA1:0eaa389e1fdb3a1917c0f987514bd561be5718ee # # This file is autogenerated by pip-compile-multi # To update, run: @@ -17,7 +17,7 @@ py==1.11.0 # via pytest pyparsing==3.0.7 # via packaging -pytest==6.2.5 +pytest==7.1.1 # via -r requirements/tests.in -toml==0.10.2 +tomli==2.0.1 # via pytest From 8458f40f89ad0e4cafa7a5de1aa0b526e2cdd991 Mon Sep 17 00:00:00 2001 From: David Lord Date: Thu, 31 Mar 2022 11:19:38 -0700 Subject: [PATCH 16/40] drop Python 3.6 --- .github/workflows/tests.yaml | 1 - .pre-commit-config.yaml | 2 +- docs/changes.rst | 2 ++ tox.ini | 2 +- 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml index bc6237a9..a1483ce6 100644 --- a/.github/workflows/tests.yaml +++ b/.github/workflows/tests.yaml @@ -23,7 +23,6 @@ jobs: - {name: '3.9', python: '3.9', tox: py39} - {name: '3.8', python: '3.8', tox: py38} - {name: '3.7', python: '3.7', tox: py37} - - {name: '3.6', python: '3.6', tox: py36} - {name: 'PyPy', python: 'pypy-3.8', tox: pypy38} steps: - uses: actions/checkout@v3 diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 346d5394..86ff5d01 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -5,7 +5,7 @@ repos: rev: v2.31.1 hooks: - id: pyupgrade - args: ["--py36-plus"] + args: ["--py37-plus"] - repo: https://github.com/asottile/reorder_python_imports rev: v3.0.1 hooks: diff --git a/docs/changes.rst b/docs/changes.rst index 9ea7724f..5d1e1c7b 100644 --- a/docs/changes.rst +++ b/docs/changes.rst @@ -6,6 +6,8 @@ Version 1.1.0 Unreleased +- Drop support for Python 3.6. + Version 1.0.1 ------------- diff --git a/tox.ini b/tox.ini index 926f2b8f..7293c108 100644 --- a/tox.ini +++ b/tox.ini @@ -1,6 +1,6 @@ [tox] envlist = - py3{11,10,9,8,7,6},pypy3{8,7} + py3{11,10,9,8,7},pypy3{8,7} py-{babelex,no-babel} style docs From 872374a94f69f4cd2d86909687bb2736ff51594b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 31 Mar 2022 12:06:37 -0700 Subject: [PATCH 17/40] Bump dessant/lock-threads from 2 to 3 (#515) --- .github/workflows/lock.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/lock.yaml b/.github/workflows/lock.yaml index 7128f382..b4f76338 100644 --- a/.github/workflows/lock.yaml +++ b/.github/workflows/lock.yaml @@ -8,8 +8,8 @@ jobs: lock: runs-on: ubuntu-latest steps: - - uses: dessant/lock-threads@v2 + - uses: dessant/lock-threads@v3 with: github-token: ${{ github.token }} - issue-lock-inactive-days: 14 - pr-lock-inactive-days: 14 + issue-inactive-days: 14 + pr-inactive-days: 14 From d93ac52aa7ca3c05c9144847793c13f6e9c27c11 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Mon, 4 Apr 2022 19:36:10 +0000 Subject: [PATCH 18/40] [pre-commit.ci] pre-commit autoupdate MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit updates: - [github.com/peterdemin/pip-compile-multi: v2.4.3 → v2.4.5](https://github.com/peterdemin/pip-compile-multi/compare/v2.4.3...v2.4.5) --- .pre-commit-config.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 86ff5d01..afa64d1e 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -24,7 +24,7 @@ repos: - flake8-bugbear - flake8-implicit-str-concat - repo: https://github.com/peterdemin/pip-compile-multi - rev: v2.4.3 + rev: v2.4.5 hooks: - id: pip-compile-multi-verify - repo: https://github.com/pre-commit/pre-commit-hooks From 458ae317eb67666c6dca6280857a40df01932a1f Mon Sep 17 00:00:00 2001 From: SkylorTang <739230854@qq.com> Date: Wed, 20 Oct 2021 17:49:56 +0800 Subject: [PATCH 19/40] Add extra_validators parameter to validate_on_submit FlaskForm validate_on_submit add parameter extra_validators to be compatible with flask2.0 --- src/flask_wtf/form.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/flask_wtf/form.py b/src/flask_wtf/form.py index e74ebbdc..1868fd50 100644 --- a/src/flask_wtf/form.py +++ b/src/flask_wtf/form.py @@ -79,11 +79,11 @@ def is_submitted(self): return _is_submitted() - def validate_on_submit(self): + def validate_on_submit(self, extra_validators=None): """Call :meth:`validate` only if the form is submitted. This is a shortcut for ``form.is_submitted() and form.validate()``. """ - return self.is_submitted() and self.validate() + return self.is_submitted() and self.validate(extra_validators) def hidden_tag(self, *fields): """Render the form's hidden fields in one call. From ec4873b4f64ff2bc7d78c429240e680e78390c76 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89loi=20Rivard?= Date: Thu, 14 Apr 2022 17:36:53 +0200 Subject: [PATCH 20/40] Changelog --- docs/changes.rst | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/docs/changes.rst b/docs/changes.rst index 5d1e1c7b..c8487490 100644 --- a/docs/changes.rst +++ b/docs/changes.rst @@ -1,6 +1,14 @@ Changes ======= +Unreleased +---------- + +Unreleased + +- ``validate_on_submit`` takes a ``extra_validators`` parameters :pr:`479` + + Version 1.1.0 ------------- From e0fe742be3750590d80536afd772626c5b8858f2 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Mon, 2 May 2022 19:49:08 +0000 Subject: [PATCH 21/40] [pre-commit.ci] pre-commit autoupdate MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit updates: - [github.com/asottile/pyupgrade: v2.31.1 → v2.32.0](https://github.com/asottile/pyupgrade/compare/v2.31.1...v2.32.0) - [github.com/asottile/reorder_python_imports: v3.0.1 → v3.1.0](https://github.com/asottile/reorder_python_imports/compare/v3.0.1...v3.1.0) - [github.com/pre-commit/pre-commit-hooks: v4.1.0 → v4.2.0](https://github.com/pre-commit/pre-commit-hooks/compare/v4.1.0...v4.2.0) --- .pre-commit-config.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index afa64d1e..a15e083e 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -2,12 +2,12 @@ ci: autoupdate_schedule: monthly repos: - repo: https://github.com/asottile/pyupgrade - rev: v2.31.1 + rev: v2.32.0 hooks: - id: pyupgrade args: ["--py37-plus"] - repo: https://github.com/asottile/reorder_python_imports - rev: v3.0.1 + rev: v3.1.0 hooks: - id: reorder-python-imports args: ["--application-directories", "src"] @@ -28,7 +28,7 @@ repos: hooks: - id: pip-compile-multi-verify - repo: https://github.com/pre-commit/pre-commit-hooks - rev: v4.1.0 + rev: v4.2.0 hooks: - id: fix-byte-order-marker - id: trailing-whitespace From 18c2673208c1487c417df93aa68952c8051c3e4a Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Mon, 6 Jun 2022 19:41:57 +0000 Subject: [PATCH 22/40] [pre-commit.ci] pre-commit autoupdate MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit updates: - [github.com/asottile/pyupgrade: v2.32.0 → v2.32.1](https://github.com/asottile/pyupgrade/compare/v2.32.0...v2.32.1) --- .pre-commit-config.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index a15e083e..dc5b5e90 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -2,7 +2,7 @@ ci: autoupdate_schedule: monthly repos: - repo: https://github.com/asottile/pyupgrade - rev: v2.32.0 + rev: v2.32.1 hooks: - id: pyupgrade args: ["--py37-plus"] From b99934baa87a4c05e48a5d5bcfb3e5e645d2db02 Mon Sep 17 00:00:00 2001 From: Dosenpfand Date: Mon, 13 Jun 2022 16:10:27 +0200 Subject: [PATCH 23/40] Change TextField to StringField --- examples/babel/app.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/examples/babel/app.py b/examples/babel/app.py index 42af360b..58c76673 100644 --- a/examples/babel/app.py +++ b/examples/babel/app.py @@ -3,14 +3,14 @@ from flask import request from flask_babel import Babel from flask_babel import lazy_gettext as _ -from wtforms import TextField +from wtforms import StringField from wtforms.validators import DataRequired from flask_wtf import FlaskForm class BabelForm(FlaskForm): - name = TextField(_("Name"), validators=[DataRequired()]) + name = StringField(_("Name"), validators=[DataRequired()]) DEBUG = True From 8cda77c00ed7dfd45187544d16b82542cc552950 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 1 Jul 2022 16:08:13 +0000 Subject: [PATCH 24/40] Bump actions/setup-python from 3 to 4 Bumps [actions/setup-python](https://github.com/actions/setup-python) from 3 to 4. - [Release notes](https://github.com/actions/setup-python/releases) - [Commits](https://github.com/actions/setup-python/compare/v3...v4) --- updated-dependencies: - dependency-name: actions/setup-python dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/tests.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml index a1483ce6..a7141f8c 100644 --- a/.github/workflows/tests.yaml +++ b/.github/workflows/tests.yaml @@ -26,7 +26,7 @@ jobs: - {name: 'PyPy', python: 'pypy-3.8', tox: pypy38} steps: - uses: actions/checkout@v3 - - uses: actions/setup-python@v3 + - uses: actions/setup-python@v4 with: python-version: ${{ matrix.python }} cache: 'pip' From 4a286c21c708db62738f6392a73f517eb213d1e8 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Mon, 4 Jul 2022 21:06:10 +0000 Subject: [PATCH 25/40] [pre-commit.ci] pre-commit autoupdate MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit updates: - [github.com/asottile/pyupgrade: v2.32.1 → v2.34.0](https://github.com/asottile/pyupgrade/compare/v2.32.1...v2.34.0) - [github.com/asottile/reorder_python_imports: v3.1.0 → v3.3.0](https://github.com/asottile/reorder_python_imports/compare/v3.1.0...v3.3.0) - [github.com/psf/black: 22.3.0 → 22.6.0](https://github.com/psf/black/compare/22.3.0...22.6.0) - [github.com/pre-commit/pre-commit-hooks: v4.2.0 → v4.3.0](https://github.com/pre-commit/pre-commit-hooks/compare/v4.2.0...v4.3.0) --- .pre-commit-config.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index dc5b5e90..234c8345 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -2,18 +2,18 @@ ci: autoupdate_schedule: monthly repos: - repo: https://github.com/asottile/pyupgrade - rev: v2.32.1 + rev: v2.34.0 hooks: - id: pyupgrade args: ["--py37-plus"] - repo: https://github.com/asottile/reorder_python_imports - rev: v3.1.0 + rev: v3.3.0 hooks: - id: reorder-python-imports args: ["--application-directories", "src"] additional_dependencies: ["setuptools>60.9"] - repo: https://github.com/psf/black - rev: 22.3.0 + rev: 22.6.0 hooks: - id: black - repo: https://github.com/PyCQA/flake8 @@ -28,7 +28,7 @@ repos: hooks: - id: pip-compile-multi-verify - repo: https://github.com/pre-commit/pre-commit-hooks - rev: v4.2.0 + rev: v4.3.0 hooks: - id: fix-byte-order-marker - id: trailing-whitespace From 124be0108e5b16d26560093840a1e13317972fd2 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Mon, 1 Aug 2022 21:44:41 +0000 Subject: [PATCH 26/40] [pre-commit.ci] pre-commit autoupdate MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit updates: - [github.com/asottile/pyupgrade: v2.34.0 → v2.37.3](https://github.com/asottile/pyupgrade/compare/v2.34.0...v2.37.3) - [github.com/asottile/reorder_python_imports: v3.3.0 → v3.8.2](https://github.com/asottile/reorder_python_imports/compare/v3.3.0...v3.8.2) - [github.com/PyCQA/flake8: 4.0.1 → 5.0.2](https://github.com/PyCQA/flake8/compare/4.0.1...5.0.2) - [github.com/peterdemin/pip-compile-multi: v2.4.5 → v2.4.6](https://github.com/peterdemin/pip-compile-multi/compare/v2.4.5...v2.4.6) --- .pre-commit-config.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 234c8345..62e553d6 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -2,12 +2,12 @@ ci: autoupdate_schedule: monthly repos: - repo: https://github.com/asottile/pyupgrade - rev: v2.34.0 + rev: v2.37.3 hooks: - id: pyupgrade args: ["--py37-plus"] - repo: https://github.com/asottile/reorder_python_imports - rev: v3.3.0 + rev: v3.8.2 hooks: - id: reorder-python-imports args: ["--application-directories", "src"] @@ -17,14 +17,14 @@ repos: hooks: - id: black - repo: https://github.com/PyCQA/flake8 - rev: 4.0.1 + rev: 5.0.2 hooks: - id: flake8 additional_dependencies: - flake8-bugbear - flake8-implicit-str-concat - repo: https://github.com/peterdemin/pip-compile-multi - rev: v2.4.5 + rev: v2.4.6 hooks: - id: pip-compile-multi-verify - repo: https://github.com/pre-commit/pre-commit-hooks From c94e40543ee811d20734f4873fa40762862b3652 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 8 Dec 2022 14:16:46 +0000 Subject: [PATCH 27/40] Bump certifi from 2021.10.8 to 2022.12.7 in /requirements Bumps [certifi](https://github.com/certifi/python-certifi) from 2021.10.8 to 2022.12.7. - [Release notes](https://github.com/certifi/python-certifi/releases) - [Commits](https://github.com/certifi/python-certifi/compare/2021.10.08...2022.12.07) --- updated-dependencies: - dependency-name: certifi dependency-type: indirect ... Signed-off-by: dependabot[bot] --- requirements/docs.txt | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/requirements/docs.txt b/requirements/docs.txt index 8b24c6f3..223f94e8 100644 --- a/requirements/docs.txt +++ b/requirements/docs.txt @@ -9,7 +9,7 @@ alabaster==0.7.12 # via sphinx babel==2.9.1 # via sphinx -certifi==2021.10.8 +certifi==2022.12.7 # via requests charset-normalizer==2.0.12 # via requests @@ -28,7 +28,7 @@ packaging==21.3 # pallets-sphinx-themes # sphinx pallets-sphinx-themes==2.0.2 - # via -r requirements/docs.in + # via -r docs.in pygments==2.11.2 # via sphinx pyparsing==3.0.7 @@ -41,12 +41,12 @@ snowballstemmer==2.2.0 # via sphinx sphinx==4.5.0 # via - # -r requirements/docs.in + # -r docs.in # pallets-sphinx-themes # sphinx-issues # sphinxcontrib-log-cabinet sphinx-issues==3.0.1 - # via -r requirements/docs.in + # via -r docs.in sphinxcontrib-applehelp==1.0.2 # via sphinx sphinxcontrib-devhelp==1.0.2 @@ -56,7 +56,7 @@ sphinxcontrib-htmlhelp==2.0.0 sphinxcontrib-jsmath==1.0.1 # via sphinx sphinxcontrib-log-cabinet==1.0.1 - # via -r requirements/docs.in + # via -r docs.in sphinxcontrib-qthelp==1.0.3 # via sphinx sphinxcontrib-serializinghtml==1.1.5 From dc9dea6c1f39597998e2d0b27de3d200f929fb35 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89loi=20Rivard?= Date: Sat, 24 Dec 2022 14:25:20 +0100 Subject: [PATCH 28/40] Fixed unit tests. Some routes were defined after the app first request. --- tests/test_form.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/tests/test_form.py b/tests/test_form.py index 2c2cbd3d..03d0c91f 100644 --- a/tests/test_form.py +++ b/tests/test_form.py @@ -109,8 +109,6 @@ def default(): assert not form.validate_on_submit() assert "This field is required." in form.name.errors - client.post("/default", data={"name": " "}) - @app.route("/es", methods=["POST"]) def es(): app.config["WTF_I18N_ENABLED"] = False @@ -128,4 +126,5 @@ class NameForm(MyBaseForm): assert not form.validate_on_submit() assert "Este campo es obligatorio." in form.name.errors + client.post("/default", data={"name": " "}) client.post("/es", data={"name": " "}) From 146bd1f758f5060926c6f1410959d9e63bbacf90 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89loi=20Rivard?= Date: Sat, 24 Dec 2022 14:33:40 +0100 Subject: [PATCH 29/40] Stop supporting Flask-Babelex --- docs/changes.rst | 1 + src/flask_wtf/i18n.py | 6 +----- tests/test_i18n.py | 9 ++------- tox.ini | 8 +------- 4 files changed, 5 insertions(+), 19 deletions(-) diff --git a/docs/changes.rst b/docs/changes.rst index c8487490..9e0d21d7 100644 --- a/docs/changes.rst +++ b/docs/changes.rst @@ -7,6 +7,7 @@ Unreleased Unreleased - ``validate_on_submit`` takes a ``extra_validators`` parameters :pr:`479` +- Stop supporting Flask-Babelex :pr:`540` Version 1.1.0 diff --git a/src/flask_wtf/i18n.py b/src/flask_wtf/i18n.py index 79432a1e..1cc0e9c5 100644 --- a/src/flask_wtf/i18n.py +++ b/src/flask_wtf/i18n.py @@ -1,13 +1,9 @@ from babel import support from flask import current_app from flask import request +from flask_babel import get_locale from wtforms.i18n import messages_path -try: - from flask_babel import get_locale -except ImportError: - from flask_babelex import get_locale - __all__ = ("Translations", "translations") diff --git a/tests/test_i18n.py b/tests/test_i18n.py index ef432d60..5a2c3d98 100644 --- a/tests/test_i18n.py +++ b/tests/test_i18n.py @@ -6,9 +6,7 @@ from flask_wtf import FlaskForm -pytest.importorskip( - "flask_wtf.i18n", reason="Neither Flask-Babel nor Flask-BabelEx is installed." -) +pytest.importorskip("flask_wtf.i18n", reason="Flask-Babel is not installed.") class NameForm(FlaskForm): @@ -32,10 +30,7 @@ def test_i18n(app, client): try: from flask_babel import Babel except ImportError: - try: - from flask_babelex import Babel - except ImportError: - pytest.skip("Flask-Babel or Flask-BabelEx must be installed.") + pytest.skip("Flask-Babel must be installed.") babel = Babel(app) diff --git a/tox.ini b/tox.ini index 7293c108..2e6de252 100644 --- a/tox.ini +++ b/tox.ini @@ -1,7 +1,7 @@ [tox] envlist = py3{11,10,9,8,7},pypy3{8,7} - py-{babelex,no-babel} + py-{no-babel} style docs @@ -12,12 +12,6 @@ deps = Flask-Uploads commands = pytest -v --tb=short --basetemp={envtmpdir} {posargs} -[testenv:py-babelex] -deps = - -r requirements/tests.txt - Flask-BabelEx -commands = pytest -v --tb=short --basetemp={envtmpdir} {posargs} - [testenv:py-no-babel] deps = -r requirements/tests.txt commands = pytest -v --tb=short --basetemp={envtmpdir} {posargs} From 36cedcc7a6b9cf724aad9256d8f9bc2555e1385c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89loi=20Rivard?= Date: Sat, 24 Dec 2022 14:39:19 +0100 Subject: [PATCH 30/40] Updated precommit --- .pre-commit-config.yaml | 12 ++++++------ src/flask_wtf/form.py | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 62e553d6..95e20bf2 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -2,33 +2,33 @@ ci: autoupdate_schedule: monthly repos: - repo: https://github.com/asottile/pyupgrade - rev: v2.37.3 + rev: v3.3.1 hooks: - id: pyupgrade args: ["--py37-plus"] - repo: https://github.com/asottile/reorder_python_imports - rev: v3.8.2 + rev: v3.9.0 hooks: - id: reorder-python-imports args: ["--application-directories", "src"] additional_dependencies: ["setuptools>60.9"] - repo: https://github.com/psf/black - rev: 22.6.0 + rev: 22.12.0 hooks: - id: black - repo: https://github.com/PyCQA/flake8 - rev: 5.0.2 + rev: 6.0.0 hooks: - id: flake8 additional_dependencies: - flake8-bugbear - flake8-implicit-str-concat - repo: https://github.com/peterdemin/pip-compile-multi - rev: v2.4.6 + rev: v2.6.1 hooks: - id: pip-compile-multi-verify - repo: https://github.com/pre-commit/pre-commit-hooks - rev: v4.3.0 + rev: v4.4.0 hooks: - id: fix-byte-order-marker - id: trailing-whitespace diff --git a/src/flask_wtf/form.py b/src/flask_wtf/form.py index 1868fd50..a443d81b 100644 --- a/src/flask_wtf/form.py +++ b/src/flask_wtf/form.py @@ -65,7 +65,7 @@ def wrap_formdata(self, form, formdata): def get_translations(self, form): if not current_app.config.get("WTF_I18N_ENABLED", True): - return super(FlaskForm.Meta, self).get_translations(form) + return super().get_translations(form) return translations From e9cbbe5801bc29d71b87c5716ae7a75774fd6554 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89loi=20Rivard?= Date: Sat, 24 Dec 2022 14:42:44 +0100 Subject: [PATCH 31/40] Python 3.11 tests with GHA --- .github/workflows/tests.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml index a7141f8c..ecf1c97d 100644 --- a/.github/workflows/tests.yaml +++ b/.github/workflows/tests.yaml @@ -19,7 +19,8 @@ jobs: fail-fast: false matrix: include: - - {name: '3.10', python: '3.10', tox: 'py310,py-babelex,py-no-babel'} + - {name: '3.11', python: '3.11', tox: 'py311,py-no-babel'} + - {name: '3.10', python: '3.10', tox: py310} - {name: '3.9', python: '3.9', tox: py39} - {name: '3.8', python: '3.8', tox: py38} - {name: '3.7', python: '3.7', tox: py37} From c76ee3eef9c467ece0c78f50875f8a93e9acd0a5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 26 Dec 2022 22:01:20 +0000 Subject: [PATCH 32/40] Bump wheel from 0.37.1 to 0.38.1 in /requirements Bumps [wheel](https://github.com/pypa/wheel) from 0.37.1 to 0.38.1. - [Release notes](https://github.com/pypa/wheel/releases) - [Changelog](https://github.com/pypa/wheel/blob/main/docs/news.rst) - [Commits](https://github.com/pypa/wheel/compare/0.37.1...0.38.1) --- updated-dependencies: - dependency-name: wheel dependency-type: indirect ... Signed-off-by: dependabot[bot] --- requirements/dev.txt | 88 +++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 82 insertions(+), 6 deletions(-) diff --git a/requirements/dev.txt b/requirements/dev.txt index f79a7c84..e524282d 100644 --- a/requirements/dev.txt +++ b/requirements/dev.txt @@ -5,53 +5,129 @@ # # pip-compile-multi # --r docs.txt --r tests.txt +alabaster==0.7.12 + # via sphinx +attrs==21.4.0 + # via pytest +babel==2.9.1 + # via sphinx +certifi==2022.12.7 + # via requests cfgv==3.3.1 # via pre-commit +charset-normalizer==2.0.12 + # via requests click==8.1.1 # via # pip-compile-multi # pip-tools distlib==0.3.4 # via virtualenv +docutils==0.17.1 + # via sphinx filelock==3.6.0 # via # tox # virtualenv identify==2.4.12 # via pre-commit +idna==3.3 + # via requests +imagesize==1.3.0 + # via sphinx +iniconfig==1.1.1 + # via pytest +jinja2==3.1.1 + # via sphinx +markupsafe==2.1.1 + # via jinja2 nodeenv==1.6.0 # via pre-commit +packaging==21.3 + # via + # pallets-sphinx-themes + # pytest + # sphinx + # tox +pallets-sphinx-themes==2.0.2 + # via -r docs.in pep517==0.12.0 # via pip-tools pip-compile-multi==2.4.4 - # via -r requirements/dev.in + # via -r dev.in pip-tools==6.5.1 # via pip-compile-multi platformdirs==2.5.1 # via virtualenv +pluggy==1.0.0 + # via + # pytest + # tox pre-commit==2.17.0 - # via -r requirements/dev.in + # via -r dev.in +py==1.11.0 + # via + # pytest + # tox +pygments==2.11.2 + # via sphinx +pyparsing==3.0.7 + # via packaging +pytest==7.1.1 + # via -r tests.in +pytz==2022.1 + # via babel pyyaml==6.0 # via pre-commit +requests==2.27.1 + # via sphinx six==1.16.0 # via # tox # virtualenv +snowballstemmer==2.2.0 + # via sphinx +sphinx==4.5.0 + # via + # -r docs.in + # pallets-sphinx-themes + # sphinx-issues + # sphinxcontrib-log-cabinet +sphinx-issues==3.0.1 + # via -r docs.in +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 docs.in +sphinxcontrib-qthelp==1.0.3 + # via sphinx +sphinxcontrib-serializinghtml==1.1.5 + # via sphinx toml==0.10.2 # via # pre-commit # tox +tomli==2.0.1 + # via + # pep517 + # pytest toposort==1.7 # via pip-compile-multi tox==3.24.5 - # via -r requirements/dev.in + # via -r dev.in +urllib3==1.26.9 + # via requests virtualenv==20.14.0 # via # pre-commit # tox -wheel==0.37.1 +wheel==0.38.1 # via pip-tools # The following packages are considered to be unsafe in a requirements file: From 2bb52fd9dd11ade4315f841adce20fca76d37660 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 1 Jan 2023 16:01:10 +0000 Subject: [PATCH 33/40] Bump dessant/lock-threads from 3 to 4 Bumps [dessant/lock-threads](https://github.com/dessant/lock-threads) from 3 to 4. - [Release notes](https://github.com/dessant/lock-threads/releases) - [Changelog](https://github.com/dessant/lock-threads/blob/master/CHANGELOG.md) - [Commits](https://github.com/dessant/lock-threads/compare/v3...v4) --- updated-dependencies: - dependency-name: dessant/lock-threads dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/lock.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/lock.yaml b/.github/workflows/lock.yaml index b4f76338..c771673b 100644 --- a/.github/workflows/lock.yaml +++ b/.github/workflows/lock.yaml @@ -8,7 +8,7 @@ jobs: lock: runs-on: ubuntu-latest steps: - - uses: dessant/lock-threads@v3 + - uses: dessant/lock-threads@v4 with: github-token: ${{ github.token }} issue-inactive-days: 14 From 7138fc9444a024271536cf41b585e43db09759d1 Mon Sep 17 00:00:00 2001 From: BADR Date: Sun, 15 Jan 2023 13:57:53 +0100 Subject: [PATCH 34/40] Set JSONEncoder to json._default (#536) * Remove unused JSONEncoder Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> --- src/flask_wtf/recaptcha/widgets.py | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/flask_wtf/recaptcha/widgets.py b/src/flask_wtf/recaptcha/widgets.py index 7dc65071..83df6949 100644 --- a/src/flask_wtf/recaptcha/widgets.py +++ b/src/flask_wtf/recaptcha/widgets.py @@ -1,10 +1,7 @@ from flask import current_app -from flask import json from flask import Markup from werkzeug.urls import url_encode -JSONEncoder = json.JSONEncoder - RECAPTCHA_SCRIPT_DEFAULT = "https://www.google.com/recaptcha/api.js" RECAPTCHA_DIV_CLASS_DEFAULT = "g-recaptcha" RECAPTCHA_TEMPLATE = """ From 6271d39b75afe705309e89fb4c4591631abcfc78 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89loi=20Rivard?= Date: Sun, 15 Jan 2023 20:22:15 +0100 Subject: [PATCH 35/40] Release 1.1.0 (#546) * Updated CHANGELOG * Increase python_requires to 3.7 * Release version 1.1.0 --- docs/changes.rst | 16 +++++----------- setup.cfg | 2 +- src/flask_wtf/__init__.py | 2 +- 3 files changed, 7 insertions(+), 13 deletions(-) diff --git a/docs/changes.rst b/docs/changes.rst index 9e0d21d7..a6845d95 100644 --- a/docs/changes.rst +++ b/docs/changes.rst @@ -1,22 +1,16 @@ Changes ======= -Unreleased ----------- - -Unreleased - -- ``validate_on_submit`` takes a ``extra_validators`` parameters :pr:`479` -- Stop supporting Flask-Babelex :pr:`540` - - Version 1.1.0 ------------- -Unreleased +Released 2023-01-15 - Drop support for Python 3.6. - +- ``validate_on_submit`` takes a ``extra_validators`` parameters :pr:`479` +- Stop supporting Flask-Babelex :pr:`540` +- Support for python 3.11 :pr:`542` +- Remove unused call to `JSONEncoder` :pr:`536` Version 1.0.1 ------------- diff --git a/setup.cfg b/setup.cfg index 2addd7d5..d4365f9c 100644 --- a/setup.cfg +++ b/setup.cfg @@ -33,7 +33,7 @@ classifiers = packages = find: package_dir = = src include_package_data = true -python_requires = >= 3.6 +python_requires = >= 3.7 # Dependencies are in setup.py for GitHub's dependency graph. [options.packages.find] diff --git a/src/flask_wtf/__init__.py b/src/flask_wtf/__init__.py index be3ec557..f2c930ef 100644 --- a/src/flask_wtf/__init__.py +++ b/src/flask_wtf/__init__.py @@ -5,4 +5,4 @@ from .recaptcha import RecaptchaField from .recaptcha import RecaptchaWidget -__version__ = "1.1.0.dev0" +__version__ = "1.1.0" From 135b0e6d96c6bb695bca355656262a0e3915dd1a Mon Sep 17 00:00:00 2001 From: Taehyun Hwang Date: Wed, 18 Jan 2023 00:56:55 +0900 Subject: [PATCH 36/40] Fix the validate of form should pass extra_validators (#547) Co-authored-by: jwag956 Co-authored-by: chlrlrhs95 --- src/flask_wtf/form.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/flask_wtf/form.py b/src/flask_wtf/form.py index a443d81b..c7f52e02 100644 --- a/src/flask_wtf/form.py +++ b/src/flask_wtf/form.py @@ -83,7 +83,7 @@ def validate_on_submit(self, extra_validators=None): """Call :meth:`validate` only if the form is submitted. This is a shortcut for ``form.is_submitted() and form.validate()``. """ - return self.is_submitted() and self.validate(extra_validators) + return self.is_submitted() and self.validate(extra_validators=extra_validators) def hidden_tag(self, *fields): """Render the form's hidden fields in one call. From 9a8a411fcbfd5c8a87a946cb3a712f24f00723f5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89loi=20Rivard?= Date: Tue, 17 Jan 2023 19:54:09 +0100 Subject: [PATCH 37/40] CHANGELOG for #548 --- docs/changes.rst | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/docs/changes.rst b/docs/changes.rst index a6845d95..12b3ea44 100644 --- a/docs/changes.rst +++ b/docs/changes.rst @@ -1,6 +1,13 @@ Changes ======= +Version 1.1.1 +------------- + +Unreleased + +- Fixed `validate` `extra_validators` parameter. :pr:`548` + Version 1.1.0 ------------- From 547a784e38bcdc747ec53376924bf243a9b8a0a9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89loi=20Rivard?= Date: Tue, 17 Jan 2023 20:01:06 +0100 Subject: [PATCH 38/40] Fixed unit tests for Flask-Babel 3 --- examples/babel/app.py | 14 +++++++------- tests/test_i18n.py | 5 ++--- 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/examples/babel/app.py b/examples/babel/app.py index 58c76673..d869d4ca 100644 --- a/examples/babel/app.py +++ b/examples/babel/app.py @@ -17,14 +17,7 @@ class BabelForm(FlaskForm): SECRET_KEY = "secret" WTF_I18N_ENABLED = True -app = Flask(__name__) -app.config.from_object(__name__) - -# config babel -babel = Babel(app) - -@babel.localeselector def get_locale(): """how to get the locale is defined by you. @@ -39,6 +32,13 @@ def get_locale(): return code +app = Flask(__name__) +app.config.from_object(__name__) + +# config babel +babel = Babel(app, locale_selector=get_locale) + + @app.route("/", methods=("GET", "POST")) def index(): form = BabelForm() diff --git a/tests/test_i18n.py b/tests/test_i18n.py index 5a2c3d98..c7956ec7 100644 --- a/tests/test_i18n.py +++ b/tests/test_i18n.py @@ -32,12 +32,11 @@ def test_i18n(app, client): except ImportError: pytest.skip("Flask-Babel must be installed.") - babel = Babel(app) - - @babel.localeselector def get_locale(): return request.accept_languages.best_match(["en", "zh"], "en") + Babel(app, locale_selector=get_locale) + @app.route("/", methods=["POST"]) def index(): form = NameForm() From 58fccc926281f6d0254ea5dab69380a808ee8794 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89loi=20Rivard?= Date: Tue, 17 Jan 2023 20:17:41 +0100 Subject: [PATCH 39/40] Ignore flake8 B028 on the recaptcha widget HTML data attributes generation. --- src/flask_wtf/recaptcha/widgets.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/flask_wtf/recaptcha/widgets.py b/src/flask_wtf/recaptcha/widgets.py index 83df6949..c1709295 100644 --- a/src/flask_wtf/recaptcha/widgets.py +++ b/src/flask_wtf/recaptcha/widgets.py @@ -25,7 +25,7 @@ def recaptcha_html(self, public_key): script += "?" + url_encode(params) attrs = current_app.config.get("RECAPTCHA_DATA_ATTRS", {}) attrs["sitekey"] = public_key - snippet = " ".join(f'data-{k}="{attrs[k]}"' for k in attrs) + snippet = " ".join(f'data-{k}="{attrs[k]}"' for k in attrs) # noqa: B028 div_class = current_app.config.get("RECAPTCHA_DIV_CLASS") if not div_class: div_class = RECAPTCHA_DIV_CLASS_DEFAULT From 1cf8b19bcbc53e5357a4aa0c5ccb5cf7d3ea0d22 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89loi=20Rivard?= Date: Tue, 17 Jan 2023 20:24:18 +0100 Subject: [PATCH 40/40] Release 1.1.1 --- docs/changes.rst | 2 +- src/flask_wtf/__init__.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/changes.rst b/docs/changes.rst index 12b3ea44..937e4b98 100644 --- a/docs/changes.rst +++ b/docs/changes.rst @@ -4,7 +4,7 @@ Changes Version 1.1.1 ------------- -Unreleased +Released 2023-01-17 - Fixed `validate` `extra_validators` parameter. :pr:`548` diff --git a/src/flask_wtf/__init__.py b/src/flask_wtf/__init__.py index f2c930ef..59bc8955 100644 --- a/src/flask_wtf/__init__.py +++ b/src/flask_wtf/__init__.py @@ -5,4 +5,4 @@ from .recaptcha import RecaptchaField from .recaptcha import RecaptchaWidget -__version__ = "1.1.0" +__version__ = "1.1.1"