From 493b4e8c6cb6a23e4a13c5fef582c115eb547c4c Mon Sep 17 00:00:00 2001 From: dinhlongnguyen Date: Mon, 2 Oct 2023 00:20:31 +0700 Subject: [PATCH 1/2] update flask version --- Pipfile | 2 +- setup.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Pipfile b/Pipfile index 73896dfc0..b940b1779 100644 --- a/Pipfile +++ b/Pipfile @@ -5,7 +5,7 @@ name = "pypi" [packages] "backports.zoneinfo" = {version="==0.2.1", markers="python_version < '3.9'", extras=["tzdata"]} -flask = "==2.3.3" +flask = "==3.0.0" flask-cors = "==4.0.0" flask-socketio = "==5.3.6" gevent = "==23.7.0" diff --git a/setup.py b/setup.py index 63d37ef66..58bd3569b 100644 --- a/setup.py +++ b/setup.py @@ -29,7 +29,7 @@ version_string = f"{version_string}.{vext}" requirements = [ - "flask>=2.3.3,<2.4", + "flask>=3.0.0,<3.1", "flask-cors>=4.0.0,<5.0", "flask-socketio>=5.3.6,<6.0", "markdown>=3.4.4,<4.0", From 223b32840dcc3b8ce3dc51bd24827bfcf68c06d9 Mon Sep 17 00:00:00 2001 From: dinhlongnguyen Date: Tue, 3 Oct 2023 16:04:01 +0700 Subject: [PATCH 2/2] minor update --- src/taipy/gui/gui.py | 8 +++----- src/taipy/gui/server.py | 2 +- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/src/taipy/gui/gui.py b/src/taipy/gui/gui.py index 765cde024..a53991cbc 100644 --- a/src/taipy/gui/gui.py +++ b/src/taipy/gui/gui.py @@ -23,16 +23,14 @@ import time import typing as t import warnings -from importlib import util +from importlib import metadata, util from types import FrameType, SimpleNamespace from urllib.parse import unquote, urlencode, urlparse import __main__ import markdown as md_lib import tzlocal -from flask import Blueprint, Flask -from flask import __version__ as flask_version # type: ignore -from flask import g, jsonify, request, send_file, send_from_directory +from flask import Blueprint, Flask, g, jsonify, request, send_file, send_from_directory from werkzeug.utils import secure_filename from taipy.logger._taipy_logger import _TaipyLogger @@ -737,7 +735,7 @@ def _serve_status(self, template: pathlib.Path) -> t.Dict[str, t.Dict[str, str]] if self._get_config("extended_status", False): base_json.update( { - "flask_version": str(flask_version or ""), + "flask_version": str(metadata.version("flask") or ""), "backend_version": self.__get_version(), "host": f'{self._get_config("host", "localhost")}:{self._get_config("port", "default")}', "python_version": sys.version, diff --git a/src/taipy/gui/server.py b/src/taipy/gui/server.py index 8eddd4299..f413f8fc9 100644 --- a/src/taipy/gui/server.py +++ b/src/taipy/gui/server.py @@ -95,7 +95,7 @@ def __init__( # set json encoder (for Taipy specific types) self._flask.json_provider_class = _TaipyJsonProvider - self._flask.json = self._flask.json_provider_class(self._flask) + self._flask.json = self._flask.json_provider_class(self._flask) # type: ignore self.__path_mapping = path_mapping or {} self.__ssl_context = server_config.get("ssl_context", None)