diff --git a/cps/config_sql.py b/cps/config_sql.py index bbca32415..c73a6cf07 100644 --- a/cps/config_sql.py +++ b/cps/config_sql.py @@ -403,7 +403,7 @@ class ConfigSQL(object): self.save() def get_book_path(self): - return self.config_calibre_split_dir if self.config_calibre_split_dir else self.config_calibre_dir + return self.config_calibre_split_dir if self.config_calibre_split else self.config_calibre_dir def store_calibre_uuid(self, calibre_db, Library_table): from . import app diff --git a/cps/constants.py b/cps/constants.py index 1a5af1352..1ddef87cf 100644 --- a/cps/constants.py +++ b/cps/constants.py @@ -175,7 +175,7 @@ BookMeta = namedtuple('BookMeta', 'file_path, extension, title, author, cover, d 'series_id, languages, publisher, pubdate, identifiers') # python build process likes to have x.y.zbw -> b for beta and w a counting number -STABLE_VERSION = '0.6.26' +STABLE_VERSION = '0.6.27b' NIGHTLY_VERSION = dict() NIGHTLY_VERSION[0] = '$Format:%H$' diff --git a/optional-requirements.txt b/optional-requirements.txt index 6d75d5729..5d0da2197 100644 --- a/optional-requirements.txt +++ b/optional-requirements.txt @@ -1,8 +1,8 @@ # GDrive Integration google-api-python-client>=2.73.00,<2.200.0 -gevent>20.6.0,<24.12.0 -greenlet>=0.4.17,<3.3.0 -httplib2>=0.9.2,<0.23.0 +gevent>20.6.0,<25.9.2 +greenlet>=0.4.17,<3.4.0 +httplib2>=0.9.2,<0.32.0 oauth2client>=4.0.0,<4.1.4 uritemplate>=3.0.0,<4.3.0 pyasn1-modules>=0.0.8,<0.7.0 @@ -21,19 +21,19 @@ python-Levenshtein>=0.12.0,<0.28.0 # ldap login python-ldap>=3.0.0,<3.5.0 -Flask-SimpleLDAP>=1.4.0,<2.1.0 +Flask-SimpleLDAP>=1.4.0,<2.2.0 # oauth Flask-Dance>=2.0.0,<7.2.0 -SQLAlchemy-Utils>=0.33.5,<0.42.0 +SQLAlchemy-Utils>=0.33.5,<0.43.0 # metadata extraction rarfile>=3.2,<5.0 scholarly>=1.2.0,<1.8 markdown2>=2.0.0,<2.6.0 -html2text>=2020.1.16,<2025.2.26 +html2text>=2020.1.16,<2025.4.16 python-dateutil>=2.1,<2.10.0 -beautifulsoup4>=4.0.1,<4.14.0 +beautifulsoup4>=4.0.1,<4.15.0 faust-cchardet>=2.1.18,<2.1.20 py7zr>=0.15.0,<0.21.0 mutagen>=1.40.0,<1.50.0 diff --git a/requirements.txt b/requirements.txt index 9c858ede5..60ceea4b6 100644 --- a/requirements.txt +++ b/requirements.txt @@ -5,23 +5,23 @@ Flask-Principal>=0.3.2,<0.5.1 Flask>=1.0.2,<3.2.0 iso-639>=0.4.5,<0.5.0;python_version<'3.12' pycountry>=20.0.0,<25.0.0;python_version>='3.12' -PyPDF>=6.1.3,<6.5.0 +PyPDF>=6.1.3,<6.7.0 pytz>=2016.10 requests>=2.32.0,<2.33.0 SQLAlchemy>=1.3.0,<2.1.0 tornado>=6.4.2,<6.6 Wand>=0.4.4,<0.7.0 -unidecode>=0.04.19,<1.4.0 +unidecode>=0.04.19,<1.5.0 lxml>=4.9.1,<5.4.0 flask-wtf>=0.14.2,<1.3.0 chardet>=3.0.0,<5.3.0 netifaces-plus>=0.12.0,<0.13.0 urllib3>=1.22,<3.0 -Flask-Limiter>=2.3.0,<3.13.0 -regex>=2022.3.2,<2025.3.20 -bleach>=6.0.0,<6.3.0 +Flask-Limiter>=2.3.0,<4.2.0 +regex>=2022.3.2,<2026.1.16 +bleach>=6.0.0,<6.4.0 python-magic>=0.4.27,<0.5.0 python-magic-bin>=0.4.0,<0.5.0;sys_platform=='win32' flask-httpAuth>=4.4.0,<5.0.0 -cryptography>=39.0.0,<45.0.0 -certifi>=2024.7.4,<2025.8.24 +cryptography>=39.0.0,<47.0.0 +certifi>=2024.7.4,<2026.1.5