From d6884164a5181676247236a00723328eee4d86fa Mon Sep 17 00:00:00 2001 From: Fernando Mesquita <69275210+fernando-mesquita@users.noreply.github.com> Date: Sat, 25 Sep 2021 01:07:31 -0300 Subject: [PATCH 1/3] Update messages.po Read = Leia > Lido --- cps/translations/pt_BR/LC_MESSAGES/messages.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cps/translations/pt_BR/LC_MESSAGES/messages.po b/cps/translations/pt_BR/LC_MESSAGES/messages.po index dc2c9313..d5c67f59 100644 --- a/cps/translations/pt_BR/LC_MESSAGES/messages.po +++ b/cps/translations/pt_BR/LC_MESSAGES/messages.po @@ -2273,7 +2273,7 @@ msgstr "Marcar como lido" #: cps/templates/detail.html:219 msgid "Read" -msgstr "Leia" +msgstr "Lido" #: cps/templates/detail.html:227 msgid "Restore from archive" From d5a332a84e3dcd8eb985bc27094146434ca63785 Mon Sep 17 00:00:00 2001 From: Ozzie Isaacs Date: Sat, 25 Sep 2021 08:23:14 +0200 Subject: [PATCH 2/3] Update test results --- test/Calibre-Web TestSummary_Linux.html | 337 +++++------------------- 1 file changed, 73 insertions(+), 264 deletions(-) diff --git a/test/Calibre-Web TestSummary_Linux.html b/test/Calibre-Web TestSummary_Linux.html index b1ca885e..f4ba8f0a 100644 --- a/test/Calibre-Web TestSummary_Linux.html +++ b/test/Calibre-Web TestSummary_Linux.html @@ -37,20 +37,20 @@
-

Start Time: 2021-08-28 21:08:29

+

Start Time: 2021-09-23 19:58:16

-

Stop Time: 2021-08-29 10:59:50

+

Stop Time: 2021-09-23 23:23:05

-

Duration: 13h 7 min

+

Duration: 2h 40 min

@@ -534,11 +534,11 @@ - + TestEbookConvertCalibreGDrive 6 - 5 - 1 + 6 + 0 0 0 @@ -548,31 +548,11 @@ - +
TestEbookConvertCalibreGDrive - test_convert_email
- -
- FAIL -
- - - - + PASS @@ -707,12 +687,12 @@ AssertionError: False is not true - + TestEditAdditionalBooks 15 - 12 + 14 + 0 0 - 2 1 Detail @@ -855,92 +835,20 @@ AssertionError: False is not true - +
TestEditAdditionalBooks - test_xss_comment_edit
- -
- ERROR -
- - - - + PASS - +
TestEditAdditionalBooks - test_xss_custom_comment_edit
- -
- ERROR -
- - - - + PASS @@ -1398,11 +1306,11 @@ AttributeError: 'bool' object has no attribute 'click' - + TestEditBooksOnGdrive 20 - 18 - 2 + 20 + 0 0 0 @@ -1421,35 +1329,11 @@ AttributeError: 'bool' object has no attribute 'click' - +
TestEditBooksOnGdrive - test_edit_author
- -
- FAIL -
- - - - + PASS @@ -1571,33 +1455,11 @@ AssertionError: 'Pipo, Pipe' != 'Pipo| Pipe' - +
TestEditBooksOnGdrive - test_edit_title
- -
- FAIL -
- - - - + PASS @@ -1940,11 +1802,11 @@ AssertionError: 'Pipo|;.:' != 'Very long extra super turbo cool title wi[54 char - + TestKoboSync 10 - 9 - 1 + 10 + 0 0 0 @@ -2017,31 +1879,11 @@ AssertionError: 'Pipo|;.:' != 'Very long extra super turbo cool title wi[54 char - +
TestKoboSync - test_sync_shelf
- -
- FAIL -
- - - - + PASS @@ -2963,13 +2805,13 @@ AssertionError: 1 != 0 : [] TestShelf + 13 12 - 11 0 0 1 - Detail + Detail @@ -3099,6 +2941,15 @@ AssertionError: 1 != 0 : [] + + + +
TestShelf - test_xss_shelf
+ + PASS + + + @@ -3267,11 +3118,11 @@ AssertionError: False is not true - + TestUserList 18 - 16 - 2 + 18 + 0 0 0 @@ -3362,33 +3213,11 @@ AssertionError: False is not true - +
TestUserList - test_user_list_edit_language
- -
- FAIL -
- - - - + PASS @@ -3456,33 +3285,11 @@ AssertionError: 'Show All' != 'all' - +
TestUserList - test_user_list_sort
- -
- FAIL -
- - - - + PASS @@ -4037,13 +3844,13 @@ AssertionError: 'Show All' != 'all' - + TestCalibreHelper 16 15 - 0 1 0 + 0 Detail @@ -4114,26 +3921,28 @@ AssertionError: 'Show All' != 'all' - +
TestCalibreHelper - test_check_chinese_Characters
- ERROR + FAIL
- From 2edcd16119dc711d8ab67138d7104592b5e9b1f7 Mon Sep 17 00:00:00 2001 From: Ozzie Isaacs Date: Sat, 25 Sep 2021 08:29:43 +0200 Subject: [PATCH 3/3] Update version to 0.6.13 for release --- cps/constants.py | 2 +- setup.cfg | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/cps/constants.py b/cps/constants.py index a0daa515..5aaf6cc8 100644 --- a/cps/constants.py +++ b/cps/constants.py @@ -157,7 +157,7 @@ def selected_roles(dictionary): BookMeta = namedtuple('BookMeta', 'file_path, extension, title, author, cover, description, tags, series, ' 'series_id, languages, publisher') -STABLE_VERSION = {'version': '0.6.13 Beta'} +STABLE_VERSION = {'version': '0.6.13'} NIGHTLY_VERSION = {} NIGHTLY_VERSION[0] = '$Format:%H$' diff --git a/setup.cfg b/setup.cfg index 23c4e60b..9787caa4 100644 --- a/setup.cfg +++ b/setup.cfg @@ -48,6 +48,7 @@ install_requires = tornado>=4.1,<6.2 Wand>=0.4.4,<0.7.0 unidecode>=0.04.19,<1.3.0 + lxml>=3.8.0,<4.7.0 [options.extras_require] gdrive = @@ -76,8 +77,8 @@ oauth = Flask-Dance>=2.0.0,<5.1.0 SQLAlchemy-Utils>=0.33.5,<0.38.0 metadata = - lxml>=3.8.0,<4.7.0 rarfile>=2.7 + scholarly>=1.2.0, <1.3 comics = natsort>=2.2.0,<7.2.0 comicapi>= 2.2.0,<2.3.0