From 3207af8827d4162ef5841249c46fbb9da043c551 Mon Sep 17 00:00:00 2001 From: David Lord Date: Sat, 3 Feb 2024 09:41:38 -0800 Subject: [PATCH 1/4] start version 3.0.2 --- CHANGES.rst | 6 ++++++ pyproject.toml | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/CHANGES.rst b/CHANGES.rst index d7ffaab570..f97bc35ac6 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -1,3 +1,9 @@ +Version 3.0.2 +------------- + +Unreleased + + Version 3.0.1 ------------- diff --git a/pyproject.toml b/pyproject.toml index 4983b6ff4a..a1b726d6a4 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [project] name = "Flask" -version = "3.0.1" +version = "3.0.2.dev" description = "A simple framework for building complex web applications." readme = "README.rst" license = {file = "LICENSE.rst"} From ecc057dd4857e655f0844b781899a917852042a4 Mon Sep 17 00:00:00 2001 From: Cody Scott Date: Tue, 23 Jan 2024 11:28:51 -0500 Subject: [PATCH 2/4] fix jinja_loader annotation --- CHANGES.rst | 2 ++ src/flask/sansio/scaffold.py | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/CHANGES.rst b/CHANGES.rst index f97bc35ac6..302abec441 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -3,6 +3,8 @@ Version 3.0.2 Unreleased +- Correct type for ``jinja_loader`` property. :issue:`5388` + Version 3.0.1 ------------- diff --git a/src/flask/sansio/scaffold.py b/src/flask/sansio/scaffold.py index 40534f53c8..5355700899 100644 --- a/src/flask/sansio/scaffold.py +++ b/src/flask/sansio/scaffold.py @@ -9,6 +9,7 @@ from functools import update_wrapper import click +from jinja2 import BaseLoader from jinja2 import FileSystemLoader from werkzeug.exceptions import default_exceptions from werkzeug.exceptions import HTTPException @@ -272,7 +273,7 @@ def static_url_path(self, value: str | None) -> None: self._static_url_path = value @cached_property - def jinja_loader(self) -> FileSystemLoader | None: + def jinja_loader(self) -> BaseLoader | None: """The Jinja loader for this object's templates. By default this is a class :class:`jinja2.loaders.FileSystemLoader` to :attr:`template_folder` if it is set. From 1af8f95785b85d0937153ee63d504c0b51934d80 Mon Sep 17 00:00:00 2001 From: Tony Huang Date: Fri, 26 Jan 2024 10:08:55 +0800 Subject: [PATCH 3/4] fix super call in list comprehension --- CHANGES.rst | 2 ++ src/flask/cli.py | 4 +++- tests/test_cli.py | 5 +++++ 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/CHANGES.rst b/CHANGES.rst index 302abec441..edbaa963ae 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -4,6 +4,8 @@ Version 3.0.2 Unreleased - Correct type for ``jinja_loader`` property. :issue:`5388` +- Fix error with ``--extra-files`` and ``--exclude-patterns`` CLI options. + :issue:`5391` Version 3.0.1 diff --git a/src/flask/cli.py b/src/flask/cli.py index ffdcb182a7..d4df2802b2 100644 --- a/src/flask/cli.py +++ b/src/flask/cli.py @@ -858,7 +858,9 @@ def convert( self, value: t.Any, param: click.Parameter | None, ctx: click.Context | None ) -> t.Any: items = self.split_envvar_value(value) - return [super().convert(item, param, ctx) for item in items] + # can't call no-arg super() inside list comprehension until Python 3.12 + super_convert = super().convert + return [super_convert(item, param, ctx) for item in items] @click.command("run", short_help="Run a development server.") diff --git a/tests/test_cli.py b/tests/test_cli.py index 79de1fc8d1..09995488cc 100644 --- a/tests/test_cli.py +++ b/tests/test_cli.py @@ -679,3 +679,8 @@ def test_cli_empty(app): result = app.test_cli_runner().invoke(args=["blue", "--help"]) assert result.exit_code == 2, f"Unexpected success:\n\n{result.output}" + + +def test_run_exclude_patterns(): + ctx = run_command.make_context("run", ["--exclude-patterns", __file__]) + assert ctx.params["exclude_patterns"] == [__file__] From d2030595dcdc8ca5701504f00255360fb12a3a2b Mon Sep 17 00:00:00 2001 From: David Lord Date: Sat, 3 Feb 2024 12:54:41 -0800 Subject: [PATCH 4/4] release version 3.0.2 --- CHANGES.rst | 2 +- pyproject.toml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGES.rst b/CHANGES.rst index edbaa963ae..37c54f9783 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -1,7 +1,7 @@ Version 3.0.2 ------------- -Unreleased +Released 2024-02-03 - Correct type for ``jinja_loader`` property. :issue:`5388` - Fix error with ``--extra-files`` and ``--exclude-patterns`` CLI options. diff --git a/pyproject.toml b/pyproject.toml index a1b726d6a4..3fefae18a9 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [project] name = "Flask" -version = "3.0.2.dev" +version = "3.0.2" description = "A simple framework for building complex web applications." readme = "README.rst" license = {file = "LICENSE.rst"}