jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/1048835?usp=email )
Change subject: Merge branch '9.2' into stable ...................................................................... Merge branch '9.2' into stable Change-Id: Ic0cbe623db783a83ab67de8b0f4834239995aa6a --- M HISTORY.rst M ROADMAP.rst M pywikibot/__metadata__.py M pywikibot/families/wikipedia_family.py 5 files changed, 201 insertions(+), 105 deletions(-) Approvals: jenkins-bot: Verified Xqt: Looks good to me, approved diff --git a/HISTORY.rst b/HISTORY.rst index 770f39c..1a23884 100644 --- a/HISTORY.rst +++ b/HISTORY.rst @@ -1,16 +1,6 @@ Release History =============== -<<<<<<< HEAD (cbc2e2 Update git submodules) -||||||| BASE -9.1.1 ------ -*27 April 2024* - -* Add support for new wikis (:phab:`T363272`, :phab:`T363265`, :phab:`T363258`, - :phab:`T363251`, :phab:`T363245`, :phab:`T360312`, :phab:`T360305`) -* i18n updates -======= 9.1.3 ----- *28.05.2024* @@ -18,7 +8,6 @@ * Add support for dtpwiki (:phab:`T365232`) * i18n updates ->>>>>>> BRANCH (0e62e5 [9.2] Publish Pywikibot 9.2) 9.1.2 ----- *03 May 2024* diff --git a/ROADMAP.rst b/ROADMAP.rst index c6ab9e1..b956e38 100644 --- a/ROADMAP.rst +++ b/ROADMAP.rst @@ -1,33 +1,6 @@ Current Release Changes ======================= -<<<<<<< HEAD (cbc2e2 Update git submodules) -* Add support for dtpwiki (:phab:`T365232`) -||||||| BASE -* Remove line endings in :func:`version.getversion_nightly` (:phab:`T363943`) -* Provide ``-nouser`` option with :mod:`pywikibot.scripts.version` -* i18n updates - -Deprecations ------------- - -* 9.0.0: The *content* parameter of :meth:`proofreadpage.IndexPage.page_gen` is deprecated and will be ignored - (:phab:`T358635`) -* 9.0.0: ``userinterfaces.transliteration.transliterator`` was renamed to :class:`Transliterator - <userinterfaces.transliteration.Transliterator>` -* 9.0.0: ``next`` parameter of :meth:`userinterfaces.transliteration.transliterator.transliterate` was renamed to - ``succ`` -* 9.0.0: ``type`` parameter of :meth:`site.APISite.protectedpages() - <pywikibot.site._generators.GeneratorsMixin.protectedpages>` was renamed to ``protect_type`` -* 9.0.0: ``all`` parameter of :meth:`site.APISite.namespace()<pywikibot.site._apisite.APISite.namespace>` was renamed to - ``all_ns`` -* 9.0.0: ``filter`` parameter of :func:`date.dh` was renamed to ``filter_func`` -* 9.0.0: ``dict`` parameter of :class:`data.api.OptionSet` was renamed to ``data`` -* 9.0.0: ``pywikibot.version.get_toolforge_hostname()`` is deprecated without replacement -* 9.0.0: ``allrevisions`` parameter of :class:`xmlreader.XmpDump` is deprecated, use ``revisions`` instead - (:phab:`T340804`) -* 9.0.0: ``iteritems`` method of :class:`data.api.Request` will be removed in favour of ``items`` -======= * Add support for ``btmwiki`` to Pywikibot (:phab:`T368069`) * Include image repository extensions in :attr:`site.APISite.file_extensions <pywikibot.site._apisite.APISite.file_extensions>` @@ -51,7 +24,6 @@ * Drop pheetools support for :mod:`proofreadpage` which is no longer available upstreams (:phab:`T366036`) * Raise :exc:`exceptions.SectionError` if a section does not exists on a page (:phab:`T107141`) * Retry api request on ServerError (:phab:`T364275`, :phab:`T364393`) ->>>>>>> BRANCH (0e62e5 [9.2] Publish Pywikibot 9.2) * i18n updates Current Deprecations diff --git a/pywikibot/__metadata__.py b/pywikibot/__metadata__.py index 0d292ca..be801c8 100644 --- a/pywikibot/__metadata__.py +++ b/pywikibot/__metadata__.py @@ -12,12 +12,6 @@ from time import strftime -<<<<<<< HEAD (cbc2e2 Update git submodules) -__version__ = '9.1.3' -||||||| BASE -__version__ = '9.1.2' -======= __version__ = '9.2.0' ->>>>>>> BRANCH (0e62e5 [9.2] Publish Pywikibot 9.2) __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 45326fd..2fb443e 100644 --- a/pywikibot/families/wikipedia_family.py +++ b/pywikibot/families/wikipedia_family.py @@ -32,65 +32,6 @@ 'anp', 'ar', 'arc', 'ary', 'arz', 'as', 'ast', 'atj', 'av', 'avk', 'awa', 'ay', 'az', 'azb', 'ba', 'ban', 'bar', 'bat-smg', 'bbc', 'bcl', 'be', 'be-tarask', 'bew', 'bg', 'bh', 'bi', 'bjn', 'blk', 'bm', 'bn', -<<<<<<< HEAD (cbc2e2 Update git submodules) - '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', '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', -||||||| BASE - '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', -======= 'bo', 'bpy', 'br', 'bs', 'btm', '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', 'dtp', @@ -119,7 +60,6 @@ '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', ->>>>>>> BRANCH (0e62e5 [9.2] Publish Pywikibot 9.2) } # Sites we want to edit but not count as real languages -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/1048835?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.wikimedia.org/r/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: pywikibot/core Gerrit-Branch: stable Gerrit-Change-Id: Ic0cbe623db783a83ab67de8b0f4834239995aa6a Gerrit-Change-Number: 1048835 Gerrit-PatchSet: 1 Gerrit-Owner: Xqt <[email protected]> Gerrit-Reviewer: Xqt <[email protected]> Gerrit-Reviewer: jenkins-bot
_______________________________________________ Pywikibot-commits mailing list -- [email protected] To unsubscribe send an email to [email protected]
