jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/1057375?usp=email )
Change subject: Merge branch 'master' into stable ...................................................................... Merge branch 'master' into stable Change-Id: I15774e6cd593d123d565babf40abab19dbcb72ab --- M HISTORY.rst M ROADMAP.rst M pywikibot/__metadata__.py 4 files changed, 119 insertions(+), 41 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/HISTORY.rst b/HISTORY.rst index 20a7673..74b5323 100644 --- a/HISTORY.rst +++ b/HISTORY.rst @@ -1,17 +1,6 @@ Release History =============== -<<<<<<< HEAD (e7da58 Update git submodules) -||||||| BASE -9.1.3 ------ -*28.05.2024* - -* Add support for dtpwiki (:phab:`T365232`) -* i18n updates - -9.1.2 -======= 9.2.1 ----- *13 July 2024* @@ -20,7 +9,6 @@ * i18n updates ->>>>>>> BRANCH (27ca7e [9.3] Publish Pywikibot 9.3) 9.2.0 ----- *22 June 2024* diff --git a/ROADMAP.rst b/ROADMAP.rst index ae8eabd..63d76f2 100644 --- a/ROADMAP.rst +++ b/ROADMAP.rst @@ -1,28 +1,6 @@ Current Release Changes ======================= -<<<<<<< HEAD (e7da58 Update git submodules) -* Add support for ``aewikimedia`` to Pywikibot (:phab:`T362529`) -* i18n updates -||||||| BASE -* Add support for ``btmwiki`` to Pywikibot (:phab:`T368069`) -* Include image repository extensions in :attr:`site.APISite.file_extensions - <pywikibot.site._apisite.APISite.file_extensions>` -* Ignore :exc:`ValueError` durig upcast of :class:`FilePage<pywikibot.page.FilePage>` due to invalid file extension - (:phab:`T367777`) -* Add :func:`pagegenerators.SupersetPageGenerator` pagegenerator (:phab:`T367684`) -* No longer wait in :meth:`data.api.Request._http_request` for ``ImportError`` and ``NameError`` -* Replace ``requests.utils.urlparse`` with ``urllib.parse.urlparse`` in - :func:`comms.http.get_authentication` (:phab:`T367649`) -* Show an appropiate message if ``requests_oauthlib`` package is required but missing (:phab:`T353387`) -* Retry ``DBUnexpectedError`` in :meth:`data.api.Request._internal_api_error` (:phab:`T367383`) -* Duplicated entries found in :mod:`pywikibot` were removed -* Pass ``None`` instead of an empty string as *expiry* argument in - :meth:`site.APISite.protect()<pywikibot.site._apisite.APISite.protect>` (:phab:`T367176`) -* Fix keyword argument in :meth:`Page.undelete()<page.BasePage.undelete>` when - calling :meth:`site.APISite.undelete()<pywikibot.site._apisite.APISite.undelete>` (:phab:`T367037`) -* Check whether :attr:`BaseBot.generator<bot.BaseBot.generator>` is None in :meth:`run()<bot.BaseBot.run>` method -======= * Only add lang links from API response to a given page if present in family file (:phab:`T371107`) * Add support for ``cswikivoyage`` to Pywikibot (:phab:`T370915`) * :class:`pywikibot.FilePage` has a parameter *ignore_extension* to ignore file extension check :phab:`T352237`) @@ -40,7 +18,6 @@ :meth:`Page.authorship()<page._toolforge.WikiBlameMixin.authorship>` using ``xtools`` (:phab:`T366100`); ``wikitextparser`` packages is required for it. ->>>>>>> BRANCH (27ca7e [9.3] Publish Pywikibot 9.3) Current Deprecations ==================== diff --git a/pywikibot/__metadata__.py b/pywikibot/__metadata__.py index fcc5815..ff248c6 100644 --- a/pywikibot/__metadata__.py +++ b/pywikibot/__metadata__.py @@ -12,12 +12,6 @@ from time import strftime -<<<<<<< HEAD (e7da58 Update git submodules) -__version__ = '9.2.1' -||||||| BASE -__version__ = '9.2.0' -======= __version__ = '9.3.0' ->>>>>>> BRANCH (27ca7e [9.3] Publish Pywikibot 9.3) __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/+/1057375?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: I15774e6cd593d123d565babf40abab19dbcb72ab Gerrit-Change-Number: 1057375 Gerrit-PatchSet: 2 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
