Fix for stable update version

janeczku · Nov 11, 2024 · 2fff002 · 2fff002
1 parent 5a87c1c
commit 2fff002
Show file tree

Hide file tree

Showing 7 changed files with 166 additions and 64 deletions.
diff --git a/cps/admin.py b/cps/admin.py
@@ -219,7 +219,7 @@ def admin():
                     form_date += timedelta(hours=int(commit[20:22]), minutes=int(commit[23:]))
             commit = format_datetime(form_date - tz, format='short')
         else:
-            commit = version.replace("b", " Beta")
+            commit = version['version'].replace("b", " Beta")
 
     all_user = ub.session.query(ub.User).all()
     # email_settings = mail_config.get_mail_settings()

diff --git a/cps/static/js/caliBlur.js b/cps/static/js/caliBlur.js
diff --git a/cps/tasks/convert.py b/cps/tasks/convert.py
diff --git a/cps/templates/config_edit.html b/cps/templates/config_edit.html
diff --git a/cps/updater.py b/cps/updater.py
@@ -329,7 +329,7 @@ def _nightly_version_info(cls):
     @classmethod
     def _stable_version_info(cls):
         log.debug("Stable version: {}".format(constants.STABLE_VERSION))
-        return constants.STABLE_VERSION  # Current Version
+        return {'version': constants.STABLE_VERSION }
 
     @classmethod
     def dry_run(cls):

diff --git a/pyproject.toml b/pyproject.toml
@@ -50,6 +50,7 @@ dependencies = [
     "regex>=2022.3.2,<2024.6.25",
     "bleach>=6.0.0,<6.2.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>=30.0.0,<44.0.0",
 ]

diff --git a/test/Calibre-Web TestSummary_Linux.html b/test/Calibre-Web TestSummary_Linux.html