From 92de3be0a1de71cc70ed04138bfb16532ce0eb35 Mon Sep 17 00:00:00 2001 From: nicolargo Date: Mon, 26 Aug 2024 17:20:05 +0200 Subject: [PATCH] Stick FastAPI version to 0.82.0 or higher (latest is better) - Related to #2926 --- glances/outputs/glances_restful_api.py | 5 +++-- optional-requirements.txt | 2 +- setup.py | 2 +- webui-requirements.txt | 2 +- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/glances/outputs/glances_restful_api.py b/glances/outputs/glances_restful_api.py index d19f0873..a4549abf 100644 --- a/glances/outputs/glances_restful_api.py +++ b/glances/outputs/glances_restful_api.py @@ -35,8 +35,9 @@ try: from fastapi.security import HTTPBasic, HTTPBasicCredentials from fastapi.staticfiles import StaticFiles from fastapi.templating import Jinja2Templates -except ImportError: - logger.critical('FastAPI import error. Glances cannot start in web server mode.') +except ImportError as e: + logger.critical(f'FastAPI import error: {e}') + logger.critical('Glances cannot start in web server mode.') sys.exit(2) try: diff --git a/optional-requirements.txt b/optional-requirements.txt index e69b9986..641cc25b 100644 --- a/optional-requirements.txt +++ b/optional-requirements.txt @@ -7,7 +7,7 @@ cassandra-driver chevron docker>=6.1.1 elasticsearch -fastapi +fastapi>=0.82.0 graphitesender hddtemp influxdb>=1.0.0 # For InfluxDB < 1.8 diff --git a/setup.py b/setup.py index 7fa62863..a0d14487 100755 --- a/setup.py +++ b/setup.py @@ -83,7 +83,7 @@ def get_install_extras_require(): 'smart': ['pySMART.smartx'], 'snmp': ['pysnmp'], 'sparklines': ['sparklines'], - 'web': ['fastapi', 'uvicorn', 'jinja2', 'requests'], + 'web': ['fastapi>=0.82.0', 'uvicorn', 'jinja2', 'requests'], 'wifi': ['wifi'], } if sys.platform.startswith('linux'): diff --git a/webui-requirements.txt b/webui-requirements.txt index db85591a..5e7360da 100644 --- a/webui-requirements.txt +++ b/webui-requirements.txt @@ -1,6 +1,6 @@ # install with base requirements file -r requirements.txt -fastapi; python_version >= "3.8" +fastapi>=0.82.0; python_version >= "3.8" jinja2 uvicorn; python_version >= "3.8"