From 12f3a13d1da3205e5f8c27edcae0c628c6510656 Mon Sep 17 00:00:00 2001 From: Ozzie Isaacs Date: Sun, 1 May 2022 10:25:07 +0200 Subject: [PATCH] Fix typo Fix missing maim.py file in update pypi package Bugfix after last testrun --- cps/helper.py | 4 +- cps/updater.py | 3 +- test/Calibre-Web TestSummary_Linux.html | 395 ++++++++++++------------ 3 files changed, 203 insertions(+), 199 deletions(-) diff --git a/cps/helper.py b/cps/helper.py index 757e48da..ed11e1c0 100644 --- a/cps/helper.py +++ b/cps/helper.py @@ -804,8 +804,8 @@ def save_cover_from_url(url, book_path): elif use_advocate: img = advocate.get(url, timeout=(10, 200), allow_redirects=False) # ToDo: Error Handling else: - log.error("python modul advocate is not installed but is needed") - return False, _("Python modul 'advocate' is not installed but is needed for cover downloads") + log.error("python module advocate is not installed but is needed") + return False, _("Python module 'advocate' is not installed but is needed for cover downloads") img.raise_for_status() return save_cover(img, book_path) except (socket.gaierror, diff --git a/cps/updater.py b/cps/updater.py index 757e43fc..13d774bf 100644 --- a/cps/updater.py +++ b/cps/updater.py @@ -266,8 +266,9 @@ class Updater(threading.Thread): if additional_path: exclude.append(additional_path) exclude = tuple(exclude) - # check if we are in a package, rename cps.py to __init__.py + # check if we are in a package, rename cps.py to __init__.py and __main__.py if constants.HOME_CONFIG: + shutil.copy(os.path.join(source, 'cps.py'), os.path.join(source, '__main__.py')) shutil.move(os.path.join(source, 'cps.py'), os.path.join(source, '__init__.py')) for root, dirs, files in os.walk(destination, topdown=True): diff --git a/test/Calibre-Web TestSummary_Linux.html b/test/Calibre-Web TestSummary_Linux.html index 913913b1..027aaa81 100644 --- a/test/Calibre-Web TestSummary_Linux.html +++ b/test/Calibre-Web TestSummary_Linux.html @@ -37,20 +37,20 @@
-

Start Time: 2022-04-29 21:17:05

+

Start Time: 2022-04-30 21:05:13

-

Stop Time: 2022-04-30 03:15:20

+

Stop Time: 2022-05-01 02:54:00

-

Duration: 5h 5 min

+

Duration: 4h 55 min

@@ -600,8 +600,8 @@ TestEbookConvertCalibreGDrive 7 - 5 - 2 + 6 + 1 0 0 @@ -611,31 +611,11 @@ - +
TestEbookConvertCalibreGDrive - test_convert_email
- -
- FAIL -
- - - - + PASS @@ -702,7 +682,7 @@ AssertionError: False is not true 
Traceback (most recent call last):
-  File "/home/ozzie/Development/calibre-web-test/test/test_ebook_convert_gdrive.py", line 442, in test_thumbnail_cache
+  File "/home/ozzie/Development/calibre-web-test/test/test_ebook_convert_gdrive.py", line 443, in test_thumbnail_cache
     self.assertEqual(10*2, count_files(thumbnail_cache_path))
 AssertionError: 20 != 0
@@ -1662,11 +1642,11 @@ AssertionError: 20 != 0 - + TestEditBooksOnGdrive 18 - 17 - 1 + 18 + 0 0 0 @@ -1829,31 +1809,11 @@ AssertionError: 20 != 0 - +
TestEditBooksOnGdrive - test_watch_metadata
- -
- FAIL -
- - - - + PASS @@ -3662,8 +3622,8 @@ AssertionError: 'series' unexpectedly found in {'id': 5, 're TestThumbnails 8 - 6 - 1 + 5 + 2 0 1 @@ -3700,11 +3660,31 @@ AssertionError: 'series' unexpectedly found in {'id': 5, 're - +
TestThumbnails - test_cover_change_on_upload_new_cover
- PASS + +
+ FAIL +
+ + + + @@ -3753,9 +3733,9 @@ AssertionError: 'series' unexpectedly found in {'id': 5, 're 
Traceback (most recent call last):
-  File "/home/ozzie/Development/calibre-web-test/test/test_thumbnails.py", line 310, in test_sideloaded_book
-    self.assertAlmostEqual(diff(BytesIO(list_cover), BytesIO(old_list_cover), delete_diff_file=True), 0.0,
-AssertionError: 0.005138437597261127 != 0.0 within 0.0001 delta (0.005138437597261127 difference)
+ File "/home/ozzie/Development/calibre-web-test/test/test_thumbnails.py", line 308, in test_sideloaded_book + self.assertGreaterEqual(diff(BytesIO(cover), BytesIO(old_cover), delete_diff_file=True), 0.04) +AssertionError: 0.03724830839072722 not greater than or equal to 0.04
@@ -3766,12 +3746,12 @@ AssertionError: 0.005138437597261127 != 0.0 within 0.0001 delta (0.0051384375972 - + TestUpdater 9 - 4 - 3 - 1 + 8 + 0 + 0 1 Detail @@ -3789,33 +3769,11 @@ AssertionError: 0.005138437597261127 != 0.0 within 0.0001 delta (0.0051384375972 - +
TestUpdater - test_check_update_nightly_request_errors
- -
- ERROR -
- - - - + PASS @@ -3838,60 +3796,20 @@ AttributeError: 'bool' object has no attribute 'text' - +
TestUpdater - test_perform_update
- -
- FAIL -
- - - - + PASS - +
TestUpdater - test_perform_update_stable_errors
- -
- FAIL -
- - - - + PASS @@ -3931,31 +3849,11 @@ AssertionError: False is not true - +
TestUpdater - test_update_write_protect
- -
- FAIL -
- - - - + PASS @@ -4747,65 +4645,170 @@ AssertionError: False is not true - - _ErrorHolder - 1 + + TestCalibreHelper + 16 + 16 0 0 - 1 0 - Detail + Detail - + -
setUpClass (test_zz_helper)
+
TestCalibreHelper - test_author_sort
- -
- ERROR -
- - - + PASS + + + + + + +
TestCalibreHelper - test_author_sort_comma
+ PASS + + + + + + +
TestCalibreHelper - test_author_sort_junior
+ + PASS + + + + + + +
TestCalibreHelper - test_author_sort_oneword
+ + PASS + + + + + + +
TestCalibreHelper - test_author_sort_roman
+ + PASS + + + + + + +
TestCalibreHelper - test_check_Limit_Length
+ + PASS + + + + + + +
TestCalibreHelper - test_check_char_replacement
+ + PASS + + + + + + +
TestCalibreHelper - test_check_chinese_Characters
+ + PASS + + + + + + +
TestCalibreHelper - test_check_deg_eur_replacement
+ + PASS + + + + + + +
TestCalibreHelper - test_check_doubleS
+ + PASS + + + + + + +
TestCalibreHelper - test_check_finish_Dot
+ + PASS + + + + + + +
TestCalibreHelper - test_check_high23
+ + PASS + + + + + + +
TestCalibreHelper - test_check_umlauts
+ + PASS + + + + + + +
TestCalibreHelper - test_random_password
+ + PASS + + + + + + +
TestCalibreHelper - test_split_authors
+ + PASS + + + + + + +
TestCalibreHelper - test_whitespaces
+ + PASS Total - 408 - 392 - 7 - 2 + 423 + 413 + 3 + 0 7   @@ -5254,7 +5257,7 @@ ImportError: cannot import name 'safe_str_cmp' from 'werkzeug.securi