jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/1183252?usp=email )
Change subject: Merge branch 'master' into stable ...................................................................... Merge branch 'master' into stable Change-Id: I18af65f2a2bf569effaaf03abc86a2e77a9769f0 --- M HISTORY.rst M ROADMAP.rst M pywikibot/__metadata__.py M pywikibot/families/wiktionary_family.py 5 files changed, 100 insertions(+), 75 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/HISTORY.rst b/HISTORY.rst index 7697c28..9a4b6dc 100644 --- a/HISTORY.rst +++ b/HISTORY.rst @@ -1,9 +1,6 @@ Release History =============== -<<<<<<< HEAD (2f3331 Update git submodules) -||||||| BASE -======= 10.3.2 ------ *12 August 2025* @@ -13,7 +10,6 @@ * i18n updates ->>>>>>> BRANCH (94dc17 [10.4.0] Publish Pywikibot 10.4) 10.3.1 ------ *08 August 2025* diff --git a/ROADMAP.rst b/ROADMAP.rst index eb1d276..50ff705 100644 --- a/ROADMAP.rst +++ b/ROADMAP.rst @@ -1,33 +1,6 @@ Current Release Changes ======================= -<<<<<<< HEAD (2f3331 Update git submodules) -* Add support for zghwiktionary, madwikisource, rkiwiki, minwikibooks - (:phab:`T391769`, :phab:`T392501`, :phab:`T395501`, :phab:`T399787`) -* i18n updates -||||||| BASE -* :attr:`Site.articlepath<pywikibot.site._apisite.APISite.articlepath>` may raise a ValueError - instead of AttributeError if ``$1`` placeholder is missing from API -* Refactor the :class:`throttle.Throttle` class (:phab:`T289318`) -* L10N-Updates: add language aliases for ``gsw``, ``sgs``, ``vro``, ``rup`` and ``lzh`` - to :class:`family.WikimediaFamily` family class - (:phab:`T399411`, :phab:`T399438`, :phab:`T399444`, :phab:`T399693`, :phab:`T399697` ) -* Refactor HTML removal logic in :func:`textlib.removeHTMLParts` using :class:`textlib.GetDataHTML` - parser; *removetags* parameter was introduced to remove specified tag blocks (:phab:`T399378`) -* Refactor :class:`echo.Notification` and fix :meth:`mark_as_read()<echo.Notification.mark_as_read>` - method (:phab:`T398770`) -* Update beta domains in family files from beta.wmflabs.org to beta.wmcloud.org (:phab:`T289318`) -* ``textlib.to_latin_digits()`` was renamed to :func:`textlib.to_ascii_digits` (:phab:`T398146#10958283`), - ``NON_LATIN_DIGITS`` of :mod:`userinterfaces.transliteration` was renamed to ``NON_ASCII_DIGITS`` -* Add -cookies option to the :mod:`login<pywikibot.scripts.login>` script to log in with cookies - files only -* Create a Site using the :func:`pywikibot.Site` constructor with a given url even if the URL, even - if it ends with a slash (:phab:`T396592`) -* Remove hard-coded error messages from :meth:`login.LoginManager.login` and use API response instead -* Add additional information to :meth:`Site.login()<pywikibot.site._apisite.APISite.login>` - error message (:phab:`T395670`) -* i18n updates -======= * Apply client-side filtering for *maxsize* in misermode in :meth:`Site.allpages()<pywikibot.site._generators.GeneratorsMixin.allpages>` (:phab:`T402995`) * Add :attr:`filter_func()<data.api.APIGeneratorBase.filter_func>` and :meth:`filter_item() @@ -56,8 +29,6 @@ :meth:`Site.watch()<pywikibot.site._apisite.APISite.watch>`; fix the methods to return False if page is missing and no expiry is set (:phab:`T330839`) ->>>>>>> BRANCH (94dc17 [10.4.0] Publish Pywikibot 10.4) - Deprecations ============ diff --git a/pywikibot/__metadata__.py b/pywikibot/__metadata__.py index ddf14d0..8481806 100644 --- a/pywikibot/__metadata__.py +++ b/pywikibot/__metadata__.py @@ -12,12 +12,6 @@ from time import strftime -<<<<<<< HEAD (2f3331 Update git submodules) -__version__ = '10.3.2' -||||||| BASE -__version__ = '10.3.0' -======= __version__ = '10.4.0' ->>>>>>> BRANCH (94dc17 [10.4.0] Publish Pywikibot 10.4) __url__ = 'https://www.mediawiki.org/wiki/Manual:Pywikibot' __copyright__ = f'2003-{strftime("%Y")}, Pywikibot team' diff --git a/pywikibot/families/wiktionary_family.py b/pywikibot/families/wiktionary_family.py index 052a179..1f238a0 100644 --- a/pywikibot/families/wiktionary_family.py +++ b/pywikibot/families/wiktionary_family.py @@ -34,41 +34,6 @@ ] codes = { -<<<<<<< HEAD (2f3331 Update git submodules) - 'af', 'am', 'an', 'ang', 'ar', 'ast', 'ay', 'az', 'bcl', 'be', 'bg', - 'bjn', 'blk', 'bn', 'br', 'bs', 'btm', 'ca', 'chr', 'ckb', 'co', 'cs', - 'csb', 'cy', 'da', 'de', 'diq', 'dv', 'el', 'en', 'eo', 'es', 'et', - 'eu', 'fa', 'fi', 'fj', 'fo', 'fr', 'fy', 'ga', 'gd', 'gl', 'gn', - 'gom', 'gor', 'gu', 'guw', 'gv', 'ha', 'he', 'hi', 'hif', 'hr', 'hsb', - 'hu', 'hy', 'ia', 'id', 'ie', 'ig', 'io', 'is', 'it', 'iu', 'ja', - 'jbo', 'jv', 'ka', 'kaa', 'kbd', 'kcg', 'kk', 'kl', 'km', 'kn', 'ko', - 'ks', 'ku', 'kw', 'ky', 'la', 'lb', 'li', 'lmo', 'ln', 'lo', 'lt', - 'lv', 'mad', 'mg', 'mi', 'min', 'mk', 'ml', 'mn', 'mni', 'mnw', 'mr', - 'ms', 'mt', 'my', 'na', 'nah', 'nds', 'ne', 'nia', 'nl', 'nn', 'no', - 'oc', 'om', 'or', 'pa', 'pl', 'pnb', 'ps', 'pt', 'qu', 'ro', 'roa-rup', - 'ru', 'rw', 'sa', 'sat', 'scn', 'sd', 'sg', 'sh', 'shn', 'shy', 'si', - 'simple', 'sk', 'skr', 'sl', 'sm', 'so', 'sq', 'sr', 'ss', 'st', 'su', - 'sv', 'sw', 'ta', 'tcy', 'te', 'tg', 'th', 'ti', 'tk', 'tl', 'tn', - 'tpi', 'tr', 'ts', 'tt', 'ug', 'uk', 'ur', 'uz', 'vec', 'vi', 'vo', - 'wa', 'wo', 'yi', 'yue', 'zgh', 'zh', 'zh-min-nan', 'zu', -||||||| BASE - 'af', 'am', 'an', 'ang', 'ar', 'ast', 'ay', 'az', 'bcl', 'be', 'bg', - 'bjn', 'blk', 'bn', 'br', 'bs', 'btm', 'ca', 'chr', 'ckb', 'co', 'cs', - 'csb', 'cy', 'da', 'de', 'diq', 'dv', 'el', 'en', 'eo', 'es', 'et', - 'eu', 'fa', 'fi', 'fj', 'fo', 'fr', 'fy', 'ga', 'gd', 'gl', 'gn', - 'gom', 'gor', 'gu', 'guw', 'gv', 'ha', 'he', 'hi', 'hif', 'hr', 'hsb', - 'hu', 'hy', 'ia', 'id', 'ie', 'ig', 'io', 'is', 'it', 'iu', 'ja', - 'jbo', 'jv', 'ka', 'kaa', 'kbd', 'kcg', 'kk', 'kl', 'km', 'kn', 'ko', - 'ks', 'ku', 'kw', 'ky', 'la', 'lb', 'li', 'lmo', 'ln', 'lo', 'lt', - 'lv', 'mad', 'mg', 'mi', 'min', 'mk', 'ml', 'mn', 'mni', 'mnw', 'mr', - 'ms', 'mt', 'my', 'na', 'nah', 'nds', 'ne', 'nia', 'nl', 'nn', 'no', - 'oc', 'om', 'or', 'pa', 'pl', 'pnb', 'ps', 'pt', 'qu', 'ro', 'roa-rup', - 'ru', 'rw', 'sa', 'sat', 'scn', 'sd', 'sg', 'sh', 'shn', 'shy', 'si', - 'simple', 'sk', 'skr', 'sl', 'sm', 'so', 'sq', 'sr', 'ss', 'st', 'su', - 'sv', 'sw', 'ta', 'tcy', 'te', 'tg', 'th', 'ti', 'tk', 'tl', 'tn', - 'tpi', 'tr', 'ts', 'tt', 'ug', 'uk', 'ur', 'uz', 'vec', 'vi', 'vo', - 'wa', 'wo', 'yi', 'yue', 'zh', 'zh-min-nan', 'zu', -======= 'af', 'am', 'an', 'ang', 'ar', 'ast', 'ay', 'az', 'bcl', 'be', 'bew', 'bg', 'bjn', 'blk', 'bn', 'br', 'bs', 'btm', 'ca', 'chr', 'ckb', 'co', 'cs', 'csb', 'cy', 'da', 'de', 'diq', 'dv', 'el', 'en', 'eo', 'es', @@ -85,7 +50,6 @@ 'st', 'su', 'sv', 'sw', 'ta', 'tcy', 'te', 'tg', 'th', 'ti', 'tk', 'tl', 'tn', 'tpi', 'tr', 'ts', 'tt', 'ug', 'uk', 'ur', 'uz', 'vec', 'vi', 'vo', 'wa', 'wo', 'yi', 'yue', 'zgh', 'zh', 'zh-min-nan', 'zu', ->>>>>>> BRANCH (94dc17 [10.4.0] Publish Pywikibot 10.4) } category_redirect_templates = { -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/1183252?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: I18af65f2a2bf569effaaf03abc86a2e77a9769f0 Gerrit-Change-Number: 1183252 Gerrit-PatchSet: 1 Gerrit-Owner: Xqt <i...@gno.de> Gerrit-Reviewer: Xqt <i...@gno.de> Gerrit-Reviewer: jenkins-bot
_______________________________________________ Pywikibot-commits mailing list -- pywikibot-commits@lists.wikimedia.org To unsubscribe send an email to pywikibot-commits-le...@lists.wikimedia.org
