Pywikibot-commits February 2018

pywikibot-commits@lists.wikimedia.org

1 participants
62 discussions

[Gerrit] pywikibot/core[master]: [IMPR][bugfix] Add missing wikimediachapter codes

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/413726 ) Change subject: [IMPR][bugfix] Add missing wikimediachapter codes ...................................................................... [IMPR][bugfix] Add missing wikimediachapter codes Updated from https://meta.wikimedia.org/wiki/Special:SiteMatrix + sort closed and removed sites on WM projects alphabetically Bug: T103288 Change-Id: Id6772363cb3e971f11f8172b87007008888c1d07 --- M pywikibot/families/wikibooks_family.py M pywikibot/families/wikimediachapter_family.py M pywikibot/families/wikiquote_family.py M pywikibot/families/wiktionary_family.py 4 files changed, 14 insertions(+), 11 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/families/wikibooks_family.py b/pywikibot/families/wikibooks_family.py index 1593fed..3142d76 100644 --- a/pywikibot/families/wikibooks_family.py +++ b/pywikibot/families/wikibooks_family.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- """Family module for Wikibooks.""" # -# (C) Pywikibot team, 2005-2017 +# (C) Pywikibot team, 2005-2018 # # Distributed under the terms of the MIT license. # @@ -20,8 +20,8 @@ closed_wikis = [ # See https://noc.wikimedia.org/conf/highlight.php?file=closed.dblist 'aa', 'ak', 'als', 'ang', 'as', 'ast', 'ay', - 'bi', 'bm', 'bo', 'ch', 'co', 'ga', 'got', 'gn', - 'gu', 'kn', 'ie', 'ks', 'lb', 'ln', 'lv', 'mi', + 'bi', 'bm', 'bo', 'ch', 'co', 'ga', 'gn', 'got', + 'gu', 'ie', 'kn', 'ks', 'lb', 'ln', 'lv', 'mi', 'mn', 'my', 'na', 'nah', 'nds', 'ps', 'qu', 'rm', 'se', 'simple', 'su', 'sw', 'tk', 'ug', 'uz', 'vo', 'wa', 'xh', 'yo', 'za', 'zh-min-nan', 'zu', diff --git a/pywikibot/families/wikimediachapter_family.py b/pywikibot/families/wikimediachapter_family.py index bb007eb..4181d3c 100644 --- a/pywikibot/families/wikimediachapter_family.py +++ b/pywikibot/families/wikimediachapter_family.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- -"""Family module for Wikimedia chapter wikis.""" +"""Family module for Wikimedia chapter, thematic organisation and WUG wikis.""" # -# (C) Pywikibot team, 2012-2015 +# (C) Pywikibot team, 2012-2018 # # Distributed under the terms of the MIT license. # @@ -13,14 +13,17 @@ class Family(family.SubdomainFamily, family.WikimediaFamily): - """Family for Wikimedia chapters hosted on wikimedia.org.""" + """Family class for WCH, WTO and WUG wikis hosted on wikimedia.org.""" name = 'wikimediachapter' code_aliases = {} + closed_wikis = ['nz', 'pa-us', ] + codes = [ - 'ar', 'br', 'bd', 'co', 'dk', 'fi', 'mk', 'mx', 'nl', 'no', - 'nyc', 'pl', 'rs', 'ru', 'se', 'ua', 'uk', 've', + 'am', 'ar', 'bd', 'be', 'br', 'ca', 'cn', 'co', 'dk', 'ec', 'et', 'fi', + 'il', 'mai', 'mk', 'mx', 'nl', 'no', 'nyc', 'pl', 'pt', 'rs', 'ru', + 'se', 'tr', 'ua', 'uk', 've', 'wb', ] @property diff --git a/pywikibot/families/wikiquote_family.py b/pywikibot/families/wikiquote_family.py index 8110e58..d1fcbf5 100644 --- a/pywikibot/families/wikiquote_family.py +++ b/pywikibot/families/wikiquote_family.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- """Family module for Wikiquote.""" # -# (C) Pywikibot team, 2005-2017 +# (C) Pywikibot team, 2005-2018 # # Distributed under the terms of the MIT license. # @@ -21,7 +21,7 @@ # See https://noc.wikimedia.org/conf/highlight.php?file=closed.dblist 'als', 'am', 'ang', 'ast', 'bm', 'co', 'cr', 'ga', 'kk', 'kr', 'ks', 'kw', 'lb', 'na', 'nds', 'qu', 'simple', - 'tk', 'tt', 'ug', 'vo', 'za', 'zh_min_nan', + 'tk', 'tt', 'ug', 'vo', 'za', 'zh-min-nan', ] removed_wikis = [ diff --git a/pywikibot/families/wiktionary_family.py b/pywikibot/families/wiktionary_family.py index 326231d..64e3393 100644 --- a/pywikibot/families/wiktionary_family.py +++ b/pywikibot/families/wiktionary_family.py @@ -26,7 +26,7 @@ removed_wikis = [ # See https://noc.wikimedia.org/conf/highlight.php?file=deleted.dblist - 'dk', 'ba', 'tlh', 'tokipona', + 'ba', 'dk', 'tlh', 'tokipona', ] def __init__(self): -- To view, visit https://gerrit.wikimedia.org/r/413726 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Id6772363cb3e971f11f8172b87007008888c1d07 Gerrit-Change-Number: 413726 Gerrit-PatchSet: 8 Gerrit-Owner: Dvorapa <dvorapa(a)seznam.cz> Gerrit-Reviewer: Dvorapa <dvorapa(a)seznam.cz> Gerrit-Reviewer: Dzahn <dzahn(a)wikimedia.org> Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com> Gerrit-Reviewer: Liuxinyu970226 <541329866(a)qq.com> Gerrit-Reviewer: Nemo bis <federicoleva(a)tiscali.it> Gerrit-Reviewer: Ricordisamoa <ricordisamoa(a)openmailbox.org> Gerrit-Reviewer: XZise <CommodoreFabianus(a)gmx.de> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: Zhuyifei1999 <zhuyifei1999(a)gmail.com> Gerrit-Reviewer: Zoranzoki21 <zorandori4444(a)gmail.com> Gerrit-Reviewer: jenkins-bot <>

6 years, 1 month

[Gerrit] pywikibot/core[master]: [IMPR][doc] Collapse tests on doc main page

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/413723 ) Change subject: [IMPR][doc] Collapse tests on doc main page ...................................................................... [IMPR][doc] Collapse tests on doc main page Documentation main page should be as brief as possible, but all tests are currently shown in "for framework developers" section making the section too long (in opposite to other sections here) Change-Id: I1317e2ee4ee38e422a9057af169c294081076b6b --- M docs/index.rst 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/docs/index.rst b/docs/index.rst index 55fff71..67a28c5 100644 --- a/docs/index.rst +++ b/docs/index.rst @@ -50,7 +50,7 @@ ========================= .. toctree:: - :maxdepth: 2 + :maxdepth: 1 api_ref/tests/index scripts.maintenance -- To view, visit https://gerrit.wikimedia.org/r/413723 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I1317e2ee4ee38e422a9057af169c294081076b6b Gerrit-Change-Number: 413723 Gerrit-PatchSet: 1 Gerrit-Owner: Dvorapa <dvorapa(a)seznam.cz> Gerrit-Reviewer: Dalba <dalba.wiki(a)gmail.com> Gerrit-Reviewer: Framawiki <framawiki(a)tools.wmflabs.org> Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: Zoranzoki21 <zorandori4444(a)gmail.com> Gerrit-Reviewer: jenkins-bot <>

6 years, 1 month

[Gerrit] pywikibot/core[master]: pagegenerators.py: -linter options fails

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/413251 ) Change subject: pagegenerators.py: -linter options fails ...................................................................... pagegenerators.py: -linter options fails Fix parsing of argument in handleArg() -linter should select all categories instead gives error. Bug: T187945 Change-Id: I462ef0c7f32a1a519f9d7f394372aaa6e93d3bf4 --- M pywikibot/pagegenerators.py 1 file changed, 2 insertions(+), 1 deletion(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/pagegenerators.py b/pywikibot/pagegenerators.py index ab4ed51..bbad63c 100644 --- a/pywikibot/pagegenerators.py +++ b/pywikibot/pagegenerators.py @@ -14,7 +14,7 @@ &params; """ # -# (C) Pywikibot team, 2008-2017 +# (C) Pywikibot team, 2008-2018 # # Distributed under the terms of the MIT license. # @@ -719,6 +719,7 @@ cats = self.site.siteinfo.get('linter') # Get linter categories. valid_cats = [c for _list in cats.values() for c in _list] + value = '' if value is None else value cat, sep, lint_from = value.partition('/') if not lint_from: lint_from = None -- To view, visit https://gerrit.wikimedia.org/r/413251 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I462ef0c7f32a1a519f9d7f394372aaa6e93d3bf4 Gerrit-Change-Number: 413251 Gerrit-PatchSet: 2 Gerrit-Owner: Mpaa <mpaa.wiki(a)gmail.com> Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: Zoranzoki21 <zorandori4444(a)gmail.com> Gerrit-Reviewer: jenkins-bot <>

6 years, 1 month

[Gerrit] pywikibot/core[master]: [bugfix] Update dependencies for eventstreams

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/406579 ) Change subject: [bugfix] Update dependencies for eventstreams ...................................................................... [bugfix] Update dependencies for eventstreams - requests >=2.9 and sseclient >= 0.0.18 are necessary for eventstreams - raise ImportError for wrong requests version on top of eventstreams module - print a warning when the sseclient version might be wrong. Unfortunately we have no version string to verify the release Bug: T184713 Change-Id: I6e6b4b10bdaa3a7f05b081860c2a15ae6d33f284 --- M HISTORY.rst M pywikibot/comms/eventstreams.py M requests-requirements.txt M requirements.txt M setup.py 5 files changed, 26 insertions(+), 7 deletions(-) Approvals: Chico Venancio: Looks good to me, but someone else must approve Zhuyifei1999: Looks good to me, but someone else must approve Framawiki: Looks good to me, approved jenkins-bot: Verified diff --git a/HISTORY.rst b/HISTORY.rst index f829df2..f1205d1 100644 --- a/HISTORY.rst +++ b/HISTORY.rst @@ -4,6 +4,7 @@ Current release --------------- +* Changed requirements for requests and sseclient * Bugfixes and improvements * Localisation updates @@ -11,6 +12,7 @@ ------------ * Deprecation warning: support for py2.6 and py3.3 will be dropped +* Changed requirements for cryprography, Pillow and pyOpenSSL * Bugfixes and improvements * Localisation updates diff --git a/pywikibot/comms/eventstreams.py b/pywikibot/comms/eventstreams.py index df6773f..a74baa1 100644 --- a/pywikibot/comms/eventstreams.py +++ b/pywikibot/comms/eventstreams.py @@ -8,16 +8,18 @@ pip install sseclient """ # -# (C) xqt, 2017 -# (C) Pywikibot team, 2017 +# (C) xqt, 2017-2018 +# (C) Pywikibot team, 2017-2018 # # Distributed under the terms of the MIT license. # from __future__ import absolute_import, unicode_literals +from distutils.version import LooseVersion import json import socket +import requests from requests.packages.urllib3.exceptions import ProtocolError from requests.packages.urllib3.response import httplib @@ -28,6 +30,13 @@ from pywikibot import config, debug, Site, warning from pywikibot.tools import StringTypes + +# requests >= 2.9 is required for eventstreams (T184713) +if LooseVersion(requests.__version__) < LooseVersion('2.9'): + raise ImportError( + 'requests >= 2.9 is required for EventStreams;\n' + "install it with 'pip install \"requests>=2.9,!=2.18.2\"'\n") + _logger = 'pywikibot.eventstreams' @@ -244,6 +253,14 @@ while self._total is None or n < self._total: if not hasattr(self, 'source'): self.source = EventSource(**self.sse_kwargs) + # sseclient >= 0.0.18 is required for eventstreams (T184713) + # we don't have a version string inside but the instance + # variable 'chunk_size' was newly introduced with 0.0.18 + if not hasattr(self.source, 'chunk_size'): + warning( + 'You may not have the right sseclient version;\n' + 'sseclient >= 0.0.18 is required for eventstreams.\n' + "Install it with 'pip install \"sseclient>=0.0.18\"'") try: event = next(self.source) except (ProtocolError, socket.error, httplib.IncompleteRead) as e: diff --git a/requests-requirements.txt b/requests-requirements.txt index cd0deff..6b4eed5 100644 --- a/requests-requirements.txt +++ b/requests-requirements.txt @@ -1,4 +1,4 @@ -requests>=2.4.1,!=2.18.2 +requests>=2.9,!=2.18.2 # requests security extra # Bug T105767 on Python 2.7 release 9+ diff --git a/requirements.txt b/requirements.txt index cb6d10c..11bac63 100644 --- a/requirements.txt +++ b/requirements.txt @@ -19,7 +19,7 @@ # $ awk -F '[#>=]' '{print $1}' requirements.txt | xargs apt-cache search # mandatory; see README.conversion.txt -requests>=2.4.1,!=2.18.2 +requests>=2.9,!=2.18.2 # requests security extra cryptography>=1.3.4 ; python_version != '2.6' and python_full_version < '2.7.9' @@ -60,7 +60,7 @@ # core pagegenerators google >= 1.7 -sseclient +sseclient >= 0.0.18 # scripts/script_wui.py: crontab diff --git a/setup.py b/setup.py index af7c152..25bb902 100644 --- a/setup.py +++ b/setup.py @@ -46,7 +46,7 @@ test_deps = ['bz2file', 'mock'] -dependencies = ['requests!=2.18.2'] +dependencies = ['requests>=2.9,!=2.18.2'] # the irc module has no Python 2.6 support since 10.0 irc_dep = 'irc==8.9' if sys.version_info < (2, 7) else 'irc' @@ -62,7 +62,7 @@ extra_deps = { # Core library dependencies - 'eventstreams': ['sseclient'], + 'eventstreams': ['sseclient>=0.0.18'], 'isbn': ['python-stdnum'], 'Graphviz': ['pydot>=1.0.28'], 'Google': ['google>=1.7'], -- To view, visit https://gerrit.wikimedia.org/r/406579 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I6e6b4b10bdaa3a7f05b081860c2a15ae6d33f284 Gerrit-Change-Number: 406579 Gerrit-PatchSet: 10 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Chico Venancio <fvenancio(a)wikimedia.org> Gerrit-Reviewer: Dalba <dalba.wiki(a)gmail.com> Gerrit-Reviewer: Framawiki <framawiki(a)tools.wmflabs.org> Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com> Gerrit-Reviewer: Merlijn van Deen <valhallasw(a)arctus.nl> Gerrit-Reviewer: Ottomata <aotto(a)wikimedia.org> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: Zhuyifei1999 <zhuyifei1999(a)gmail.com> Gerrit-Reviewer: Zoranzoki21 <zorandori4444(a)gmail.com> Gerrit-Reviewer: jenkins-bot <>

6 years, 1 month

[Gerrit] pywikibot/core[master]: noreference.py should again add section before {{Przypisy}} on plwiki

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/412862 ) Change subject: noreference.py should again add section before {{Przypisy}} on plwiki ...................................................................... noreference.py should again add section before {{Przypisy}} on plwiki 'pl' lang is removed from noTitleRequired list Bug: T187748 Change-Id: I599bed20b9d5d390faa2028780914bece51ef858 --- M scripts/noreferences.py 1 file changed, 1 insertion(+), 4 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/scripts/noreferences.py b/scripts/noreferences.py index 06d21e4..d782b4d 100755 --- a/scripts/noreferences.py +++ b/scripts/noreferences.py @@ -455,10 +455,7 @@ # Sites where no title is required for references template # as it is already included there -# like pl.wiki where {{Przypisy}} generates -# == Przypisy == -# <references /> -noTitleRequired = [u'pl', u'be', u'szl'] +noTitleRequired = ['be', 'szl'] maintenance_category = 'cite_error_refs_without_references_category' -- To view, visit https://gerrit.wikimedia.org/r/412862 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I599bed20b9d5d390faa2028780914bece51ef858 Gerrit-Change-Number: 412862 Gerrit-PatchSet: 3 Gerrit-Owner: Gerrit Patch Uploader <gerritpatchuploader(a)gmail.com> Gerrit-Reviewer: Dalba <dalba.wiki(a)gmail.com> Gerrit-Reviewer: Dvorapa <dvorapa(a)seznam.cz> Gerrit-Reviewer: Framawiki <framawiki(a)tools.wmflabs.org> Gerrit-Reviewer: Gerrit Patch Uploader <gerritpatchuploader(a)gmail.com> Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: Zoranzoki21 <zorandori4444(a)gmail.com> Gerrit-Reviewer: jenkins-bot <>

6 years, 1 month

[Gerrit] pywikibot/core[master]: [bugfix] Use pytest-runner<=3.0 for py3.3

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/409842 ) Change subject: [bugfix] Use pytest-runner<=3.0 for py3.3 ...................................................................... [bugfix] Use pytest-runner<=3.0 for py3.3 Bug: T186991 Change-Id: I33ddceb45b6de789a8001f46f6c8f75b317f617f --- M dev-requirements.txt 1 file changed, 2 insertions(+), 1 deletion(-) Approvals: Dalba: Looks good to me, approved jenkins-bot: Verified diff --git a/dev-requirements.txt b/dev-requirements.txt index 5084cdf..7bc6482 100644 --- a/dev-requirements.txt +++ b/dev-requirements.txt @@ -4,7 +4,8 @@ pytest>=2.8.0 pytest-timeout -pytest-runner +pytest-runner<=3.0 ; python_version == '3.3' +pytest-runner ; python_version != '3.3' pytest-cov pytest-attrib pytest-httpbin -- To view, visit https://gerrit.wikimedia.org/r/409842 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I33ddceb45b6de789a8001f46f6c8f75b317f617f Gerrit-Change-Number: 409842 Gerrit-PatchSet: 2 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Dalba <dalba.wiki(a)gmail.com> Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: Zoranzoki21 <zorandori4444(a)gmail.com> Gerrit-Reviewer: jenkins-bot <>

6 years, 2 months

[Gerrit] pywikibot/core[master]: [bugfix] noreferences.py should add different header on cswikt

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/408074 ) Change subject: [bugfix] noreferences.py should add different header on cswikt ...................................................................... [bugfix] noreferences.py should add different header on cswikt Note: No other families need to be added as they automatically fall back to wikipedia if not listed, see pywikibot/i18n.py$474 for more details Note2: Adding key for wikipedia for easier updating in case some other family would need a fix Bug: T123091 Change-Id: Ia0cf4627db8a72c01b11a86a0fe0e9db8b27677a --- M scripts/noreferences.py 1 file changed, 150 insertions(+), 145 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/scripts/noreferences.py b/scripts/noreferences.py index 932e10c..06d21e4 100755 --- a/scripts/noreferences.py +++ b/scripts/noreferences.py @@ -229,152 +229,157 @@ # will be used when a new section has to be created. # Except for the first, others are tested as regexes. referencesSections = { - 'ar': [ # not sure about which ones are preferred. - u'مراجع', - u'المراجع', - u'مصادر', - u'المصادر', - u'مراجع ومصادر', - u'مصادر ومراجع', - u'المراجع والمصادر', - u'المصادر والمراجع', - ], - 'ca': [ - u'Referències', - ], - 'cs': [ - u'Reference', - u'Poznámky', - ], - 'da': [ - u'Noter', - ], - 'de': [ # see [[de:WP:REF]] - u'Einzelnachweise', - u'Anmerkungen', - u'Belege', - u'Endnoten', - u'Fußnoten', - u'Fuß-/Endnoten', - u'Quellen', - u'Quellenangaben', - ], - 'dsb': [ - u'Nožki', - ], - 'en': [ # not sure about which ones are preferred. - u'References', - u'Footnotes', - u'Notes', - ], - 'ru': [ - u'Примечания', - u'Сноски', - u'Источники', - ], - 'eo': [ - u'Referencoj', - ], - 'es': [ - u'Referencias', - u'Notas', - ], - 'fa': [ - u'منابع', - u'منبع' - ], - 'fi': [ - u'Lähteet', - u'Viitteet', - ], - 'fr': [ # [[fr:Aide:Note]] - 'Notes et références', - 'Notes? et r[ée]f[ée]rences?', - 'R[ée]f[ée]rences?', - 'Notes?', - 'Sources?', - ], - 'he': [ - u'הערות שוליים', - ], - 'hsb': [ - u'Nóžki', - ], - 'hu': [ - u'Források és jegyzetek', - u'Források', - u'Jegyzetek', - u'Hivatkozások', - u'Megjegyzések', - ], - 'is': [ - u'Heimildir', - u'Tilvísanir', - ], - 'it': [ - u'Note', - u'Riferimenti', - ], - 'ja': [ - u'脚注', - u'脚注欄', - u'脚注・出典', - u'出典', - u'注釈', - u'註', - ], - 'ko': [ - u'주석', - u'각주' - u'주석 및 참고 자료' - u'주석 및 참고자료', - u'주석 및 참고 출처' - ], - 'lt': [ # not sure about which ones are preferred. - u'Šaltiniai', - u'Literatūra', - ], - 'nl': [ # not sure about which ones are preferred. - u'Voetnoten', - u'Voetnoot', - u'Referenties', - u'Noten', - u'Bronvermelding', - ], - 'pdc': [ - u'Aamarrickunge', - ], - 'pl': [ - u'Przypisy', - u'Uwagi', - ], - 'pt': [ - u'Referências', - ], - 'sk': [ - u'Referencie', - ], - 'sr': [ - 'Референце', - ], - 'szl': [ - u'Przipisy', - u'Připisy', - ], - 'th': [ - u'อ้างอิง', - u'เชิงอรรถ', - u'หมายเหตุ', - ], - 'zh': [ - u'參考資料', - u'参考资料', - u'參考文獻', - u'参考文献', - u'資料來源', - u'资料来源', - ], + 'wikipedia': { + 'ar': [ # not sure about which ones are preferred. + 'مراجع', + 'المراجع', + 'مصادر', + 'المصادر', + 'مراجع ومصادر', + 'مصادر ومراجع', + 'المراجع والمصادر', + 'المصادر والمراجع', + ], + 'ca': [ + 'Referències', + ], + 'cs': [ + 'Reference', + 'Poznámky', + ], + 'da': [ + 'Noter', + ], + 'de': [ # see [[de:WP:REF]] + 'Einzelnachweise', + 'Anmerkungen', + 'Belege', + 'Endnoten', + 'Fußnoten', + 'Fuß-/Endnoten', + 'Quellen', + 'Quellenangaben', + ], + 'dsb': [ + 'Nožki', + ], + 'en': [ # not sure about which ones are preferred. + 'References', + 'Footnotes', + 'Notes', + ], + 'ru': [ + 'Примечания', + 'Сноски', + 'Источники', + ], + 'eo': [ + 'Referencoj', + ], + 'es': [ + 'Referencias', + 'Notas', + ], + 'fa': [ + 'منابع', + 'منبع' + ], + 'fi': [ + 'Lähteet', + 'Viitteet', + ], + 'fr': [ # [[fr:Aide:Note]] + 'Notes et références', + 'Notes? et r[ée]f[ée]rences?', + 'R[ée]f[ée]rences?', + 'Notes?', + 'Sources?', + ], + 'he': [ + 'הערות שוליים', + ], + 'hsb': [ + 'Nóžki', + ], + 'hu': [ + 'Források és jegyzetek', + 'Források', + 'Jegyzetek', + 'Hivatkozások', + 'Megjegyzések', + ], + 'is': [ + 'Heimildir', + 'Tilvísanir', + ], + 'it': [ + 'Note', + 'Riferimenti', + ], + 'ja': [ + '脚注', + '脚注欄', + '脚注・出典', + '出典', + '注釈', + '註', + ], + 'ko': [ + '주석', + '각주' + '주석 및 참고 자료' + '주석 및 참고자료', + '주석 및 참고 출처' + ], + 'lt': [ # not sure about which ones are preferred. + 'Šaltiniai', + 'Literatūra', + ], + 'nl': [ # not sure about which ones are preferred. + 'Voetnoten', + 'Voetnoot', + 'Referenties', + 'Noten', + 'Bronvermelding', + ], + 'pdc': [ + 'Aamarrickunge', + ], + 'pl': [ + 'Przypisy', + 'Uwagi', + ], + 'pt': [ + 'Referências', + ], + 'sk': [ + 'Referencie', + ], + 'sr': [ + 'Референце', + ], + 'szl': [ + 'Przipisy', + 'Připisy', + ], + 'th': [ + 'อ้างอิง', + 'เชิงอรรถ', + 'หมายเหตุ', + ], + 'zh': [ + '參考資料', + '参考资料', + '參考文獻', + '参考文献', + '資料來源', + '资料来源', + ], + }, } +# Header on Czech Wiktionary should be different (T123091) +referencesSections['wiktionary'] = dict(referencesSections['wikipedia']) +referencesSections['wiktionary'].update(cs=['poznámky', 'reference']) # Templates which include a <references /> tag. If there is no such template # on your wiki, you don't have to enter anything here. -- To view, visit https://gerrit.wikimedia.org/r/408074 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ia0cf4627db8a72c01b11a86a0fe0e9db8b27677a Gerrit-Change-Number: 408074 Gerrit-PatchSet: 13 Gerrit-Owner: Dvorapa <dvorapa(a)seznam.cz> Gerrit-Reviewer: Dalba <dalba.wiki(a)gmail.com> Gerrit-Reviewer: Dvorapa <dvorapa(a)seznam.cz> Gerrit-Reviewer: Framawiki <framawiki(a)tools.wmflabs.org> Gerrit-Reviewer: JAn Dudík <jan.dudik(a)gmail.com> Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com> Gerrit-Reviewer: Matěj Suchánek <matejsuchanek97(a)gmail.com> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: Zoranzoki21 <zorandori4444(a)gmail.com> Gerrit-Reviewer: jenkins-bot <>

6 years, 2 months

[Gerrit] pywikibot/core[master]: archivebot: count removed characters when excluding comments etc

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/409321 ) Change subject: archivebot: count removed characters when excluding comments etc ...................................................................... archivebot: count removed characters when excluding comments etc Follows up I2e7183f431ce3bb4cdd1729e592b7509cbd37b94. Bug: T182496 Change-Id: If45dfbb807f413e3e459e682ceeef337755dce1d --- M scripts/archivebot.py M tests/archivebot_tests.py 2 files changed, 40 insertions(+), 2 deletions(-) Approvals: Dalba: Looks good to me, approved jenkins-bot: Verified diff --git a/scripts/archivebot.py b/scripts/archivebot.py index 56ff18b..33000c9 100755 --- a/scripts/archivebot.py +++ b/scripts/archivebot.py @@ -454,8 +454,9 @@ self.archives = {} self.archived_threads = 0 text = self.get() + # Replace text in following exceptions by spaces, but don't change line - # numbers + # numbers and character positions exceptions = ['comment', 'code', 'pre', 'source', 'nowiki'] exc_regexes = _get_regexes(exceptions, self.site) stripped_text = text @@ -464,8 +465,9 @@ before = stripped_text[:match.start()] restricted = stripped_text[match.start():match.end()] after = stripped_text[match.end():] - restricted = re.sub(r'[^\n]', r'', restricted) + restricted = re.sub(r'[^\n]', ' ', restricted) stripped_text = before + restricted + after + # Find thread headers in stripped text and return their line numbers stripped_lines = stripped_text.split('\n') thread_headers = [] diff --git a/tests/archivebot_tests.py b/tests/archivebot_tests.py index 3340b89..7270059 100644 --- a/tests/archivebot_tests.py +++ b/tests/archivebot_tests.py @@ -19,6 +19,7 @@ from tests.aspects import unittest, TestCase + THREADS = { 'als': 4, 'ar': 1, 'bar': 0, 'bg': 0, 'bjn': 1, 'bs': 0, 'ca': 5, 'ckb': 2, 'cs': 0, 'de': 1, 'en': 25, 'eo': 2, 'es': 13, 'fa': 2, 'fr': 25, 'frr': 2, @@ -229,6 +230,41 @@ expected_failures = [] +class TestDiscussionPageObject(TestCase): + + """Test DiscussionPage object.""" + + cached = True + family = 'test' + code = 'test' + + def testTwoThreadsWithCommentedOutThread(self): + """Test recognizing two threads and ignoring a commented out thread. + + Talk:For-pywikibot-archivebot must have: + + {{User:MiszaBot/config + |archive = Talk:Main_Page/archive + |algo = old(30d) + }} +  + == A == + foo bar +  + == B == + foo bar bar bar + """ + page = pywikibot.Page(self.get_site(), 'Talk:For-pywikibot-archivebot') + archiver = archivebot.PageArchiver( + page=page, tpl='User:MiszaBot/config', salt='', force=False) + page = archivebot.DiscussionPage(page, archiver) + page.load_page() + self.assertEqual([x.title for x in page.threads], ['A', 'B']) + + if __name__ == '__main__': # pragma: no cover try: unittest.main() -- To view, visit https://gerrit.wikimedia.org/r/409321 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: If45dfbb807f413e3e459e682ceeef337755dce1d Gerrit-Change-Number: 409321 Gerrit-PatchSet: 4 Gerrit-Owner: Whym <whym(a)whym.org> Gerrit-Reviewer: Dalba <dalba.wiki(a)gmail.com> Gerrit-Reviewer: Dvorapa <dvorapa(a)seznam.cz> Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com> Gerrit-Reviewer: Whym <whym(a)whym.org> Gerrit-Reviewer: Zoranzoki21 <zorandori4444(a)gmail.com> Gerrit-Reviewer: jenkins-bot <>

6 years, 2 months

[Gerrit] pywikibot/core[master]: [IMPR][docs] Fix class and module import errors when building docs

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/409724 ) Change subject: [IMPR][docs] Fix class and module import errors when building docs ...................................................................... [IMPR][docs] Fix class and module import errors when building docs some scripts are failing due to missing dependencies or incorrect test class name Bug: T187009 Change-Id: I22afcd69a2d70db32b306cb1c96d6af4eabb0cb8 --- M docs/api_ref/tests/pagegenerators_tests.rst M docs/api_ref/tests/wikibase_tests.rst M docs/requirements-py3.txt M tox.ini 4 files changed, 6 insertions(+), 3 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/docs/api_ref/tests/pagegenerators_tests.rst b/docs/api_ref/tests/pagegenerators_tests.rst index 4e9f260..52f121f 100644 --- a/docs/api_ref/tests/pagegenerators_tests.rst +++ b/docs/api_ref/tests/pagegenerators_tests.rst @@ -22,6 +22,6 @@ :members: .. autoclass:: tests.pagegenerators_tests.PageGeneratorIntersectTestCase :members: - .. autoclass:: tests.pagegenerators_tests.EnglishWikipediaPageGeneratorIntersectTestCase + .. autoclass:: tests.pagegenerators_tests.EnWikipediaPageGeneratorIntersectTestCase :members: diff --git a/docs/api_ref/tests/wikibase_tests.rst b/docs/api_ref/tests/wikibase_tests.rst index 14c2276..78e7167 100644 --- a/docs/api_ref/tests/wikibase_tests.rst +++ b/docs/api_ref/tests/wikibase_tests.rst @@ -34,7 +34,9 @@ :members: .. autoclass:: tests.wikibase_tests.TestRedirects :members: - .. autoclass:: tests.wikibase_tests.TestWikibaseTypes + .. autoclass:: tests.wikibase_tests.TestWbTime + :members: + .. autoclass:: tests.wikibase_tests.TestWbQuantity :members: .. autoclass:: tests.wikibase_tests.TestWriteNormalizeData :members: diff --git a/docs/requirements-py3.txt b/docs/requirements-py3.txt index 6ff7fe5..c64d32e 100644 --- a/docs/requirements-py3.txt +++ b/docs/requirements-py3.txt @@ -1,6 +1,6 @@ # This is a PIP requirements file for building Sphinx documentation of pywikibot # using sphinx on python3.4. -# requests-requirements.txt is also needed +# requirements.txt and requests-requirements.txt are also needed sphinx sphinx-epytext>=0.0.4 diff --git a/tox.ini b/tox.ini index e9fb353..c42d245 100644 --- a/tox.ini +++ b/tox.ini @@ -136,6 +136,7 @@ findx -type f -name '*.rst' -not -path './.tox/*' : rstcheck --report warning --ignore-directives automodule,autoclass,autofunction basepython = python3.4 deps = + -rrequirements.txt -rrequests-requirements.txt -rdocs/requirements-py3.txt findx >= 0.9.9 -- To view, visit https://gerrit.wikimedia.org/r/409724 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I22afcd69a2d70db32b306cb1c96d6af4eabb0cb8 Gerrit-Change-Number: 409724 Gerrit-PatchSet: 1 Gerrit-Owner: Dvorapa <dvorapa(a)seznam.cz> Gerrit-Reviewer: Dalba <dalba.wiki(a)gmail.com> Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: Zoranzoki21 <zorandori4444(a)gmail.com> Gerrit-Reviewer: jenkins-bot <>

6 years, 2 months

[Gerrit] pywikibot/core[master]: conf.py: Change the current working directory to docs directory

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/409713 ) Change subject: conf.py: Change the current working directory to docs directory ...................................................................... conf.py: Change the current working directory to docs directory Bug: T185082 Change-Id: I47cbce274a86de0b21ff8445b29ece6e67966956 --- M docs/conf.py 1 file changed, 3 insertions(+), 1 deletion(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/docs/conf.py b/docs/conf.py index 41be174..d2cfb00 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -24,8 +24,10 @@ # If extensions (or modules to document with autodoc) are in another directory, # add these directories to sys.path here. If the directory is relative to the # documentation root, use os.path.abspath to make it absolute, like shown here. -repo_dir = abspath(join(dirname(__file__), '..')) +docs_dir = dirname(__file__) +repo_dir = abspath(join(docs_dir, '..')) sys.path.insert(0, repo_dir) +os.chdir(repo_dir) # -- General configuration ----------------------------------------------------- -- To view, visit https://gerrit.wikimedia.org/r/409713 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I47cbce274a86de0b21ff8445b29ece6e67966956 Gerrit-Change-Number: 409713 Gerrit-PatchSet: 1 Gerrit-Owner: Dalba <dalba.wiki(a)gmail.com> Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: Zoranzoki21 <zorandori4444(a)gmail.com> Gerrit-Reviewer: jenkins-bot <>

6 years, 2 months

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

Pywikibot-commits February 2018