Skip to content
This repository has been archived by the owner on Feb 15, 2024. It is now read-only.

update flask version to 3.0 #942

Merged
merged 3 commits into from
Oct 3, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Pipfile
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
8 changes: 3 additions & 5 deletions src/taipy/gui/gui.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion src/taipy/gui/server.py
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down