mirrors/calibre-web
1
0
Fork 0
mirror of https://github.com/janeczku/calibre-web synced 2025-10-30 23:03:02 +00:00
Code Issues Releases Wiki Activity

Get version info from importlib.metadata

Browse Source
This commit is contained in:
Ozzie Isaacs
2024-08-05 20:27:21 +02:00
parent bdac7a3257
commit a7d58386eb
3 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
cps/about.py
View File

@@ -23,6 +23,7 @@
import sys import sys
import platform import platform
import sqlite3 import sqlite3
import importlib
from collections import OrderedDict from collections import OrderedDict
import flask import flask
@@ -41,8 +42,11 @@ req = dep_check.load_dependencies(False)
opt = dep_check.load_dependencies(True) opt = dep_check.load_dependencies(True)
for i in (req + opt): for i in (req + opt):
modules[i[1]] = i[0] modules[i[1]] = i[0]
modules['Jinja2'] = jinja2.__version__ modules['Jinja2'] = importlib.metadata.version("jinja2")
modules['pySqlite'] = sqlite3.version try:
modules['pySqlite'] = sqlite3.version
except Exception:
pass
modules['SQLite'] = sqlite3.sqlite_version modules['SQLite'] = sqlite3.sqlite_version
sorted_modules = OrderedDict((sorted(modules.items(), key=lambda x: x[0].casefold()))) sorted_modules = OrderedDict((sorted(modules.items(), key=lambda x: x[0].casefold())))

6
cps/debug_info.py
View File

@@ -26,7 +26,8 @@ from flask_babel.speaklater import LazyString
import os import os
from flask import send_file, __version__ from flask import send_file
import importlib
from . import logger, config from . import logger, config
from .about import collect_stats from .about import collect_stats
@@ -49,7 +50,8 @@ def assemble_logfiles(file_name):
with open(f, 'rb') as fd: with open(f, 'rb') as fd:
shutil.copyfileobj(fd, wfd) shutil.copyfileobj(fd, wfd)
wfd.seek(0) wfd.seek(0)
if int(__version__.split('.')[0]) < 2: version = importlib.metadata.version("flask")
if int(version.split('.')[0]) < 2:
return send_file(wfd, return send_file(wfd,
as_attachment=True, as_attachment=True,
attachment_filename=os.path.basename(file_name)) attachment_filename=os.path.basename(file_name))

2
requirements.txt
View File

@@ -13,7 +13,7 @@ Wand>=0.4.4,<0.7.0
unidecode>=0.04.19,<1.4.0 unidecode>=0.04.19,<1.4.0
lxml>=4.9.1,<5.3.0 lxml>=4.9.1,<5.3.0
flask-wtf>=0.14.2,<1.3.0 flask-wtf>=0.14.2,<1.3.0
chardet>=3.0.0,<4.1.0 chardet>=3.0.0,<5.3.0
advocate>=1.0.0,<1.1.0 advocate>=1.0.0,<1.1.0
Flask-Limiter>=2.3.0,<3.9.0 Flask-Limiter>=2.3.0,<3.9.0
regex>=2022.3.2,<2024.6.25 regex>=2022.3.2,<2024.6.25