Pywikibot-commits May 2019

pywikibot-commits@lists.wikimedia.org

1 participants
147 discussions

[Gerrit] pywikibot/core[master]: [cleanup] use setUpModule to skipping tests

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/509360 ) Change subject: [cleanup] use setUpModule to skipping tests ...................................................................... [cleanup] use setUpModule to skipping tests Change-Id: I1ae3035d6aba82dd0af43dca94098009749cb8bd --- M tests/tk_tests.py 1 file changed, 6 insertions(+), 14 deletions(-) Approvals: Dvorapa: Looks good to me, but someone else must approve Zhuyifei1999: Looks good to me, approved jenkins-bot: Verified diff --git a/tests/tk_tests.py b/tests/tk_tests.py index 844d238..c713f50 100644 --- a/tests/tk_tests.py +++ b/tests/tk_tests.py @@ -28,13 +28,6 @@ net = True - @classmethod - def setUpClass(cls): - """Set up test class.""" - if os.environ.get('PYWIKIBOT_TEST_GUI', '0') != '1': - raise unittest.SkipTest('Tkdialog tests are disabled on Travis-CI') - super(TestTkdialog, cls).setUpClass() - def testTkdialog(self): """Test Tk dialog.""" try: @@ -50,13 +43,6 @@ net = True - @classmethod - def setUpClass(cls): - """Set up test class.""" - if os.environ.get('PYWIKIBOT_TEST_GUI', '0') != '1': - raise unittest.SkipTest('Tkinter tests are disabled on Travis-CI') - super(TestTkinter, cls).setUpClass() - def testTkinter(self): """Test Tkinter window.""" root = tkinter.Tk() @@ -70,6 +56,12 @@ assert v is None +def setUpModule(): # noqa: N802 + """Skip Travis tests if PYWIKIBOT_TEST_GUI variable is not set.""" + if os.environ.get('PYWIKIBOT_TEST_GUI', '0') != '1': + raise unittest.SkipTest('Tkinter tests are disabled on Travis-CI') + + if __name__ == '__main__': # pragma: no cover try: unittest.main() -- To view, visit https://gerrit.wikimedia.org/r/509360 To unsubscribe, or for help writing mail filters, visit https://gerrit.wikimedia.org/r/settings Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I1ae3035d6aba82dd0af43dca94098009749cb8bd Gerrit-Change-Number: 509360 Gerrit-PatchSet: 1 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Dvorapa <dvorapa(a)seznam.cz> Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com> Gerrit-Reviewer: Zhuyifei1999 <zhuyifei1999(a)gmail.com> Gerrit-Reviewer: jenkins-bot (75)

4 years, 11 months

[Gerrit] pywikibot/core[master]: [IMPR] try/except is far away from raising point

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/508003 ) Change subject: [IMPR] try/except is far away from raising point ...................................................................... [IMPR] try/except is far away from raising point - put the except statement immediately after the page creating statement where the exception can be raised Change-Id: I813e1e8018e9648c799dd88c160c5d7da1df9024 --- M scripts/commonscat.py 1 file changed, 49 insertions(+), 48 deletions(-) Approvals: Zhuyifei1999: Looks good to me, approved jenkins-bot: Verified diff --git a/scripts/commonscat.py b/scripts/commonscat.py index 9f59c0a..78313ed 100755 --- a/scripts/commonscat.py +++ b/scripts/commonscat.py @@ -428,61 +428,62 @@ """ pywikibot.log('getCommonscat: ' + name) + commonsSite = self.site.image_repository() + try: - commonsSite = self.site.image_repository() # This can throw a pywikibot.BadTitle commonsPage = pywikibot.Page(commonsSite, 'Category:' + name) - - if not commonsPage.exists(): - pywikibot.output('Commons category does not exist. ' - 'Examining deletion log...') - logpages = commonsSite.logevents(logtype='delete', - page=commonsPage) - for logitem in logpages: - loguser = logitem.user() - logcomment = logitem.comment() - # Some logic to extract the target page. - regex = ( - r'moved to \[\[\:?Category:' - r'(?P<newcat1>[^\|\}]+)(\|[^\}]+)?\]\]|' - r'Robot: Changing Category:(.+) ' - r'to Category:(?P<newcat2>.+)') - m = re.search(regex, logcomment, flags=re.I) - if m: - if m.group('newcat1'): - return self.checkCommonscatLink(m.group('newcat1')) - elif m.group('newcat2'): - return self.checkCommonscatLink(m.group('newcat2')) - else: - pywikibot.output( - "getCommonscat: {} deleted by {}. Couldn't find " - 'move target in "{}"' - .format(commonsPage, loguser, logcomment)) - return '' - return '' - elif commonsPage.isRedirectPage(): - pywikibot.log('getCommonscat: The category is a redirect') - return self.checkCommonscatLink( - commonsPage.getRedirectTarget().title(with_ns=False)) - elif (pywikibot.Page(commonsPage.site, - 'Template:Category redirect') in commonsPage.templates()): - pywikibot.log( - 'getCommonscat: The category is a category redirect') - for template in commonsPage.templatesWithParams(): - if ( - template[0].title(with_ns=False) == 'Category redirect' - and len(template[1]) > 0 - ): - return self.checkCommonscatLink(template[1][0]) - elif commonsPage.isDisambig(): - pywikibot.log('getCommonscat: The category is disambiguation') - return '' - else: - return commonsPage.title(with_ns=False) except pywikibot.BadTitle: # Funky title so not correct return '' + if not commonsPage.exists(): + pywikibot.output('Commons category does not exist. ' + 'Examining deletion log...') + logpages = commonsSite.logevents(logtype='delete', + page=commonsPage) + for logitem in logpages: + loguser = logitem.user() + logcomment = logitem.comment() + # Some logic to extract the target page. + regex = ( + r'moved to \[\[\:?Category:' + r'(?P<newcat1>[^\|\}]+)(\|[^\}]+)?\]\]|' + r'Robot: Changing Category:(.+) ' + r'to Category:(?P<newcat2>.+)') + m = re.search(regex, logcomment, flags=re.I) + if m: + if m.group('newcat1'): + return self.checkCommonscatLink(m.group('newcat1')) + elif m.group('newcat2'): + return self.checkCommonscatLink(m.group('newcat2')) + else: + pywikibot.output( + "getCommonscat: {} deleted by {}. Couldn't find " + 'move target in "{}"' + .format(commonsPage, loguser, logcomment)) + return '' + return '' + elif commonsPage.isRedirectPage(): + pywikibot.log('getCommonscat: The category is a redirect') + return self.checkCommonscatLink( + commonsPage.getRedirectTarget().title(with_ns=False)) + elif (pywikibot.Page(commonsPage.site, + 'Template:Category redirect') in commonsPage.templates()): + pywikibot.log( + 'getCommonscat: The category is a category redirect') + for template in commonsPage.templatesWithParams(): + if ( + template[0].title(with_ns=False) == 'Category redirect' + and len(template[1]) > 0 + ): + return self.checkCommonscatLink(template[1][0]) + elif commonsPage.isDisambig(): + pywikibot.log('getCommonscat: The category is disambiguation') + return '' + + return commonsPage.title(with_ns=False) + def main(*args): """ -- To view, visit https://gerrit.wikimedia.org/r/508003 To unsubscribe, or for help writing mail filters, visit https://gerrit.wikimedia.org/r/settings Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I813e1e8018e9648c799dd88c160c5d7da1df9024 Gerrit-Change-Number: 508003 Gerrit-PatchSet: 1 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: D3r1ck01 <xsavitar.wiki(a)aol.com> Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com> Gerrit-Reviewer: Zhuyifei1999 <zhuyifei1999(a)gmail.com> Gerrit-Reviewer: jenkins-bot (75)

4 years, 11 months

[Gerrit] pywikibot/core[master]: [bugfix] fromlist identifiers must not be unicode in Python 2

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/510687 ) Change subject: [bugfix] fromlist identifiers must not be unicode in Python 2 ...................................................................... [bugfix] fromlist identifiers must not be unicode in Python 2 detached from I1d12bfa2 Change-Id: I6186954414192cb51d1364eba780adbc14dc8d99 --- M pywikibot/__init__.py 1 file changed, 2 insertions(+), 0 deletions(-) Approvals: Zhuyifei1999: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/__init__.py b/pywikibot/__init__.py index f032eb1..f7504d3 100644 --- a/pywikibot/__init__.py +++ b/pywikibot/__init__.py @@ -1256,6 +1256,8 @@ if not isinstance(interface, type): # If it isn't a class, assume it is a string + if PY2: # Must not be unicode in Python 2 + interface = str(interface) try: tmp = __import__('pywikibot.site', fromlist=[interface]) except ImportError: -- To view, visit https://gerrit.wikimedia.org/r/510687 To unsubscribe, or for help writing mail filters, visit https://gerrit.wikimedia.org/r/settings Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I6186954414192cb51d1364eba780adbc14dc8d99 Gerrit-Change-Number: 510687 Gerrit-PatchSet: 2 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com> Gerrit-Reviewer: Zhuyifei1999 <zhuyifei1999(a)gmail.com> Gerrit-Reviewer: jenkins-bot (75)

4 years, 11 months

[Gerrit] pywikibot/core[master]: [doc] remove deprecated PageNotFound from doc

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/510995 ) Change subject: [doc] remove deprecated PageNotFound from doc ...................................................................... [doc] remove deprecated PageNotFound from doc PageNotFound exceptions is not used by pwb framework anymore Change-Id: Ib4ebedf847f0803652b02c7ea9804bfbb6b1a737 --- M pywikibot/exceptions.py 1 file changed, 0 insertions(+), 1 deletion(-) Approvals: Zhuyifei1999: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/exceptions.py b/pywikibot/exceptions.py index af759ba..68f01d0 100644 --- a/pywikibot/exceptions.py +++ b/pywikibot/exceptions.py @@ -12,7 +12,6 @@ - InvalidTitle: Invalid page title - CaptchaError: Captcha is asked and config.solve_captcha == False - Server504Error: Server timed out with HTTP 504 code - - PageNotFound: Page not found (deprecated) - i18n.TranslationError: i18n/l10n message not available - UnknownExtension: Extension is not defined for this site -- To view, visit https://gerrit.wikimedia.org/r/510995 To unsubscribe, or for help writing mail filters, visit https://gerrit.wikimedia.org/r/settings Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ib4ebedf847f0803652b02c7ea9804bfbb6b1a737 Gerrit-Change-Number: 510995 Gerrit-PatchSet: 1 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com> Gerrit-Reviewer: Zhuyifei1999 <zhuyifei1999(a)gmail.com> Gerrit-Reviewer: jenkins-bot (75)

4 years, 11 months

[Gerrit] pywikibot/core[master]: Add timestamp to deprecated methods

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/510998 ) Change subject: Add timestamp to deprecated methods ...................................................................... Add timestamp to deprecated methods Remove trailing '.' due to missing since parameter when creating message Change-Id: Ibfbe25abf3a9e0297b14b532addc0b110553d59a --- M pywikibot/bot.py M pywikibot/exceptions.py M pywikibot/site.py M tests/aspects.py 4 files changed, 6 insertions(+), 6 deletions(-) Approvals: Zhuyifei1999: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/bot.py b/pywikibot/bot.py index 7bbdc81..27efb43 100644 --- a/pywikibot/bot.py +++ b/pywikibot/bot.py @@ -1480,7 +1480,8 @@ initialized_page = self.init_page(item) except SkipPageError as e: issue_deprecation_warning('Use of SkipPageError', - 'BaseBot.skip_page() method', 2) + 'BaseBot.skip_page() method', 2, + since='20180522') pywikibot.warning('Skipped "{0}" due to: {1}'.format( item, e.reason)) if PY2: diff --git a/pywikibot/exceptions.py b/pywikibot/exceptions.py index af759ba..b69a057 100644 --- a/pywikibot/exceptions.py +++ b/pywikibot/exceptions.py @@ -586,7 +586,7 @@ pass -@__deprecated +@__deprecated(since='20141214') class DeprecatedPageNotFoundError(Error): """Page not found (deprecated).""" @@ -594,7 +594,7 @@ pass -@__deprecated +@__deprecated(since='20141218') class _EmailUserError(UserRightsError, NotEmailableError): """Email related error.""" diff --git a/pywikibot/site.py b/pywikibot/site.py index a37dadb..d074b6c 100644 --- a/pywikibot/site.py +++ b/pywikibot/site.py @@ -3146,7 +3146,7 @@ ) self._update_page(page, query) - @deprecated('page.exists()') + @deprecated('page.exists()', since='20180218') def page_exists(self, page): """Return True if and only if page is an existing page on site.""" return page.pageid > 0 diff --git a/tests/aspects.py b/tests/aspects.py index 6695894..09e817e 100644 --- a/tests/aspects.py +++ b/tests/aspects.py @@ -1586,8 +1586,7 @@ else: msg = '{0} is deprecated'.format(deprecated) if instead: - msg += '; use {0} instead'.format(instead) - msg += '.' + msg += '; use {0} instead.'.format(instead) return msg def assertDeprecationParts(self, deprecated=None, instead=None): -- To view, visit https://gerrit.wikimedia.org/r/510998 To unsubscribe, or for help writing mail filters, visit https://gerrit.wikimedia.org/r/settings Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ibfbe25abf3a9e0297b14b532addc0b110553d59a Gerrit-Change-Number: 510998 Gerrit-PatchSet: 3 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com> Gerrit-Reviewer: Zhuyifei1999 <zhuyifei1999(a)gmail.com> Gerrit-Reviewer: jenkins-bot (75)

4 years, 11 months

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

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/510841 ) Change subject: Localisation updates from https://translatewiki.net. ...................................................................... Localisation updates from https://translatewiki.net. Change-Id: I26bfee8d8c4dbb9603fd42b49be7ee87319a3aeb --- M archivebot/ko.json M category/ast.json M category_redirect/ko.json M checkimages/ast.json M checkimages/he.json M checkimages/ko.json M pywikibot/ast.json A standardize_interwiki/ast.json A standardize_interwiki/ko.json M unusedfiles/ast.json 10 files changed, 44 insertions(+), 8 deletions(-) Approvals: L10n-bot: Looks good to me, approved jenkins-bot: Verified diff --git a/archivebot/ko.json b/archivebot/ko.json index af2b2a6..5bdb3d1 100644 --- a/archivebot/ko.json +++ b/archivebot/ko.json @@ -4,12 +4,13 @@ "Kwj2772", "아라", "Revi", - "IRTC1015" + "IRTC1015", + "Ykhwong" ] }, "archivebot-archive-full": "(보존 가득참)", "archivebot-archive-summary": "봇: [[%(from)s]]에서 {{PLURAL:%(count)d|문단}} %(count)d개를 보존합니다", "archivebot-archiveheader": "{{보존}}", - "archivebot-older-than": "%(duration)s 보다 오래됨", + "archivebot-older-than": "%(duration)s 보다 {{PLURAL:%(count)d|오래됨}}", "archivebot-page-summary": "봇: {{PLURAL:%(count)d|문단}} %(count)d개(%(why)s)를 %(archives)s에 보존합니다" } diff --git a/category/ast.json b/category/ast.json index 5466435..f32732e 100644 --- a/category/ast.json +++ b/category/ast.json @@ -13,6 +13,8 @@ "category-replacing": "Bot: Trocando la categoría %(oldcat)s por %(newcat)s", "category-section-title": "Historial de páxina de %(oldcat)s anteriores", "category-strip-cfd-templates": "Bot: desaniciando les plantíes de categoríes a desaniciar pa l'aición completada", + "category-strip-sort-keys": "Botː Desaniciando claves d'ordenación pa una aición completada", + "category-strip-both": "Botː Desaniciando plantíes CFD y claves d'ordenación pa una aición completada", "category-version-history": "Bot: Guardando l'historial de versiones de los %(oldcat)s anteriores", "category-was-disbanded": "Bot: Desanicióse la categoría", "category-was-moved": "Bot: La categoría movióse a [[:Category:%(newcat)s|%(title)s]]" diff --git a/category_redirect/ko.json b/category_redirect/ko.json index 07a2076..1b0a40c 100644 --- a/category_redirect/ko.json +++ b/category_redirect/ko.json @@ -17,7 +17,7 @@ "category_redirect-log-add-failed": "* [[%(ns)s%(template)s]] 항목을 %(oldcat)s에 추가하지 못함", "category_redirect-log-double": "* 이중 넘겨주기 수정: %(oldcat)s -> %(newcat)s -> %(targetcat)s", "category_redirect-log-failed": "** 실패: %(error)s", - "category_redirect-log-false-positive": "* 거짓 양성: %(oldcat)s", + "category_redirect-log-false-positive": "* 예기치 않은, 넘겨주기가 아닌 문서: %(oldcat)s", "category_redirect-log-ignoring": "* %(oldcat)s 무시", "category_redirect-log-loop": "* %(oldcat)s에서 넘겨주기 루프", "category_redirect-log-moved": "* %(oldcat)s: %(found)d 발견, %(moved)d 이동", diff --git a/checkimages/ast.json b/checkimages/ast.json index 2ebb27d..cf395f5 100644 --- a/checkimages/ast.json +++ b/checkimages/ast.json @@ -5,6 +5,14 @@ "MarcoAurelio" ] }, + "checkimages-deletion-comment": "Bot: Amestando %(adding)s", + "checkimages-doubles-file-comment": "Bot: Ficheru que yá ta en Commons, pué desaniciase", + "checkimages-doubles-head": "Ficheru duplicáu", + "checkimages-doubles-talk-comment": "Bot: Avisar de que'l ficheru yá esiste'n Commons", + "checkimages-log-comment": "Bot: Anovando'l rexistru", + "checkimages-no-license-head": "Imaxe ensin llicencia", "checkimages-source-tag-comment": "Bot: Marcando un ficheru ensin etiquetes xubíu apocayá", - "checkimages-source-notice-comment": "Bot: Solicitando información de la fonte." + "checkimages-source-notice-comment": "Bot: Solicitando información de la fonte.", + "checkimages-unknown-extension-head": "Estensión desconocida", + "checkimages-unknown-extension-msg": "El ficheru %(file)s paez que tien una estensión desconocida, revísalu." } diff --git a/checkimages/he.json b/checkimages/he.json index ae78e26..0ff1b43 100644 --- a/checkimages/he.json +++ b/checkimages/he.json @@ -1,9 +1,13 @@ { "@metadata": { "authors": [ - "Amire80" + "Amire80", + "Erelon" ] }, + "checkimages-doubles-head": "קובץ כפול", + "checkimages-no-license-head": "תמונה ללא רשיון", "checkimages-source-tag-comment": "בוט: סימון קובץ חדש שהועלה ללא תיוג", - "checkimages-source-notice-comment": "בוט: בקשת מידע על מקור." + "checkimages-source-notice-comment": "בוט: בקשת מידע על מקור.", + "checkimages-unknown-extension-head": "הרחבה לא מוכרת!" } diff --git a/checkimages/ko.json b/checkimages/ko.json index b0b389d..5f5cde3 100644 --- a/checkimages/ko.json +++ b/checkimages/ko.json @@ -9,7 +9,11 @@ ] }, "checkimages-deletion-comment": "봇 : %(adding)s 추가", + "checkimages-doubles-file-comment": "봇: 파일이 이미 공용에 존재하므로 삭제될 수 있음", + "checkimages-doubles-head": "중복 파일", + "checkimages-doubles-talk-comment": "봇: 파일이 이미 공용에 존재함을 알림", "checkimages-log-comment": "봇: 기록 업데이트", + "checkimages-no-license-head": "라이선스 없는 이미지", "checkimages-source-tag-comment": "봇: 새로 업로드된 태그 없는 파일을 표시", "checkimages-source-notice-comment": "봇: 자료 정보 요청.", "checkimages-unknown-extension-head": "확장자를 알 수 없습니다!", diff --git a/pywikibot/ast.json b/pywikibot/ast.json index 593e56c..acc4478 100644 --- a/pywikibot/ast.json +++ b/pywikibot/ast.json @@ -13,5 +13,6 @@ "pywikibot-enter-xml-filename": "Escribi'l nome del ficheru XML de volcáu:", "pywikibot-fixes-fckeditor": "Robó: Iguando HTML del editor de testu arriquecíu.", "pywikibot-fixes-html": "Robó: convirtiendo/iguando HTML", - "pywikibot-fixes-syntax": "Robó: Iguando la sintaxis wiki" + "pywikibot-fixes-syntax": "Robó: Iguando la sintaxis wiki", + "pywikibot-touch": "Edición de toque de Pywikibot" } diff --git a/standardize_interwiki/ast.json b/standardize_interwiki/ast.json new file mode 100644 index 0000000..9a2d12f --- /dev/null +++ b/standardize_interwiki/ast.json @@ -0,0 +1,8 @@ +{ + "@metadata": { + "authors": [ + "Xuacu" + ] + }, + "standardize_interwiki-comment": "Robot: Estandarización interwiki" +} diff --git a/standardize_interwiki/ko.json b/standardize_interwiki/ko.json new file mode 100644 index 0000000..cd63ff8 --- /dev/null +++ b/standardize_interwiki/ko.json @@ -0,0 +1,8 @@ +{ + "@metadata": { + "authors": [ + "Ykhwong" + ] + }, + "standardize_interwiki-comment": "로봇: 인터위키 표준화" +} diff --git a/unusedfiles/ast.json b/unusedfiles/ast.json index 21c8eaf..4a1f92c 100644 --- a/unusedfiles/ast.json +++ b/unusedfiles/ast.json @@ -4,5 +4,5 @@ "Xuacu" ] }, - "unusedfiles-comment": "Bot: imaxes pa desaniciu" + "unusedfiles-comment": "Bot: marcando'l ficheru como güérfanu" } -- To view, visit https://gerrit.wikimedia.org/r/510841 To unsubscribe, or for help writing mail filters, visit https://gerrit.wikimedia.org/r/settings Gerrit-Project: pywikibot/i18n Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I26bfee8d8c4dbb9603fd42b49be7ee87319a3aeb Gerrit-Change-Number: 510841 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 (75)

4 years, 11 months

[Gerrit] pywikibot/core[master]: [bugfix] Enable all families are tested in TestFamilyUrlRegex.test_ea...

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/510446 ) Change subject: [bugfix] Enable all families are tested in TestFamilyUrlRegex.test_each_family ...................................................................... [bugfix] Enable all families are tested in TestFamilyUrlRegex.test_each_family With skipTest the whole test is skipped if the condition was reached. In this case all tests after 'lyricwiki' was found in config.family_files where droppend and btw the order of the config.family_files.keys seems not deterministic. With this patch a subTest is used. subTest was introduced with Python 3.4. After we annouced to drop Python 2 it is not necessary to backport this context manager or find another solution. Just skip this test for older Pythons. Bug: T223367 Change-Id: Ief76609cfbdc976a34f5161373015ab25343860f --- M tests/family_tests.py 1 file changed, 19 insertions(+), 17 deletions(-) Approvals: Dvorapa: Looks good to me, approved jenkins-bot: Verified diff --git a/tests/family_tests.py b/tests/family_tests.py index e529066..43db8ed 100644 --- a/tests/family_tests.py +++ b/tests/family_tests.py @@ -237,23 +237,25 @@ def test_each_family(self): """Test each family builds a working regex.""" for family in pywikibot.config.family_files: - if family in ('wowwiki', 'lyricwiki'): - self.skipTest( - 'Family.from_url() does not work for {} (T215077)' - .format(family)) - self.current_family = family - family = Family.load(family) - for code in family.codes: - self.current_code = code - url = ('{}://{}{}/$1'.format(family.protocol(code), - family.hostname(code), - family.path(code))) - # Families can switch off if they want to be detected using URL - # this applies for test:test (there is test:wikipedia) - if family._ignore_from_url or code in family._ignore_from_url: - self.assertIsNone(family.from_url(url)) - else: - self.assertEqual(family.from_url(url), code) + with self.subTest(family=family): + if family in ('wowwiki', 'lyricwiki'): + self.skipTest( + 'Family.from_url() does not work for {} (T215077)' + .format(family)) + self.current_family = family + family = Family.load(family) + for code in family.codes: + self.current_code = code + url = ('{}://{}{}/$1'.format(family.protocol(code), + family.hostname(code), + family.path(code))) + # Families can switch off if they want to be detected using + # URL. This applies for test:test (there is test:wikipedia) + if (family._ignore_from_url + or code in family._ignore_from_url): + self.assertIsNone(family.from_url(url)) + else: + self.assertEqual(family.from_url(url), code) class TestOldFamilyMethod(DeprecationTestCase): -- To view, visit https://gerrit.wikimedia.org/r/510446 To unsubscribe, or for help writing mail filters, visit https://gerrit.wikimedia.org/r/settings Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ief76609cfbdc976a34f5161373015ab25343860f Gerrit-Change-Number: 510446 Gerrit-PatchSet: 2 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Dvorapa <dvorapa(a)seznam.cz> Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com> Gerrit-Reviewer: Lokal Profil <andre.costa(a)wikimedia.se> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot (75) Gerrit-CC: Hashar <hashar(a)free.fr>

4 years, 11 months

[Gerrit] pywikibot/core[master]: [tests] Enable subTest context manager for Python 2

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/510556 ) Change subject: [tests] Enable subTest context manager for Python 2 ...................................................................... [tests] Enable subTest context manager for Python 2 This allows using of subTest with Python 3 inside tests without breaking Python 2. Change-Id: I7cc6666ddb51f108f4cbc72405d30c2aba638da8 --- M tests/aspects.py 1 file changed, 6 insertions(+), 0 deletions(-) Approvals: Dvorapa: Looks good to me, approved jenkins-bot: Verified diff --git a/tests/aspects.py b/tests/aspects.py index ada517d..6695894 100644 --- a/tests/aspects.py +++ b/tests/aspects.py @@ -63,6 +63,12 @@ """Base class for all tests.""" + if not hasattr(unittest.TestCase, 'subTest'): + @contextmanager + def subTest(self, *args, **kwargs): + """Dummy subTest context manager for Python 2 that does nothing.""" + yield + if not hasattr(unittest.TestCase, 'assertRaisesRegex'): def assertRaisesRegex(self, *args, **kwargs): """ -- To view, visit https://gerrit.wikimedia.org/r/510556 To unsubscribe, or for help writing mail filters, visit https://gerrit.wikimedia.org/r/settings Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I7cc6666ddb51f108f4cbc72405d30c2aba638da8 Gerrit-Change-Number: 510556 Gerrit-PatchSet: 3 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Dvorapa <dvorapa(a)seznam.cz> Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot (75)

4 years, 11 months

[Gerrit] pywikibot/core[master]: [tests] Update Travis tests configuration

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/510719 ) Change subject: [tests] Update Travis tests configuration ...................................................................... [tests] Update Travis tests configuration - Move all tests and sources to Ubuntu Xenial - all tested Python versions are supported - Xenial is going to be the default environment in a week - Remove sudo handling as it is not needed anymore - Move Python 3.7 to the matrix - No need to specify env in allow failures Change-Id: Ib9448ee58f4949512b098c78a3299b823c8c8234 --- M .travis.yml 1 file changed, 3 insertions(+), 15 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/.travis.yml b/.travis.yml index 44298db..2005c01 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,21 +2,20 @@ language: python -sudo: false - python: - '2.7' - '3.4' - '3.5' - '3.6' + - '3.7' # OSX builds do not yet support Python os: linux +dist: xenial # required for Python >= 3.7 + addons: apt: - sources: - - lucid packages: - libssl1.0.0 - djvulibre-bin @@ -131,8 +130,6 @@ include: - python: '2.7_with_system_site_packages' env: LANGUAGE=nb FAMILY=wikipedia PYSETUP_TEST_EXTRAS=1 PYWIKIBOT_TEST_NO_RC=1 - dist: xenial - sudo: required addons: apt: packages: @@ -155,19 +152,10 @@ env: LANGUAGE=ar FAMILY=wiktionary PYWIKIBOT_TEST_NO_RC=1 - python: '3.6' env: LANGUAGE=wikidata FAMILY=wikidata PYWIKIBOT_SITE_ONLY=1 - - python: '3.7' - env: LANGUAGE=de FAMILY=wikipedia - dist: xenial - sudo: required - python: '3.8-dev' env: LANGUAGE=test FAMILY=wikipedia PYWIKIBOT_SITE_ONLY=1 - dist: xenial - sudo: required allow_failures: - python: '3.8-dev' - env: LANGUAGE=test FAMILY=wikipedia PYWIKIBOT_SITE_ONLY=1 - dist: xenial - sudo: required notifications: email: -- To view, visit https://gerrit.wikimedia.org/r/510719 To unsubscribe, or for help writing mail filters, visit https://gerrit.wikimedia.org/r/settings Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ib9448ee58f4949512b098c78a3299b823c8c8234 Gerrit-Change-Number: 510719 Gerrit-PatchSet: 5 Gerrit-Owner: Dvorapa <dvorapa(a)seznam.cz> Gerrit-Reviewer: Dvorapa <dvorapa(a)seznam.cz> Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot (75)

4 years, 11 months

[Gerrit] pywikibot/core[master]: Do not install liblua package

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/510707 ) Change subject: Do not install liblua package ...................................................................... Do not install liblua package - not needed after script_wui.py deprecation Change-Id: I17bef1b6a6566418c1670d0451cd13baf32beb9a --- M .travis.yml 1 file changed, 0 insertions(+), 2 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/.travis.yml b/.travis.yml index 1097b51..44298db 100644 --- a/.travis.yml +++ b/.travis.yml @@ -20,7 +20,6 @@ packages: - libssl1.0.0 - djvulibre-bin - - liblua5.1-0-dev before_install: # When PYSETUP_TEST_EXTRAS is not enabled, do not allow the @@ -139,7 +138,6 @@ packages: - djvulibre-bin - graphviz - - liblua5.1-0-dev - python-ipaddr - python: '2.7' env: LANGUAGE=en FAMILY=wpbeta PYWIKIBOT_SITE_ONLY=1 OAUTH_DOMAIN="en.wikipedia.beta.wmflabs.org" -- To view, visit https://gerrit.wikimedia.org/r/510707 To unsubscribe, or for help writing mail filters, visit https://gerrit.wikimedia.org/r/settings Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I17bef1b6a6566418c1670d0451cd13baf32beb9a Gerrit-Change-Number: 510707 Gerrit-PatchSet: 2 Gerrit-Owner: Dvorapa <dvorapa(a)seznam.cz> Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot (75)

4 years, 11 months

← Newer
1
...
4
5
6
7
8
9
10
...
15
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

Pywikibot-commits May 2019