Pywikibot-commits May 2024

pywikibot-commits@lists.wikimedia.org

1 participants
95 discussions

[Gerrit] ...i18n[master]: Localisation updates from https://translatewiki.net.

by jenkins-bot (Code Review)

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/i18n/+/1037519?usp=email ) Change subject: Localisation updates from https://translatewiki.net. ...................................................................... Localisation updates from https://translatewiki.net. Change-Id: Icd674d489c8aaabb3be800195766e1dc0513f18d --- M archivebot/bn.json M checkimages/br.json M replicate_wiki/br.json M undelete/br.json 4 files changed, 14 insertions(+), 6 deletions(-) Approvals: jenkins-bot: Verified L10n-bot: Looks good to me, approved diff --git a/archivebot/bn.json b/archivebot/bn.json index cac05f7..4cf006a 100644 --- a/archivebot/bn.json +++ b/archivebot/bn.json @@ -5,6 +5,7 @@ "Al Riaz Uddin Ripon", "Bellayet", "Nasir8891", + "RiazACU", "Tahmid", "Tahmid02016", "Xqt", diff --git a/checkimages/br.json b/checkimages/br.json index d5f91bc..196517c 100644 --- a/checkimages/br.json +++ b/checkimages/br.json @@ -2,14 +2,17 @@ "@metadata": { "authors": [ "Adriendelucca", - "Fulup" + "Fulup", + "Huñvreüs" ] }, "checkimages-deletion-comment": "Robot : Ouzhpennet %(adding)s", "checkimages-doubles-file-comment": "Robot : emañ ar restr war Commons c'hoazh, gallout a ra bezañ diverket", "checkimages-doubles-head": "Restr eilet", "checkimages-doubles-talk-comment": "Robot : Kemmennadur emañ ar restr war Commons c'hoazh", + "checkimages-doubles-talk-text": "Trugarez deoc'h da vezañ pellgaset %(upload)s. Met un eilstumm a:%(image)s eo ar restr-mañ. Merket en deus ar robot ar restr implijet an nebeutañ pe an nevesañ evel un eilstumm. Ma kavit dereatoc’h lezel ar restr merket evel da vezañ diverket raktal, diverkit ar restroù eilet ha dilamit al patrom diverkañ diouzh an hini a chomo. Ur gemennadenn emgefre eus %(bot)s eo homañ.", "checkimages-forced-mode": "('''mod forset''')", + "checkimages-has-duplicates": "en deus an eilvedadoù%(force)s da heul:", "checkimages-log-comment": "Robot : o hizivaat ar marilh", "checkimages-no-license-head": "Skeudenn hep aotre-implijout", "checkimages-source-tag-comment": "Robot : o verkañ ar restroù hep tikedenn pellgarget nevez zo", diff --git a/replicate_wiki/br.json b/replicate_wiki/br.json index abf0985..5222f7c 100644 --- a/replicate_wiki/br.json +++ b/replicate_wiki/br.json @@ -1,10 +1,13 @@ { "@metadata": { "authors": [ - "Adriendelucca" + "Adriendelucca", + "Huñvreüs" ] }, "replicate_wiki-headline": "Pajennoù disheñvel diouzh an hini orin", + "replicate_wiki-missing-users": "Merourien eus orin a vank amañ", "replicate_wiki-same-pages": "An holl bajennoù a-bouez a zo heñvel", + "replicate_wiki-same-users": "Emañ an holl implijerien eus orin er wiki-mañ ivez", "replicate_wiki-summary": "Robot: Goubredañ ar wiki diwar %(source)s" } diff --git a/undelete/br.json b/undelete/br.json index 6f88c6d..7866d90 100644 --- a/undelete/br.json +++ b/undelete/br.json @@ -2,10 +2,11 @@ "@metadata": { "authors": [ "Adriendelucca", - "Gwenn-Ael" + "Gwenn-Ael", + "Huñvreüs" ] }, - "undelete-from-file": "Robot : nullañ dilamadur ul listennad pajennoù", - "undelete-images": "Robot : O nullañ dilamadur an holl skeudennoù diwar ar bajenn %(page)s", - "undelete-linked-pages": "Robot : O tiverkañ dilamadur an holl bajennoù liammet adalek %(page)s" + "undelete-from-file": "Robot : o tiziverkañ ur roll pajennoù", + "undelete-images": "Robot : O tiziverkañ an holl skeudennoù diwar ar bajenn %(page)s", + "undelete-linked-pages": "Robot : O tiziverkañ an holl bajennoù liammet adalek %(page)s" } -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/i18n/+/1037519?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.wikimedia.org/r/settings Gerrit-Project: pywikibot/i18n Gerrit-Branch: master Gerrit-Change-Id: Icd674d489c8aaabb3be800195766e1dc0513f18d Gerrit-Change-Number: 1037519 Gerrit-PatchSet: 1 Gerrit-Owner: L10n-bot <l10n-bot(a)translatewiki.net> Gerrit-Reviewer: L10n-bot <l10n-bot(a)translatewiki.net> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

15 hours, 16 minutes

[Gerrit] ...core[master]: [tests] ignore TestDjVuFile from coverage

by jenkins-bot (Code Review)

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/1037475?usp=email ) Change subject: [tests] ignore TestDjVuFile from coverage ...................................................................... [tests] ignore TestDjVuFile from coverage TestDjVuFile can only be runned if djvulibre library is installed locally Change-Id: I88d5603cb9b05d07c143dffbb1380ab658df2892 --- M tests/djvu_tests.py 1 file changed, 41 insertions(+), 45 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/tests/djvu_tests.py b/tests/djvu_tests.py index 1888b8d..8a021e5 100755 --- a/tests/djvu_tests.py +++ b/tests/djvu_tests.py @@ -42,69 +42,64 @@ stderr=subprocess.PIPE) dp.communicate() - def test_number_of_images(self): - """Test page number generator.""" - djvu = DjVuFile(file_djvu) - self.assertEqual(djvu.number_of_images(), 4) + def setUp(self): + """Set up test.""" + super().setUp() + self.djvu = DjVuFile(file_djvu) - def test_page_info(self): + def test_number_of_images(self): # pragma: no cover + """Test page number generator.""" + self.assertEqual(self.djvu.number_of_images(), 4) + + def test_page_info(self): # pragma: no cover """Test page info retrieval.""" - djvu = DjVuFile(file_djvu) - self.assertEqual(djvu.page_info(1), + self.assertEqual(self.djvu.page_info(1), ('{myfile.djvu}', ('1092x221', 600))) - def test_get_most_common_info(self): + def test_get_most_common_info(self): # pragma: no cover """Test that most common (size, dpi) are returned.""" - djvu = DjVuFile(file_djvu) - self.assertEqual(djvu.get_most_common_info(), ('1092x221', 600)) + self.assertEqual(self.djvu.get_most_common_info(), ('1092x221', 600)) - def test_has_text(self): + def test_has_text(self): # pragma: no cover """Test if djvu file contains text.""" - djvu = DjVuFile(file_djvu) - self.assertTrue(djvu.has_text()) + self.assertTrue(self.djvu.has_text()) djvu = DjVuFile(self.file_djvu_wo_text) self.assertFalse(djvu.has_text()) - def test_get_existing_page_number(self): + def test_get_existing_page_number(self): # pragma: no cover """Test text is returned for existing page number.""" - djvu = DjVuFile(file_djvu) - self.assertTrue(djvu.has_text()) - txt = djvu.get_page(1) + self.assertTrue(self.djvu.has_text()) + txt = self.djvu.get_page(1) self.assertEqual(txt, self.test_txt) - def test_get_not_existing_page_number(self): + def test_get_not_existing_page_number(self): # pragma: no cover """Test error is raised if djvu page number is out of range.""" - djvu = DjVuFile(file_djvu) - self.assertTrue(djvu.has_text()) + self.assertTrue(self.djvu.has_text()) with self.assertRaises(ValueError): - djvu.get_page(100) + self.djvu.get_page(100) - def test_get_not_existing_page(self): + def test_get_not_existing_page(self): # pragma: no cover """Test error is raised if djvu file has no text.""" - djvu = DjVuFile(self.file_djvu_wo_text) - self.assertFalse(djvu.has_text()) + self.assertFalse(self.djvu.has_text()) with self.assertRaises(ValueError): - djvu.get_page(1) + self.djvu.get_page(1) - def test_whiten_not_existing_page_number(self): + def test_whiten_not_existing_page_number(self): # pragma: no cover """Test djvu page cannot be whitend if page number is out of range.""" - djvu = DjVuFile(file_djvu) with self.assertRaises(ValueError): - djvu.whiten_page(100) + self.djvu.whiten_page(100) - def test_delete_not_existing_page_number(self): + def test_delete_not_existing_page_number(self): # pragma: no cover """Test djvu page cannot be deleted if page number is out of range.""" - djvu = DjVuFile(file_djvu) with self.assertRaises(ValueError): - djvu.delete_page(100) + self.djvu.delete_page(100) - def test_clear_cache(self): + def test_clear_cache(self): # pragma: no cover """Test if djvu file contains text.""" - djvu = DjVuFile(file_djvu) - self.assertTrue(djvu.has_text()) - djvu._has_text = False - self.assertFalse(djvu.has_text()) - self.assertTrue(djvu.has_text(force=True)) + self.assertTrue(self.djvu.has_text()) + self.djvu._has_text = False + self.assertFalse(self.djvu.has_text()) + self.assertTrue(self.djvu.has_text(force=True)) class TestDjVuFileWithoutLib(TestCase): @@ -115,24 +110,25 @@ file_djvu_not_existing = join_djvu_data_path('not_existing.djvu') + def setUp(self): + """Set up test.""" + super().setUp() + self.djvu = DjVuFile(file_djvu) + def test_file_existence(self): """Test file existence checks.""" - djvu = DjVuFile(file_djvu) - self.assertEqual(os.path.abspath(file_djvu), djvu.file) + self.assertEqual(os.path.abspath(file_djvu), self.djvu.file) with self.assertRaises(IOError): DjVuFile(self.file_djvu_not_existing) def test_str_method(self): """Test __str__() method.""" - djvu = DjVuFile(file_djvu) - expected = f"DjVuFile('{file_djvu}')" - self.assertEqual(str(djvu), expected) + self.assertEqual(str(self.djvu), f"DjVuFile('{file_djvu}')") def test_repr_method(self): """Test __repr__() method.""" - djvu = DjVuFile(file_djvu) - expected = f"pywikibot.tools.djvu.DjVuFile('{file_djvu}')" - self.assertEqual(repr(djvu), expected) + self.assertEqual(repr(self.djvu), + f"pywikibot.tools.djvu.DjVuFile('{file_djvu}')") if __name__ == '__main__': -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/1037475?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.wikimedia.org/r/settings Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Change-Id: I88d5603cb9b05d07c143dffbb1380ab658df2892 Gerrit-Change-Number: 1037475 Gerrit-PatchSet: 1 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

16 hours, 9 minutes

[Gerrit] ...core[master]: [cleanup] pheetools is no longer available upstreams

by jenkins-bot (Code Review)

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/1036688?usp=email ) Change subject: [cleanup] pheetools is no longer available upstreams ...................................................................... [cleanup] pheetools is no longer available upstreams - remove pheetools support - check whether ocr_tool is in _OCR_CMDS dict instead of _OCR_METHODS list - new default of ocr_tool in ProofreadPage.ocr is wmfOCR now - Do not show any deprecation warning, the pheetools fails anyway; just give some hints in the documentation of ocr method. Do not care about private methods. - Update tests, remove tests for error condition because test is skipped anyway in this case. Bug: T366036 Change-Id: I4eecee8a034ef889857071c82d27fcb5ca5b7db8 --- M pywikibot/proofreadpage.py M tests/proofreadpage_tests.py 2 files changed, 52 insertions(+), 142 deletions(-) Approvals: jenkins-bot: Verified Xqt: Looks good to me, approved diff --git a/pywikibot/proofreadpage.py b/pywikibot/proofreadpage.py index 84d4e60..90e2a03 100644 --- a/pywikibot/proofreadpage.py +++ b/pywikibot/proofreadpage.py @@ -1,24 +1,13 @@ -""" -Objects used with ProofreadPage Extension. - -This module includes objects: - -* ProofreadPage(Page) -* FullHeader -* IndexPage(Page) - +"""Objects used with ProofreadPage Extension. OCR support of page scans via: -- https://phetools.toolforge.org/hocr_cgi.py -- https://phetools.toolforge.org/ocr.php -- inspired by https://en.wikisource.org/wiki/MediaWiki:Gadget-ocr.js -- Wikimedia OCR -- see: https://www.mediawiki.org/wiki/Help:Extension:Wikisource/Wikimedia_OCR +- Wikimedia OCR, see: + https://www.mediawiki.org/wiki/Help:Extension:Wikisource/Wikimedia_OCR +- https://ocr.wmcloud.org/, inspired by + https://wikisource.org/wiki/MediaWiki:GoogleOCR.js -- https://ocr.wmcloud.org/ -- inspired by https://wikisource.org/wiki/MediaWiki:GoogleOCR.js -- see also: https://wikisource.org/wiki/Wikisource:Google_OCR +.. seealso:: https://wikisource.org/wiki/Wikisource:Google_OCR """ # @@ -421,13 +410,6 @@ p_close = re.compile(r'(</div>|\n\n\n)?</noinclude>') p_close_no_div = re.compile('</noinclude>') # V2 page format. - # phetools ocr utility - _HOCR_CMD = ('https://phetools.toolforge.org/hocr_cgi.py?' - 'cmd=hocr&book={book}&lang={lang}&user={user}') - - _OCR_CMD = ('https://phetools.toolforge.org/ocr.php?' - 'cmd=ocr&url={url_image}&lang={lang}&user={user}') - # Wikimedia OCR utility _WMFOCR_CMD = ('https://ocr.wmcloud.org/api.php?engine=tesseract&' 'langs[]={lang}&image={url_image}&uselang={lang}') @@ -438,14 +420,10 @@ _MULTI_PAGE_EXT = ['djvu', 'pdf'] - _PHETOOLS = 'phetools' _WMFOCR = 'wmfOCR' _GOOGLE_OCR = 'googleOCR' - _OCR_CMDS = {_PHETOOLS: _OCR_CMD, - _WMFOCR: _WMFOCR_CMD, - _GOOGLE_OCR: _GOCR_CMD, - } - _OCR_METHODS = list(_OCR_CMDS.keys()) + _OCR_CMDS = {_WMFOCR: _WMFOCR_CMD, _GOOGLE_OCR: _GOCR_CMD} + _OCR_METHODS = list(_OCR_CMDS) def __init__(self, source: PageSourceType, title: str = '') -> None: """Instantiate a ProofreadPage object. @@ -883,10 +861,12 @@ return self._url_image_ge_140() - def _ocr_callback(self, cmd_uri: str, - parser_func: Callable[[str], str] | None = None, - ocr_tool: str | None = None - ) -> tuple[bool, str | Exception]: + def _ocr_callback( + self, + cmd_uri: str, + parser_func: Callable[[str], str] | None = None, + ocr_tool: str | None = None, + ) -> tuple[bool, str | Exception]: """OCR callback function. :return: tuple (error, text [error description in case of error]). @@ -903,7 +883,7 @@ if not callable(parser_func): raise TypeError('Keyword parser_func must be callable.') - if ocr_tool not in self._OCR_METHODS: + if ocr_tool not in self._OCR_CMDS: raise TypeError( f"ocr_tool must be in {self._OCR_METHODS}, not '{ocr_tool}'.") @@ -931,54 +911,17 @@ data = response.json() - if ocr_tool == self._PHETOOLS: # phetools - assert 'error' in data, f'Error from phetools: {data}' - assert data['error'] in [0, 1, 2, 3], \ - f'Error from phetools: {data}' - error, _text = bool(data['error']), data['text'] - else: # googleOCR - if 'error' in data: - error, _text = True, data['error'] - else: - error, _text = False, data['text'] + if 'error' in data: + error, _text = True, data['error'] + else: + error, _text = False, data['text'] if error: pywikibot.error(f'OCR query {cmd_uri}: {_text}') return error, _text + return error, parser_func(_text) - def _do_hocr(self) -> tuple[bool, str | Exception]: - """Do hocr using https://phetools.toolforge.org/hocr_cgi.py?cmd=hocr. - - This is the main method for 'phetools'. - Fallback method is ocr. - - :raise ImportError: if bs4 is not installed, _bs4_soup() will raise - """ - def parse_hocr_text(txt: str) -> str: - """Parse hocr text.""" - soup = _bs4_soup(txt) # type: ignore - - res = [] - for _ocr_page in soup.find_all(class_='ocr_page'): - for area in soup.find_all(class_='ocr_carea'): - for par in area.find_all(class_='ocr_par'): - for line in par.find_all(class_='ocr_line'): - res.append(line.get_text()) - res.append('\n') - return ''.join(res) - - params = { - 'book': self.title(as_url=True, with_ns=False), - 'lang': self.site.lang, - 'user': self.site.user(), - } - cmd_uri = self._HOCR_CMD.format_map(params) - - return self._ocr_callback(cmd_uri, - parser_func=parse_hocr_text, - ocr_tool=self._PHETOOLS) - def _do_ocr(self, ocr_tool: str | None = None ) -> tuple[bool, str | Exception]: """Do ocr using specified ocr_tool method.""" @@ -990,8 +933,8 @@ return True, error_text if ocr_tool is None: - msg = 'ocr_tool required, must be among {}' - raise TypeError(msg.format(self._OCR_METHODS)) + raise TypeError( + f'ocr_tool required, must be among {self._OCR_METHODS}') try: cmd_fmt = self._OCR_CMDS[ocr_tool] @@ -1011,38 +954,34 @@ def ocr(self, ocr_tool: str | None = None) -> str: """Do OCR of ProofreadPage scan. - The text returned by this function shall be assigned to self.body, - otherwise the ProofreadPage format will not be maintained. + The text returned by this function shall be assigned to + :attr:`body`, otherwise the ProofreadPage format will not be + maintained. - It is the user's responsibility to reset quality level accordingly. + .. warning:: It is the user's responsibility to reset quality + level accordingly. - :param ocr_tool: 'phetools', 'wmfOCR' or 'googleOCR'; - default is 'phetools' + .. versionchanged:: 9.2 + default for *ocr_tool* is `wmfOCR`. + .. versionremoved:: 9.2 + `phetools` support is not available anymore. + :param ocr_tool: 'wmfOCR' or 'googleOCR'; default is 'wmfOCR' :return: OCR text for the page. - :raise TypeError: wrong ocr_tool keyword arg. :raise ValueError: something went wrong with OCR process. """ if ocr_tool is None: # default value - ocr_tool = self._PHETOOLS + ocr_tool = self._WMFOCR - if ocr_tool not in self._OCR_METHODS: + if ocr_tool not in self._OCR_CMDS: raise TypeError( - f"ocr_tool must be in {self._OCR_METHODS}, not '{ocr_tool}'.") - - # if _multi_page, try _do_hocr() first and fall back to _do_ocr() - if ocr_tool == self._PHETOOLS and self._multi_page: - error, text = self._do_hocr() - if not error and isinstance(text, str): - return text - pywikibot.warning( - f'{self}: phetools hocr failed, falling back to ocr.') + f'ocr_tool must be in {self._OCR_METHODS}, not {ocr_tool!r}.') error, text = self._do_ocr(ocr_tool=ocr_tool) - if not error and isinstance(text, str): return text + raise ValueError( f'{self}: not possible to perform OCR. {text}') diff --git a/tests/proofreadpage_tests.py b/tests/proofreadpage_tests.py index 0e2c525..ac576da 100755 --- a/tests/proofreadpage_tests.py +++ b/tests/proofreadpage_tests.py @@ -449,28 +449,21 @@ family = 'wikisource' code = 'en' - cached = True - data = {'title': 'Page:Popular Science Monthly Volume 1.djvu/10', - 'hocr': (False, 'ENTERED, according to Act of Congress, in the ' - 'year 1872,\nBY D. APPLETON & CO.,\nIn the Ofﬁce ' - 'of the Librarian of Congress, at ' - 'Washington.\n\n'), - 'ocr': (False, 'EsTEnen, according to Act of Congress, in the ' - 'year 1872,\nBy D. APPLETON & CO.,\nIn the ' - 'Office of the Librarian of Congress, at ' - 'Washington.\n\u000c'), - 'wmfOCR': (False, 'Estee, according to Act of Congress, in the ' - 'year 1872,\n' - 'By D. APPLETON & CO.,\n' - 'In the Office of the Librarian of Congress, ' - 'at Washington.'), - 'googleOCR': (False, 'ENTERED, according to Act of Congress, in ' - 'the year 1572,\nBY D. APPLETON & CO.\n' - 'In the Office of the Librarian of ' - 'Congress, at Washington.\n4 334\n'), - } + data = { + 'title': + 'Page:Popular Science Monthly Volume 1.djvu/10', + 'wmfOCR': + 'Estee, according to Act of Congress, in the year 1872,\n' + 'By D. APPLETON & CO.,\n' + 'In the Office of the Librarian of Congress, at Washington.', + 'googleOCR': + 'ENTERED, according to Act of Congress, in the year 1572,\n' + 'BY D. APPLETON & CO.\n' + 'In the Office of the Librarian of Congress, at Washington.\n' + '4 334\n', + } def setUp(self): """Test setUp.""" @@ -484,33 +477,12 @@ with self.assertRaises(TypeError): self.page.ocr(ocr_tool='dummy') - def test_do_hocr(self): - """Test page._do_hocr().""" - error, text = self.page._do_hocr() - if error: - self.skipTest(text) - ref_error, ref_text = self.data['hocr'] - self.assertEqual(error, ref_error) - s = difflib.SequenceMatcher(None, text, ref_text) - self.assertGreater(s.ratio(), 0.9) - - def test_do_ocr_phetools(self): - """Test page._do_ocr(ocr_tool='phetools').""" - error, text = self.page._do_ocr(ocr_tool='phetools') - ref_error, ref_text = self.data['ocr'] - if error: - self.skipTest(text) - self.assertEqual(error, ref_error) - s = difflib.SequenceMatcher(None, text, ref_text) - self.assertGreater(s.ratio(), 0.9) - def test_do_ocr_wmfocr(self): """Test page._do_ocr(ocr_tool='wmfOCR').""" error, text = self.page._do_ocr(ocr_tool='wmfOCR') if error: self.skipTest(text) - ref_error, ref_text = self.data['wmfOCR'] - self.assertEqual(error, ref_error) + ref_text = self.data['wmfOCR'] s = difflib.SequenceMatcher(None, text, ref_text) self.assertGreater(s.ratio(), 0.9) @@ -519,8 +491,7 @@ error, text = self.page._do_ocr(ocr_tool='googleOCR') if error: self.skipTest(text) - ref_error, ref_text = self.data['googleOCR'] - self.assertEqual(error, ref_error) + ref_text = self.data['googleOCR'] s = difflib.SequenceMatcher(None, text, ref_text) self.assertGreater(s.ratio(), 0.9) @@ -531,7 +502,7 @@ except Exception as exc: self.assertIsInstance(exc, ValueError) else: - _error, ref_text = self.data['wmfOCR'] + ref_text = self.data['wmfOCR'] s = difflib.SequenceMatcher(None, text, ref_text) self.assertGreater(s.ratio(), 0.9) -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/1036688?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.wikimedia.org/r/settings Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Change-Id: I4eecee8a034ef889857071c82d27fcb5ca5b7db8 Gerrit-Change-Number: 1036688 Gerrit-PatchSet: 5 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Sohom Datta <sohomdatta1(a)gmail.com> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot Gerrit-CC: Mpaa <mpaa.wiki(a)gmail.com> Gerrit-MessageType: merged

16 hours, 42 minutes

[Gerrit] ...core[master]: [cleanup] deactivate wait cycle for Page.main_authors()

by jenkins-bot (Code Review)

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/1036734?usp=email ) Change subject: [cleanup] deactivate wait cycle for Page.main_authors() ...................................................................... [cleanup] deactivate wait cycle for Page.main_authors() Bug: T366100 Change-Id: I3bf4e6e28ebd4b75f53469754be1d3329b026e4f --- M pywikibot/page/_toolforge.py 1 file changed, 11 insertions(+), 9 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/page/_toolforge.py b/pywikibot/page/_toolforge.py index 37df61b..ebdf5b2 100644 --- a/pywikibot/page/_toolforge.py +++ b/pywikibot/page/_toolforge.py @@ -3,7 +3,7 @@ .. versionadded:: 7.7 """ # -# (C) Pywikibot team, 2022-2023 +# (C) Pywikibot team, 2022-2024 # # Distributed under the terms of the MIT license. # @@ -62,19 +62,20 @@ .. note:: Only implemented for main namespace pages. .. note:: Only wikipedias of :attr:`WIKIBLAME_CODES` are supported. + .. attention:: This method does not return new results due to + :phab:`366100`. .. seealso:: - https://wikihistory.toolforge.org - https://de.wikipedia.org/wiki/Wikipedia:Technik/Cloud/wikihistory - :param onlynew: If False, use the cached values. If True, - calculate the Counter data which can take some time; it may - fail with TimeoutError after ``config.max_retries``. If None - it calculates new data like for True but uses data from - cache if new data cannot be calculated in meantime. + .. versionchanged:: 9.2 + do not use any wait cycles due to :phab:`366100`. + + :param onlynew: Currently meaningless :return: Number of edits for each username :raise NotImplementedError: unsupported site or unsupported namespace :raise pywikibot.exceptions.NoPageError: The page does not exist - :raise pywikibot.exceptions.TimeoutError: Maximum retries exceeded + :raise pywikibot.exceptions.TimeoutError: No cached results found """ baseurl = 'https://wikihistory.toolforge.org' pattern = (r'><bdi>(?P<author>.+?)</bdi></a>\s' @@ -97,10 +98,11 @@ {user: int(cnt) for user, cnt in re.findall(pattern, r.text)}) + break # T366100 + delay = pywikibot.config.retry_wait * 2 ** current_retries pywikibot.warning('WikiHistory timeout.\n' - 'Waiting {:.1f} seconds before retrying.' - .format(delay)) + f'Waiting {delay:.1f} seconds before retrying.') pywikibot.sleep(delay) if onlynew is None and current_retries >= config.max_retries - 2: url += '&onlynew=1' -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/1036734?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.wikimedia.org/r/settings Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Change-Id: I3bf4e6e28ebd4b75f53469754be1d3329b026e4f Gerrit-Change-Number: 1036734 Gerrit-PatchSet: 1 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

2 days, 8 hours

[Gerrit] ...core[master]: [9.2.0d3] Follow-up for Pywikibot 9.1.3

by jenkins-bot (Code Review)

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/1036669?usp=email ) Change subject: [9.2.0d3] Follow-up for Pywikibot 9.1.3 ...................................................................... [9.2.0d3] Follow-up for Pywikibot 9.1.3 Change-Id: I58239fd83508fe852576a61b30f70106fefa17b5 --- M HISTORY.rst M pywikibot/__metadata__.py 2 files changed, 8 insertions(+), 1 deletion(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/HISTORY.rst b/HISTORY.rst index f9cefb7..3135942 100644 --- a/HISTORY.rst +++ b/HISTORY.rst @@ -1,6 +1,13 @@ Release history =============== +9.1.3 +----- +*28.05.2024* + +* Add support for dtpwiki (:phab:`T365232`) +* i18n updates + 9.1.2 ----- *03 May 2024* diff --git a/pywikibot/__metadata__.py b/pywikibot/__metadata__.py index 362e90a..6e5a9d0 100644 --- a/pywikibot/__metadata__.py +++ b/pywikibot/__metadata__.py @@ -12,6 +12,6 @@ from time import strftime -__version__ = '9.2.0.dev2' +__version__ = '9.2.0.dev3' __url__ = 'https://www.mediawiki.org/wiki/Manual:Pywikibot' __copyright__ = f'2003-{strftime("%Y")}, Pywikibot team' -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/1036669?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.wikimedia.org/r/settings Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Change-Id: I58239fd83508fe852576a61b30f70106fefa17b5 Gerrit-Change-Number: 1036669 Gerrit-PatchSet: 1 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

2 days, 14 hours

[Gerrit] ...core[stable]: [9.1.3] Add support for dtpwiki and publish Pywikibot 9.1.3 stable

by jenkins-bot (Code Review)

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/1036639?usp=email ) Change subject: [9.1.3] Add support for dtpwiki and publish Pywikibot 9.1.3 stable ...................................................................... [9.1.3] Add support for dtpwiki and publish Pywikibot 9.1.3 stable Signed-off-by: xqt <info(a)gno.de> Bug: T365232 Change-Id: I38f429f572debfab0d2871fdbfbcbbdefae19e3e --- M HISTORY.rst M ROADMAP.rst M pywikibot/__metadata__.py M pywikibot/families/wikipedia_family.py M requirements.txt M setup.py M tests/paraminfo_tests.py 7 files changed, 44 insertions(+), 35 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/HISTORY.rst b/HISTORY.rst index 3415a6d..fc240b8 100644 --- a/HISTORY.rst +++ b/HISTORY.rst @@ -1,6 +1,15 @@ Release history =============== +9.1.2 +----- +*03 May 2024* + +* Remove line endings in :func:`version.getversion_nightly` (:phab:`T363943`) +* Provide ``-nouser`` option with :mod:`pywikibot.scripts.version` +* i18n updates + + 9.1.1 ----- *27 April 2024* diff --git a/ROADMAP.rst b/ROADMAP.rst index 80c71e0..c8fa63a 100644 --- a/ROADMAP.rst +++ b/ROADMAP.rst @@ -1,8 +1,7 @@ Current release --------------- -* Remove line endings in :func:`version.getversion_nightly` (:phab:`T363943`) -* Provide ``-nouser`` option with :mod:`pywikibot.scripts.version` +* Add support for dtpwiki (:phab:`T365232`) * i18n updates Deprecations diff --git a/pywikibot/__metadata__.py b/pywikibot/__metadata__.py index a4b4218..7f50fd4 100644 --- a/pywikibot/__metadata__.py +++ b/pywikibot/__metadata__.py @@ -12,6 +12,6 @@ from time import strftime -__version__ = '9.1.2' +__version__ = '9.1.3' __url__ = 'https://www.mediawiki.org/wiki/Manual:Pywikibot' __copyright__ = f'2003-{strftime("%Y")}, Pywikibot team' diff --git a/pywikibot/families/wikipedia_family.py b/pywikibot/families/wikipedia_family.py index 9620473..531a61a 100644 --- a/pywikibot/families/wikipedia_family.py +++ b/pywikibot/families/wikipedia_family.py @@ -34,32 +34,32 @@ 'be', 'be-tarask', 'bew', 'bg', 'bh', 'bi', 'bjn', 'blk', 'bm', 'bn', 'bo', 'bpy', 'br', 'bs', 'bug', 'bxr', 'ca', 'cbk-zam', 'cdo', 'ce', 'ceb', 'ch', 'chr', 'chy', 'ckb', 'co', 'cr', 'crh', 'cs', 'csb', 'cu', - 'cv', 'cy', 'da', 'dag', 'de', 'dga', 'din', 'diq', 'dsb', 'dty', 'dv', - 'dz', 'ee', 'el', 'eml', 'en', 'eo', 'es', 'et', 'eu', 'ext', 'fa', - 'fat', 'ff', 'fi', 'fiu-vro', 'fj', 'fo', 'fon', 'fr', 'frp', 'frr', - 'fur', 'fy', 'ga', 'gag', 'gan', 'gcr', 'gd', 'gl', 'glk', 'gn', 'gom', - 'gor', 'got', 'gpe', 'gu', 'guc', 'gur', 'guw', 'gv', 'ha', 'hak', - 'haw', 'he', 'hi', 'hif', 'hr', 'hsb', 'ht', 'hu', 'hy', 'hyw', 'ia', - 'id', 'ie', 'ig', 'igl', 'ik', 'ilo', 'inh', 'io', 'is', 'it', 'iu', - 'ja', 'jam', 'jbo', 'jv', 'ka', 'kaa', 'kab', 'kbd', 'kbp', 'kcg', - 'kg', 'ki', 'kk', 'kl', 'km', 'kn', 'ko', 'koi', 'krc', 'ks', 'ksh', - 'ku', 'kus', 'kv', 'kw', 'ky', 'la', 'lad', 'lb', 'lbe', 'lez', 'lfn', - 'lg', 'li', 'lij', 'lld', 'lmo', 'ln', 'lo', 'lt', 'ltg', 'lv', 'mad', - 'mai', 'map-bms', 'mdf', 'mg', 'mhr', 'mi', 'min', 'mk', 'ml', 'mn', - 'mni', 'mnw', 'mr', 'mrj', 'ms', 'mt', 'mwl', 'my', 'myv', 'mzn', - 'nah', 'nap', 'nds', 'nds-nl', 'ne', 'new', 'nia', 'nl', 'nn', 'no', - 'nov', 'nqo', 'nrm', 'nso', 'nv', 'ny', 'oc', 'olo', 'om', 'or', 'os', - 'pa', 'pag', 'pam', 'pap', 'pcd', 'pcm', 'pdc', 'pfl', 'pi', 'pih', - 'pl', 'pms', 'pnb', 'pnt', 'ps', 'pt', 'pwn', 'qu', 'rm', 'rmy', 'rn', - 'ro', 'roa-rup', 'roa-tara', 'ru', 'rue', 'rw', 'sa', 'sah', 'sat', - 'sc', 'scn', 'sco', 'sd', 'se', 'sg', 'sh', 'shi', 'shn', 'si', - 'simple', 'sk', 'skr', 'sl', 'sm', 'smn', 'sn', 'so', 'sq', 'sr', - 'srn', 'ss', 'st', 'stq', 'su', 'sv', 'sw', 'szl', 'szy', 'ta', 'tay', - 'tcy', 'te', 'tet', 'tg', 'th', 'ti', 'tk', 'tl', 'tly', 'tn', 'to', - 'tpi', 'tr', 'trv', 'ts', 'tt', 'tum', 'tw', 'ty', 'tyv', 'udm', 'ug', - 'uk', 'ur', 'uz', 've', 'vec', 'vep', 'vi', 'vls', 'vo', 'wa', 'war', - 'wo', 'wuu', 'xal', 'xh', 'xmf', 'yi', 'yo', 'za', 'zea', 'zgh', 'zh', - 'zh-classical', 'zh-min-nan', 'zh-yue', 'zu', + 'cv', 'cy', 'da', 'dag', 'de', 'dga', 'din', 'diq', 'dsb', 'dtp', + 'dty', 'dv', 'dz', 'ee', 'el', 'eml', 'en', 'eo', 'es', 'et', 'eu', + 'ext', 'fa', 'fat', 'ff', 'fi', 'fiu-vro', 'fj', 'fo', 'fon', 'fr', + 'frp', 'frr', 'fur', 'fy', 'ga', 'gag', 'gan', 'gcr', 'gd', 'gl', + 'glk', 'gn', 'gom', 'gor', 'got', 'gpe', 'gu', 'guc', 'gur', 'guw', + 'gv', 'ha', 'hak', 'haw', 'he', 'hi', 'hif', 'hr', 'hsb', 'ht', 'hu', + 'hy', 'hyw', 'ia', 'id', 'ie', 'ig', 'igl', 'ik', 'ilo', 'inh', 'io', + 'is', 'it', 'iu', 'ja', 'jam', 'jbo', 'jv', 'ka', 'kaa', 'kab', 'kbd', + 'kbp', 'kcg', 'kg', 'ki', 'kk', 'kl', 'km', 'kn', 'ko', 'koi', 'krc', + 'ks', 'ksh', 'ku', 'kus', 'kv', 'kw', 'ky', 'la', 'lad', 'lb', 'lbe', + 'lez', 'lfn', 'lg', 'li', 'lij', 'lld', 'lmo', 'ln', 'lo', 'lt', + 'ltg', 'lv', 'mad', 'mai', 'map-bms', 'mdf', 'mg', 'mhr', 'mi', 'min', + 'mk', 'ml', 'mn', 'mni', 'mnw', 'mr', 'mrj', 'ms', 'mt', 'mwl', 'my', + 'myv', 'mzn', 'nah', 'nap', 'nds', 'nds-nl', 'ne', 'new', 'nia', 'nl', + 'nn', 'no', 'nov', 'nqo', 'nrm', 'nso', 'nv', 'ny', 'oc', 'olo', 'om', + 'or', 'os', 'pa', 'pag', 'pam', 'pap', 'pcd', 'pcm', 'pdc', 'pfl', + 'pi', 'pih', 'pl', 'pms', 'pnb', 'pnt', 'ps', 'pt', 'pwn', 'qu', 'rm', + 'rmy', 'rn', 'ro', 'roa-rup', 'roa-tara', 'ru', 'rue', 'rw', 'sa', + 'sah', 'sat', 'sc', 'scn', 'sco', 'sd', 'se', 'sg', 'sh', 'shi', + 'shn', 'si', 'simple', 'sk', 'skr', 'sl', 'sm', 'smn', 'sn', 'so', + 'sq', 'sr', 'srn', 'ss', 'st', 'stq', 'su', 'sv', 'sw', 'szl', 'szy', + 'ta', 'tay', 'tcy', 'te', 'tet', 'tg', 'th', 'ti', 'tk', 'tl', 'tly', + 'tn', 'to', 'tpi', 'tr', 'trv', 'ts', 'tt', 'tum', 'tw', 'ty', 'tyv', + 'udm', 'ug', 'uk', 'ur', 'uz', 've', 'vec', 'vep', 'vi', 'vls', 'vo', + 'wa', 'war', 'wo', 'wuu', 'xal', 'xh', 'xmf', 'yi', 'yo', 'za', 'zea', + 'zgh', 'zh', 'zh-classical', 'zh-min-nan', 'zh-yue', 'zu', } # Sites we want to edit but not count as real languages diff --git a/requirements.txt b/requirements.txt index 6bdd15f..5da319c 100644 --- a/requirements.txt +++ b/requirements.txt @@ -40,7 +40,7 @@ python-stdnum >= 1.19 # GUI -Pillow >= 8.1.2, != 10.0, != 10.1 +Pillow >= 8.1.2, != 10.0, != 10.1 ; python_version < '3.13' # core pagegenerators google >= 1.7 diff --git a/setup.py b/setup.py index 5428b45..010e333 100755 --- a/setup.py +++ b/setup.py @@ -17,7 +17,7 @@ ``pywikibot.__metadata__.py`` and adding developmental identifier - upload this patchset to Gerrit and merge it. -.. warning: do not upload a development release to pypi. +.. warning:: do not upload a development release to pypi. """ # # (C) Pywikibot team, 2009-2024 @@ -45,7 +45,7 @@ 'wikitextparser': ['wikitextparser>=0.47.0'], 'mysql': ['PyMySQL >= 1.0.0'], # vulnerability found in Pillow<8.1.2 but toolforge uses 5.4.1 - 'Tkinter': ['Pillow>=8.1.2, != 10.0, != 10.1'], + 'Tkinter': ['Pillow>=8.1.2, != 10.0, != 10.1; python_version < "3.13"'], 'mwoauth': ['mwoauth!=0.3.1,>=0.2.4'], 'html': ['beautifulsoup4>=4.7.1'], 'http': ['fake-useragent>=1.4.0'], @@ -64,7 +64,8 @@ 'flake8-string-format', 'flake8-tuple>=0.4.1', 'flake8-no-u-prefixed-strings>=0.2', - 'pep8-naming>=0.13.3', + 'pep8-naming==0.13.3; python_version < "3.8"', + 'pep8-naming>=0.14.0; python_version >= "3.8"', ], 'hacking': [ 'hacking', diff --git a/tests/paraminfo_tests.py b/tests/paraminfo_tests.py index fd5f183..7c2c03b 100755 --- a/tests/paraminfo_tests.py +++ b/tests/paraminfo_tests.py @@ -1,7 +1,7 @@ #!/usr/bin/env python3 """Test confirming paraminfo contains expected values.""" # -# (C) Pywikibot team, 2015-2023 +# (C) Pywikibot team, 2015-2024 # # Distributed under the terms of the MIT license. # @@ -216,7 +216,7 @@ def test_entities(self): """Test known entities.""" - unsupported = {'form', 'lexeme', 'sense'} # T195435 + unsupported = {'entity-schema', 'form', 'lexeme', 'sense'} # T195435 supported = {'item', 'property'} known = supported | unsupported self._check_param_superset( -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/1036639?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.wikimedia.org/r/settings Gerrit-Project: pywikibot/core Gerrit-Branch: stable Gerrit-Change-Id: I38f429f572debfab0d2871fdbfbcbbdefae19e3e Gerrit-Change-Number: 1036639 Gerrit-PatchSet: 4 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot Gerrit-CC: Zabe <zabe(a)avorwerk.net> Gerrit-MessageType: merged

2 days, 14 hours

[Gerrit] ...core[master]: [tests] Ignore Python 3 compatibility tests with hacking

by Xqt (Code Review)

Xqt has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/1036666?usp=email ) Change subject: [tests] Ignore Python 3 compatibility tests with hacking ...................................................................... [tests] Ignore Python 3 compatibility tests with hacking Bug: T366050 Change-Id: I7b53a82e3c689b1a740f169880a5e2a9bf50eb3e --- M tox.ini 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/tox.ini b/tox.ini index f7cb582..2ca9de4 100644 --- a/tox.ini +++ b/tox.ini @@ -119,7 +119,7 @@ # D211: No blank lines allowed before class docstring # FI1: __future__ import "x" missing # H101: TODO format -# H238: Old style class +# H23: Python 3 compatibility tests # H301: Do not import more than one module per line # H306: Alphabetically order your imports by the full module path # H404: docstring multiline start @@ -138,7 +138,7 @@ # DARXXX: Darglint docstring issues to be solved -ignore = B007,D105,D211,D401,D413,D412,DAR003,DAR101,DAR102,DAR201,DAR202,DAR301,DAR401,DAR402,DAR501,H101,H238,H301,H306,H404,H405,H903,P101,P102,P103,P205,R100,W503 +ignore = B007,D105,D211,D401,D413,D412,DAR003,DAR101,DAR102,DAR201,DAR202,DAR301,DAR401,DAR402,DAR501,H101,H231,H232,H233,H234,H235,H236,H237,H238,H301,H306,H404,H405,H903,P101,P102,P103,P205,R100,W503 enable-extensions = H203,H204,H205,N818 count = True -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/1036666?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.wikimedia.org/r/settings Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Change-Id: I7b53a82e3c689b1a740f169880a5e2a9bf50eb3e Gerrit-Change-Number: 1036666 Gerrit-PatchSet: 1 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

2 days, 14 hours

[Gerrit] ...core[master]: Add support for dtpwiki

by jenkins-bot (Code Review)

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/1036578?usp=email ) Change subject: Add support for dtpwiki ...................................................................... Add support for dtpwiki Bug: T365232 Change-Id: I69af1cbab956be6ae9a95ec5ed91533214375c5d --- M pywikibot/families/wikipedia_family.py 1 file changed, 26 insertions(+), 26 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/families/wikipedia_family.py b/pywikibot/families/wikipedia_family.py index 9620473..531a61a 100644 --- a/pywikibot/families/wikipedia_family.py +++ b/pywikibot/families/wikipedia_family.py @@ -34,32 +34,32 @@ 'be', 'be-tarask', 'bew', 'bg', 'bh', 'bi', 'bjn', 'blk', 'bm', 'bn', 'bo', 'bpy', 'br', 'bs', 'bug', 'bxr', 'ca', 'cbk-zam', 'cdo', 'ce', 'ceb', 'ch', 'chr', 'chy', 'ckb', 'co', 'cr', 'crh', 'cs', 'csb', 'cu', - 'cv', 'cy', 'da', 'dag', 'de', 'dga', 'din', 'diq', 'dsb', 'dty', 'dv', - 'dz', 'ee', 'el', 'eml', 'en', 'eo', 'es', 'et', 'eu', 'ext', 'fa', - 'fat', 'ff', 'fi', 'fiu-vro', 'fj', 'fo', 'fon', 'fr', 'frp', 'frr', - 'fur', 'fy', 'ga', 'gag', 'gan', 'gcr', 'gd', 'gl', 'glk', 'gn', 'gom', - 'gor', 'got', 'gpe', 'gu', 'guc', 'gur', 'guw', 'gv', 'ha', 'hak', - 'haw', 'he', 'hi', 'hif', 'hr', 'hsb', 'ht', 'hu', 'hy', 'hyw', 'ia', - 'id', 'ie', 'ig', 'igl', 'ik', 'ilo', 'inh', 'io', 'is', 'it', 'iu', - 'ja', 'jam', 'jbo', 'jv', 'ka', 'kaa', 'kab', 'kbd', 'kbp', 'kcg', - 'kg', 'ki', 'kk', 'kl', 'km', 'kn', 'ko', 'koi', 'krc', 'ks', 'ksh', - 'ku', 'kus', 'kv', 'kw', 'ky', 'la', 'lad', 'lb', 'lbe', 'lez', 'lfn', - 'lg', 'li', 'lij', 'lld', 'lmo', 'ln', 'lo', 'lt', 'ltg', 'lv', 'mad', - 'mai', 'map-bms', 'mdf', 'mg', 'mhr', 'mi', 'min', 'mk', 'ml', 'mn', - 'mni', 'mnw', 'mr', 'mrj', 'ms', 'mt', 'mwl', 'my', 'myv', 'mzn', - 'nah', 'nap', 'nds', 'nds-nl', 'ne', 'new', 'nia', 'nl', 'nn', 'no', - 'nov', 'nqo', 'nrm', 'nso', 'nv', 'ny', 'oc', 'olo', 'om', 'or', 'os', - 'pa', 'pag', 'pam', 'pap', 'pcd', 'pcm', 'pdc', 'pfl', 'pi', 'pih', - 'pl', 'pms', 'pnb', 'pnt', 'ps', 'pt', 'pwn', 'qu', 'rm', 'rmy', 'rn', - 'ro', 'roa-rup', 'roa-tara', 'ru', 'rue', 'rw', 'sa', 'sah', 'sat', - 'sc', 'scn', 'sco', 'sd', 'se', 'sg', 'sh', 'shi', 'shn', 'si', - 'simple', 'sk', 'skr', 'sl', 'sm', 'smn', 'sn', 'so', 'sq', 'sr', - 'srn', 'ss', 'st', 'stq', 'su', 'sv', 'sw', 'szl', 'szy', 'ta', 'tay', - 'tcy', 'te', 'tet', 'tg', 'th', 'ti', 'tk', 'tl', 'tly', 'tn', 'to', - 'tpi', 'tr', 'trv', 'ts', 'tt', 'tum', 'tw', 'ty', 'tyv', 'udm', 'ug', - 'uk', 'ur', 'uz', 've', 'vec', 'vep', 'vi', 'vls', 'vo', 'wa', 'war', - 'wo', 'wuu', 'xal', 'xh', 'xmf', 'yi', 'yo', 'za', 'zea', 'zgh', 'zh', - 'zh-classical', 'zh-min-nan', 'zh-yue', 'zu', + 'cv', 'cy', 'da', 'dag', 'de', 'dga', 'din', 'diq', 'dsb', 'dtp', + 'dty', 'dv', 'dz', 'ee', 'el', 'eml', 'en', 'eo', 'es', 'et', 'eu', + 'ext', 'fa', 'fat', 'ff', 'fi', 'fiu-vro', 'fj', 'fo', 'fon', 'fr', + 'frp', 'frr', 'fur', 'fy', 'ga', 'gag', 'gan', 'gcr', 'gd', 'gl', + 'glk', 'gn', 'gom', 'gor', 'got', 'gpe', 'gu', 'guc', 'gur', 'guw', + 'gv', 'ha', 'hak', 'haw', 'he', 'hi', 'hif', 'hr', 'hsb', 'ht', 'hu', + 'hy', 'hyw', 'ia', 'id', 'ie', 'ig', 'igl', 'ik', 'ilo', 'inh', 'io', + 'is', 'it', 'iu', 'ja', 'jam', 'jbo', 'jv', 'ka', 'kaa', 'kab', 'kbd', + 'kbp', 'kcg', 'kg', 'ki', 'kk', 'kl', 'km', 'kn', 'ko', 'koi', 'krc', + 'ks', 'ksh', 'ku', 'kus', 'kv', 'kw', 'ky', 'la', 'lad', 'lb', 'lbe', + 'lez', 'lfn', 'lg', 'li', 'lij', 'lld', 'lmo', 'ln', 'lo', 'lt', + 'ltg', 'lv', 'mad', 'mai', 'map-bms', 'mdf', 'mg', 'mhr', 'mi', 'min', + 'mk', 'ml', 'mn', 'mni', 'mnw', 'mr', 'mrj', 'ms', 'mt', 'mwl', 'my', + 'myv', 'mzn', 'nah', 'nap', 'nds', 'nds-nl', 'ne', 'new', 'nia', 'nl', + 'nn', 'no', 'nov', 'nqo', 'nrm', 'nso', 'nv', 'ny', 'oc', 'olo', 'om', + 'or', 'os', 'pa', 'pag', 'pam', 'pap', 'pcd', 'pcm', 'pdc', 'pfl', + 'pi', 'pih', 'pl', 'pms', 'pnb', 'pnt', 'ps', 'pt', 'pwn', 'qu', 'rm', + 'rmy', 'rn', 'ro', 'roa-rup', 'roa-tara', 'ru', 'rue', 'rw', 'sa', + 'sah', 'sat', 'sc', 'scn', 'sco', 'sd', 'se', 'sg', 'sh', 'shi', + 'shn', 'si', 'simple', 'sk', 'skr', 'sl', 'sm', 'smn', 'sn', 'so', + 'sq', 'sr', 'srn', 'ss', 'st', 'stq', 'su', 'sv', 'sw', 'szl', 'szy', + 'ta', 'tay', 'tcy', 'te', 'tet', 'tg', 'th', 'ti', 'tk', 'tl', 'tly', + 'tn', 'to', 'tpi', 'tr', 'trv', 'ts', 'tt', 'tum', 'tw', 'ty', 'tyv', + 'udm', 'ug', 'uk', 'ur', 'uz', 've', 'vec', 'vep', 'vi', 'vls', 'vo', + 'wa', 'war', 'wo', 'wuu', 'xal', 'xh', 'xmf', 'yi', 'yo', 'za', 'zea', + 'zgh', 'zh', 'zh-classical', 'zh-min-nan', 'zh-yue', 'zu', } # Sites we want to edit but not count as real languages -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/1036578?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.wikimedia.org/r/settings Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Change-Id: I69af1cbab956be6ae9a95ec5ed91533214375c5d Gerrit-Change-Number: 1036578 Gerrit-PatchSet: 3 Gerrit-Owner: Zabe <zabe(a)avorwerk.net> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

2 days, 17 hours

[Gerrit] ...i18n[master]: Localisation updates from https://translatewiki.net.

by jenkins-bot (Code Review)

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/i18n/+/1036253?usp=email ) Change subject: Localisation updates from https://translatewiki.net. ...................................................................... Localisation updates from https://translatewiki.net. Change-Id: I37317b35c2dece3d48a0482ab484658f6ec33984 --- M category/zh.json 1 file changed, 2 insertions(+), 1 deletion(-) Approvals: L10n-bot: Looks good to me, approved jenkins-bot: Verified diff --git a/category/zh.json b/category/zh.json index 78ee627..dec1273 100644 --- a/category/zh.json +++ b/category/zh.json @@ -4,6 +4,7 @@ "A Chinese Wikipedian", "Anakmalaysia", "Hehua", + "LittlePaw365", "Liuxinyu970226", "Shizhao", "StarrySky", @@ -22,7 +23,7 @@ "category-section-title": "之前%(oldcat)s的页面历史", "category-strip-cfd-templates": "机器人：完成操作时移除CFD模板", "category-strip-sort-keys": "机器人：删除已完成动作的排序键", - "category-strip-both": "机器人：删除CFD模板并为完成的操作排序关键字", + "category-strip-both": "机器人：删除已完成操作的CFD模板和排序键", "category-version-history": "机器人：保存之前%(oldcat)s的历史版本记录", "category-was-disbanded": "机器人：分类已被解散", "category-was-moved": "机器人：移动分类至[[:Category:%(newcat)s|%(title)s]]" -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/i18n/+/1036253?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.wikimedia.org/r/settings Gerrit-Project: pywikibot/i18n Gerrit-Branch: master Gerrit-Change-Id: I37317b35c2dece3d48a0482ab484658f6ec33984 Gerrit-Change-Number: 1036253 Gerrit-PatchSet: 1 Gerrit-Owner: L10n-bot <l10n-bot(a)translatewiki.net> Gerrit-Reviewer: L10n-bot <l10n-bot(a)translatewiki.net> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

3 days, 15 hours

[Gerrit] ...core[master]: Fix some spelling mistakes

by jenkins-bot (Code Review)

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/1036094?usp=email ) Change subject: Fix some spelling mistakes ...................................................................... Fix some spelling mistakes Change-Id: If6060f720f46ae71a426be01679e78f683174752 --- M pywikibot/date.py M tests/file_tests.py 2 files changed, 4 insertions(+), 4 deletions(-) Approvals: jenkins-bot: Verified Xqt: Looks good to me, approved diff --git a/pywikibot/date.py b/pywikibot/date.py index 09d7caf..ef12fff 100644 --- a/pywikibot/date.py +++ b/pywikibot/date.py @@ -708,7 +708,7 @@ def _en_period(period: str): - """Create century and millenium format function for ``en`` language.""" + """Create century and millennium format function for ``en`` language.""" return lambda m: multi(m, [ (lambda v: dh_centuryAD(v, '%dst ' + period), lambda p: p == 1 or (p > 20 and p % 10 == 1)), @@ -720,7 +720,7 @@ def _period_with_pattern(period: str, pattern: str): - """Create century and millenium format function with pattern.""" + """Create century and millennium format function with pattern.""" return lambda m: multi(m, [ (lambda v: dh_constVal(v, 1, period), lambda p: p == 1), (lambda v: dh(v, pattern, lambda i: i - 1, lambda ii: ii[0] + 1), diff --git a/tests/file_tests.py b/tests/file_tests.py index f411ca4..f55d73c 100755 --- a/tests/file_tests.py +++ b/tests/file_tests.py @@ -1,7 +1,7 @@ #!/usr/bin/env python3 """FilePage tests.""" # -# (C) Pywikibot team, 2014-2023 +# (C) Pywikibot team, 2014-2024 # # Distributed under the terms of the MIT license. # @@ -259,7 +259,7 @@ self.assertEqual(self.image.latest_file_info.thumbwidth, 100) self.assertEqual(self.image.latest_file_info.thumbheight, 133) - def test_get_file_url_thumburl_from_heigth(self): + def test_get_file_url_thumburl_from_height(self): """Get File thumburl from height.""" self.assertTrue(self.image.exists()) # url_param has no precedence over height/width. -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/1036094?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.wikimedia.org/r/settings Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Change-Id: If6060f720f46ae71a426be01679e78f683174752 Gerrit-Change-Number: 1036094 Gerrit-PatchSet: 1 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

3 days, 20 hours

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

Pywikibot-commits May 2024