Pywikibot-commits

pywikibot-commits@lists.wikimedia.org

1 participants
13500 discussions

[Gerrit] ...core[master]: [doc] Fix HISTORY.rst
by Xqt (Code Review) 21 Jan '23

21 Jan '23

Xqt has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/882151 ) Change subject: [doc] Fix HISTORY.rst ...................................................................... [doc] Fix HISTORY.rst Change-Id: I76c5dcb6ebdb55ab8e1b94b44427046b1f0a3a16 --- M HISTORY.rst 1 file changed, 9 insertions(+), 1 deletion(-) Approvals: jenkins-bot: Verified Xqt: Looks good to me, approved diff --git a/HISTORY.rst b/HISTORY.rst index 91d77f1..829a961 100644 --- a/HISTORY.rst +++ b/HISTORY.rst @@ -92,7 +92,6 @@ :class:`Wiktionary<families.wiktionary_family.Family>` family were removed (:phab:`T325426`) * ``alphabetic``, ``alphabetic_revised`` and ``fyinterwiki`` attributes of :class:`family.Family` were removed (:phab:`T325426`) -* *See also Deprecations below* 7.7.3 -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/882151 To unsubscribe, or for help writing mail filters, visit https://gerrit.wikimedia.org/r/settings Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Change-Id: I76c5dcb6ebdb55ab8e1b94b44427046b1f0a3a16 Gerrit-Change-Number: 882151 Gerrit-PatchSet: 1 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

1 0

[Gerrit] ...core[master]: [8.1] Prepare next release
by jenkins-bot (Code Review) 21 Jan '23

21 Jan '23

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/882004 ) Change subject: [8.1] Prepare next release ...................................................................... [8.1] Prepare next release Change-Id: I5a502d42e1d3dc261ceb4ba60d7d47ea95382d92 --- M .appveyor.yml M ROADMAP.rst M pywikibot/__metadata__.py M HISTORY.rst M scripts/__init__.py 5 files changed, 110 insertions(+), 93 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/.appveyor.yml b/.appveyor.yml index e9544db..5437d37 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -1,7 +1,7 @@ -image: Visual Studio 2019 +image: Visual Studio 2022 clone_depth: 50 skip_tags: true -version: 8.0.{build} +version: 8.1.{build} environment: PYWIKIBOT_DIR: "%appdata%\\Pywikibot" diff --git a/HISTORY.rst b/HISTORY.rst index dfa92df..91d77f1 100644 --- a/HISTORY.rst +++ b/HISTORY.rst @@ -1,6 +1,100 @@ Release history =============== +8.0.0 +----- +*21 January 2023* + +Improvements +^^^^^^^^^^^^ + +* Allow copying timezone from timestamp in :class:`pywikibot.WbTime` (:phab:`T325864`) +* Support federated Wikibase (:phab:`T173195`) +* Improve warning if a Non-JSON response was received from server (:phab:`T326046`) +* Allow normalization of :class:`pywikibot.WbTime` objects (:phab:`T123888`) +* Add parser for ``<pages />`` tag to :mod:`proofreadpage` +* ``addOnly`` parameter of :func:`textlib.replaceLanguageLinks` and :func:`textlib.replaceCategoryLinks` + were renamed to ``add_only`` +* ``known_codes`` attribute was added to :class:`family.WikimediaFamily` (:phab:`T325426`) +* Unify representation for :class:`time.Timestamp` between CPython and Pypy (:phab:`T325905`) +* Implement comparison for :class:`pywikibot.WbTime` object (:phab:`T148280`, :phab:`T325863`) +* Create a cookie file for each account (:phab:`T324000`) +* Move data.api._login.LoginManager to :class:`login.ClientLoginManager` +* Let user the choice which section to be copied with :mod:`generate_user_files + <pywikibot.scripts.generate_user_files>` (:phab:`T145372`) +* use :func:`roundrobin_generators<tools.itertools.roundrobin_generators>` to combine generators + when limit option is given +* Ignore OSError if API cache cannot be written +* Update tools._unidata._category_cf from Unicodedata version 15.0.0 +* :meth:`Timestamp.set_timestamp()<pywikibot.time.Timestamp.set_timestamp>` raises TypeError + instead of ValueError if conversion fails +* Python 3.12 is supported +* All parameters of :meth:`APISite.categorymembers() + <pywikibot.site._generators.GeneratorsMixin.categorymembers>` are provided with + :meth:`Category.members()<page.Category.members>`, + :meth:`Category.subcategories()<page.Category.subcategories>` (*member_type* excluded) and + :meth:`Category.articles()<page.Category.articles>` (*member_type* excluded) +* Enable site-package installation from git repository (:phab:`T320851`) +* Enable 2FA login (:phab:`T186274`) +* :meth:`Page.editTime()<page.BasePage.editTime>` was replaced by + :attr:`Page.latest_revision.timestamp<page.BasePage.latest_revision>` +* Raise a generic ServerError if requests response is a ServerError (:phab:`T320590`) +* Add a new variable 'private_folder_permission' to config.py (:phab:`T315045`) +* L10N and i18n updates +* Adjust subprocess args in :mod:`tools.djvu` +* Short site value can be given if site code is equal to family like ``-site:meta`` or ``-site:commons`` + +Documentation improvements +^^^^^^^^^^^^^^^^^^^^^^^^^^ + +* Add highlighting to targeted code snippet within documentation (:phab:`T323800`) +* Add previous, next, index, and modules links to documentation sidebar (:phab:`T323803`) +* Introduce standard colors (legacy palette) in Furo theme (:phab:`T323802`) +* Improve basic content structure and navigation of documentation (:phab:`T323812`) +* Use ``Furo`` sphinx theme instead of ``Natural`` and improve documentation look and feel (:phab:`T322212`) +* MediaWiki API cross reference was added to the documentation + +Bugfixes +^^^^^^^^ + +* Fix representation string for :class:`page.Claim` stub instances (:phab:`T326453`) +* Don't raise StopIteration in :meth:`login.LoginManager.check_user_exists` + if given user is behind the last user (:phab:`T326063`) +* Normalize :class:`WbTimes<pywikibot.WbTime>` sent to Wikidata (:phab:`T325860`) +* Fix :class:`pywikibot.WbTime` precision (:phab:`T324798`) +* Unquote title for red-links in class:`proofreadpage.IndexPage` +* Find month with first letter uppercase or lowercase with :class:`textlib.TimeStripper` (:phab:`T324310`) +* Fix disolving script_paths for site-package (:phab:`T320530`) +* Respect limit argument with Board.topics() (:phab:`T138215`, :phab:`T138307`) + +Breaking changes +^^^^^^^^^^^^^^^^ + +* ``mwparserfromhell`` package is mandatory (:phab:`T326498`) +* Several package dependencies were updated +* All parameters of :meth:`Category.members()<page.Category.members>`, + :meth:`Category.subcategories()<page.Category.subcategories>` and + :meth:`Category.articles()<page.Category.articles>` are keyword only +* The ``parent_id`` and ``content_model`` attributes of :class:`page.Revision` were removed in favour + of ``parentid`` and ``contentmodel`` +* Support for MediaWiki < 1.27 was dropped +* ListBoxWindows class of :mod:`userinterfaces.gui` was removed +* Require Python 3.6.1+ with Pywikibot and drop support for Python 3.6.0 (:phab:`T318912`) +* pymysql >= 0.9.3 is required (:phab:`T216741`) +* Python 3.5 support was dropped (:phab:`T301908`) +* *See also Code cleanups below* + +Code cleanups +^^^^^^^^^^^^^ + +* ``maintenance/sorting_order`` script was removed (:phab:`T325426`) +* ``alphabetic_sv`` and ``interwiki_putfirst`` attributes of + :class:`Wiktionary<families.wiktionary_family.Family>` family were removed (:phab:`T325426`) +* ``alphabetic``, ``alphabetic_revised`` and ``fyinterwiki`` attributes of :class:`family.Family` + were removed (:phab:`T325426`) +* *See also Deprecations below* + + 7.7.3 ----- *08 January 2023* diff --git a/ROADMAP.rst b/ROADMAP.rst index a1ed684..ee98ef9 100644 --- a/ROADMAP.rst +++ b/ROADMAP.rst @@ -1,94 +1,8 @@ -Current release 8.0.0 +Current release 8.1.0 --------------------- -Improvements -^^^^^^^^^^^^ +* *No changes yet* -* Allow copying timezone from timestamp in :class:`pywikibot.WbTime` (:phab:`T325864`) -* Support federated Wikibase (:phab:`T173195`) -* Improve warning if a Non-JSON response was received from server (:phab:`T326046`) -* Allow normalization of :class:`pywikibot.WbTime` objects (:phab:`T123888`) -* Add parser for ``<pages />`` tag to :mod:`proofreadpage` -* ``addOnly`` parameter of :func:`textlib.replaceLanguageLinks` and :func:`textlib.replaceCategoryLinks` - were renamed to ``add_only`` -* ``known_codes`` attribute was added to :class:`family.WikimediaFamily` (:phab:`T325426`) -* Unify representation for :class:`time.Timestamp` between CPython and Pypy (:phab:`T325905`) -* Implement comparison for :class:`pywikibot.WbTime` object (:phab:`T148280`, :phab:`T325863`) -* Create a cookie file for each account (:phab:`T324000`) -* Move data.api._login.LoginManager to :class:`login.ClientLoginManager` -* Let user the choice which section to be copied with :mod:`generate_user_files - <pywikibot.scripts.generate_user_files>` (:phab:`T145372`) -* use :func:`roundrobin_generators<tools.itertools.roundrobin_generators>` to combine generators - when limit option is given -* Ignore OSError if API cache cannot be written -* Update tools._unidata._category_cf from Unicodedata version 15.0.0 -* :meth:`Timestamp.set_timestamp()<pywikibot.time.Timestamp.set_timestamp>` raises TypeError - instead of ValueError if conversion fails -* Python 3.12 is supported -* All parameters of :meth:`APISite.categorymembers() - <pywikibot.site._generators.GeneratorsMixin.categorymembers>` are provided with - :meth:`Category.members()<page.Category.members>`, - :meth:`Category.subcategories()<page.Category.subcategories>` (*member_type* excluded) and - :meth:`Category.articles()<page.Category.articles>` (*member_type* excluded) -* Enable site-package installation from git repository (:phab:`T320851`) -* Enable 2FA login (:phab:`T186274`) -* :meth:`Page.editTime()<page.BasePage.editTime>` was replaced by - :attr:`Page.latest_revision.timestamp<page.BasePage.latest_revision>` -* Raise a generic ServerError if requests response is a ServerError (:phab:`T320590`) -* Add a new variable 'private_folder_permission' to config.py (:phab:`T315045`) -* L10N and i18n updates -* Adjust subprocess args in :mod:`tools.djvu` -* Short site value can be given if site code is equal to family like ``-site:meta`` or ``-site:commons`` - -Documentation improvements -^^^^^^^^^^^^^^^^^^^^^^^^^^ - -* Add highlighting to targeted code snippet within documentation (:phab:`T323800`) -* Add previous, next, index, and modules links to documentation sidebar (:phab:`T323803`) -* Introduce standard colors (legacy palette) in Furo theme (:phab:`T323802`) -* Improve basic content structure and navigation of documentation (:phab:`T323812`) -* Use ``Furo`` sphinx theme instead of ``Natural`` and improve documentation look and feel (:phab:`T322212`) -* MediaWiki API cross reference was added to the documentation - -Bugfixes -^^^^^^^^ - -* Fix representation string for :class:`page.Claim` stub instances (:phab:`T326453`) -* Don't raise StopIteration in :meth:`login.LoginManager.check_user_exists` - if given user is behind the last user (:phab:`T326063`) -* Normalize :class:`WbTimes<pywikibot.WbTime>` sent to Wikidata (:phab:`T325860`) -* Fix :class:`pywikibot.WbTime` precision (:phab:`T324798`) -* Unquote title for red-links in class:`proofreadpage.IndexPage` -* Find month with first letter uppercase or lowercase with :class:`textlib.TimeStripper` (:phab:`T324310`) -* Fix disolving script_paths for site-package (:phab:`T320530`) -* Respect limit argument with Board.topics() (:phab:`T138215`, :phab:`T138307`) - -Breaking changes -^^^^^^^^^^^^^^^^ - -* ``mwparserfromhell`` package is mandatory (:phab:`T326498`) -* Several package dependencies were updated -* All parameters of :meth:`Category.members()<page.Category.members>`, - :meth:`Category.subcategories()<page.Category.subcategories>` and - :meth:`Category.articles()<page.Category.articles>` are keyword only -* The ``parent_id`` and ``content_model`` attributes of :class:`page.Revision` were removed in favour - of ``parentid`` and ``contentmodel`` -* Support for MediaWiki < 1.27 was dropped -* ListBoxWindows class of :mod:`userinterfaces.gui` was removed -* Require Python 3.6.1+ with Pywikibot and drop support for Python 3.6.0 (:phab:`T318912`) -* pymysql >= 0.9.3 is required (:phab:`T216741`) -* Python 3.5 support was dropped (:phab:`T301908`) -* *See also Code cleanups below* - -Code cleanups -^^^^^^^^^^^^^ - -* ``maintenance/sorting_order`` script was removed (:phab:`T325426`) -* ``alphabetic_sv`` and ``interwiki_putfirst`` attributes of - :class:`Wiktionary<families.wiktionary_family.Family>` family were removed (:phab:`T325426`) -* ``alphabetic``, ``alphabetic_revised`` and ``fyinterwiki`` attributes of :class:`family.Family` - were removed (:phab:`T325426`) -* *See also Deprecations below* Deprecations ------------ diff --git a/pywikibot/__metadata__.py b/pywikibot/__metadata__.py index a9e6e99..4c139f8 100644 --- a/pywikibot/__metadata__.py +++ b/pywikibot/__metadata__.py @@ -11,7 +11,7 @@ __name__ = 'pywikibot' -__version__ = '8.0.0' +__version__ = '8.1.0.dev0' __description__ = 'Python MediaWiki Bot Framework' __maintainer__ = 'The Pywikibot team' __maintainer_email__ = 'pywikibot(a)lists.wikimedia.org' diff --git a/scripts/__init__.py b/scripts/__init__.py index 192bebf..4be7d80 100644 --- a/scripts/__init__.py +++ b/scripts/__init__.py @@ -25,8 +25,8 @@ due to spelling mistake """ # -# (C) Pywikibot team, 2021-2022 +# (C) Pywikibot team, 2021-2023 # # Distributed under the terms of the MIT license. # -__version__ = '8.0.0' +__version__ = '8.1.0' -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/882004 To unsubscribe, or for help writing mail filters, visit https://gerrit.wikimedia.org/r/settings Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Change-Id: I5a502d42e1d3dc261ceb4ba60d7d47ea95382d92 Gerrit-Change-Number: 882004 Gerrit-PatchSet: 1 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: D3r1ck01 <xsavitar.wiki(a)aol.com> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

1 0

[Gerrit] ...core[stable]: Merge branch 'master' into stable
by jenkins-bot (Code Review) 21 Jan '23

21 Jan '23

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/882000 ) Change subject: Merge branch 'master' into stable ...................................................................... Merge branch 'master' into stable Bug: T308258 Change-Id: I5597702e0e005537b18ebb9bf39111b9ecd24095 --- M pywikibot/families/wikisource_family.py M pywikibot/textlib.py M tests/site_detect_tests.py M setup.py M pywikibot/__metadata__.py M docs/requirements.txt M pywikibot/families/wikiquote_family.py M pywikibot/bot.py M pywikibot/families/wiktionary_family.py M tox.ini M pywikibot/families/wikipedia_family.py 12 files changed, 458 insertions(+), 231 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/docs/requirements.txt b/docs/requirements.txt index 4778783..61d54ac 100644 --- a/docs/requirements.txt +++ b/docs/requirements.txt @@ -1,12 +1,6 @@ # This is a PIP requirements file for building Sphinx documentation of pywikibot # requirements.txt is also needed -<<<<<<< HEAD (ad2a8a Update git submodules) - -sphinx == 5.1.1 -rstcheck >=3.5.0 -======= sphinx >= 5.2.3 rstcheck >=6.1.0 sphinxext-opengraph >= 0.7.2 furo >= 2022.9.29 ->>>>>>> BRANCH (2645ee [8.0] Publish Pywikibot 8) diff --git a/pywikibot/__metadata__.py b/pywikibot/__metadata__.py index 6cffa86..a9e6e99 100644 --- a/pywikibot/__metadata__.py +++ b/pywikibot/__metadata__.py @@ -11,11 +11,7 @@ __name__ = 'pywikibot' -<<<<<<< HEAD (ad2a8a Update git submodules) -__version__ = '7.7.3' -======= __version__ = '8.0.0' ->>>>>>> BRANCH (2645ee [8.0] Publish Pywikibot 8) __description__ = 'Python MediaWiki Bot Framework' __maintainer__ = 'The Pywikibot team' __maintainer_email__ = 'pywikibot(a)lists.wikimedia.org' diff --git a/pywikibot/bot.py b/pywikibot/bot.py index 47045b9..95dee26 100644 --- a/pywikibot/bot.py +++ b/pywikibot/bot.py @@ -708,7 +708,7 @@ self._default = default self._quit = automatic_quit - current_match_type = Optional[Tuple[ # noqa: F841 + current_match_type = Optional[Tuple[ # skipcq: PYL-W0612 PageLinkType, str, Mapping[str, str], diff --git a/pywikibot/families/wikipedia_family.py b/pywikibot/families/wikipedia_family.py index 4444bb4..0a0603e 100644 --- a/pywikibot/families/wikipedia_family.py +++ b/pywikibot/families/wikipedia_family.py @@ -30,35 +30,6 @@ 'ja', 'zh', 'vi', 'war', 'uk', 'ar', 'pt', 'fa', 'ca', 'sr', 'id', 'ko', 'no', 'fi', 'tr', 'hu', 'cs', 'ce', 'tt', 'sh', 'ro', 'zh-min-nan', 'eu', 'ms', 'eo', 'he', 'hy', 'da', 'bg', 'cy', 'sk', -<<<<<<< HEAD (ad2a8a Update git submodules) - 'azb', 'et', 'kk', 'be', 'min', 'simple', 'uz', 'el', 'hr', 'lt', 'gl', - 'az', 'ur', 'sl', 'ka', 'nn', 'hi', 'th', 'ta', 'la', 'mk', 'bn', - 'ast', 'zh-yue', 'lv', 'tg', 'af', 'my', 'mg', 'bs', 'mr', 'oc', 'sq', - 'nds', 'ky', 'be-tarask', 'ml', 'te', 'br', 'sw', 'new', 'jv', 'lld', - 'vec', 'ht', 'pnb', 'pms', 'lb', 'ba', 'su', 'ku', 'ga', 'lmo', 'szl', - 'is', 'cv', 'fy', 'ckb', 'tl', 'an', 'wuu', 'diq', 'sco', 'pa', 'io', - 'vo', 'yo', 'ne', 'gu', 'als', 'kn', 'ia', 'bar', 'scn', 'avk', 'bpy', - 'qu', 'crh', 'mn', 'nv', 'ha', 'xmf', 'si', 'ban', 'bat-smg', 'ps', - 'os', 'frr', 'or', 'sah', 'gd', 'bug', 'cdo', 'yi', 'ilo', 'sd', 'am', - 'nap', 'li', 'fo', 'hsb', 'gor', 'map-bms', 'mai', 'mzn', 'ig', 'bcl', - 'eml', 'ace', 'shn', 'zh-classical', 'sa', 'wa', 'ie', 'lij', 'as', - 'zu', 'mhr', 'mrj', 'hyw', 'hif', 'bjn', 'mni', 'sn', 'hak', 'km', - 'roa-tara', 'so', 'pam', 'rue', 'nso', 'bh', 'tum', 'se', 'mi', 'myv', - 'sat', 'vls', 'nds-nl', 'nah', 'sc', 'vep', 'kab', 'tk', 'gan', 'kw', - 'glk', 'co', 'dag', 'fiu-vro', 'ary', 'bo', 'ab', 'gv', 'frp', 'zea', - 'skr', 'ug', 'kv', 'pcd', 'udm', 'csb', 'mt', 'ay', 'gn', 'smn', 'nrm', - 'lez', 'lfn', 'stq', 'olo', 'lo', 'rw', 'mwl', 'ang', 'fur', 'rm', - 'lad', 'gom', 'koi', 'ext', 'tyv', 'dsb', 'av', 'dty', 'ln', 'cbk-zam', - 'pap', 'dv', 'kaa', 'ksh', 'gag', 'bxr', 'pfl', 'pag', 'pi', 'ks', - 'szy', 'haw', 'awa', 'tay', 'mdf', 'za', 'tw', 'blk', 'inh', 'krc', - 'xal', 'pdc', 'atj', 'to', 'arc', 'tcy', 'lg', 'mnw', 'kbp', 'jam', - 'na', 'wo', 'kbd', 'nia', 'nov', 'ki', 'bi', 'nqo', 'tpi', 'tet', - 'shi', 'jbo', 'roa-rup', 'fj', 'lbe', 'kg', 'xh', 'ty', 'cu', 'guw', - 'om', 'trv', 'srn', 'sm', 'gcr', 'alt', 'chr', 'ltg', 'tn', 'ny', 'st', - 'pih', 'mad', 'got', 'ami', 'rmy', 'bm', 've', 'ts', 'ff', 'chy', 'ss', - 'rn', 'kcg', 'ak', 'iu', 'ch', 'ee', 'pnt', 'ady', 'ik', 'pcm', 'sg', - 'pwn', 'din', 'ti', 'kl', 'dz', 'cr', -======= 'azb', 'et', 'kk', 'be', 'simple', 'min', 'uz', 'el', 'hr', 'lt', 'gl', 'az', 'ur', 'sl', 'ka', 'nn', 'hi', 'th', 'ta', 'la', 'bn', 'mk', 'ast', 'zh-yue', 'lv', 'tg', 'af', 'my', 'mg', 'bs', 'mr', 'oc', 'sq', @@ -86,7 +57,6 @@ 'st', 'mad', 'pih', 'got', 'ami', 'rmy', 'bm', 've', 'ts', 'ff', 'chy', 'ss', 'rn', 'kcg', 'ak', 'iu', 'ee', 'ch', 'pnt', 'ik', 'ady', 'pcm', 'sg', 'pwn', 'din', 'ti', 'kl', 'dz', 'cr', ->>>>>>> BRANCH (2645ee [8.0] Publish Pywikibot 8) ] # Sites we want to edit but not count as real languages diff --git a/pywikibot/families/wikiquote_family.py b/pywikibot/families/wikiquote_family.py index 2ee90fa..8f93dcc 100644 --- a/pywikibot/families/wikiquote_family.py +++ b/pywikibot/families/wikiquote_family.py @@ -30,17 +30,10 @@ 'it', 'en', 'pl', 'ru', 'cs', 'et', 'pt', 'fa', 'uk', 'de', 'he', 'fr', 'es', 'eo', 'tr', 'sk', 'bs', 'az', 'ca', 'fi', 'sr', 'sl', 'zh', 'lt', 'ar', 'bg', 'hy', 'hr', 'su', 'el', 'nn', 'id', 'sv', 'li', 'hu', 'ko', -<<<<<<< HEAD (ad2a8a Update git submodules) - 'nl', 'ja', 'sah', 'la', 'ta', 'gl', 'gu', 'ur', 'hi', 'ig', 'be', - 'te', 'guw', 'tl', 'vi', 'cy', 'no', 'sq', 'ml', 'bn', 'kn', 'ro', - 'eu', 'ku', 'as', 'uz', 'ka', 'da', 'sa', 'is', 'bcl', 'br', 'mr', - 'af', 'wo', 'th', 'ky', -======= 'nl', 'sah', 'ja', 'la', 'ta', 'gl', 'gu', 'hi', 'ur', 'ig', 'be', 'te', 'guw', 'tl', 'vi', 'cy', 'no', 'sq', 'ml', 'bn', 'kn', 'ro', 'eu', 'ku', 'as', 'uz', 'ka', 'da', 'sa', 'is', 'bcl', 'br', 'mr', 'af', 'th', 'wo', 'ky', ->>>>>>> BRANCH (2645ee [8.0] Publish Pywikibot 8) ] category_redirect_templates = { diff --git a/pywikibot/families/wikisource_family.py b/pywikibot/families/wikisource_family.py index 92ff162..984a277 100644 --- a/pywikibot/families/wikisource_family.py +++ b/pywikibot/families/wikisource_family.py @@ -29,11 +29,7 @@ 'mul', 'cs', 'gu', 'sr', 'pt', 'fa', 'sv', 'bn', 'hu', 'ko', 'ta', 'ml', 'sa', 'te', 'sl', 'tr', 'hy', 'la', 'vi', 'el', 'ja', 'ro', 'fi', 'nap', 'nl', 'be', 'az', 'ca', 'br', 'kn', 'no', 'hr', 'id', 'th', -<<<<<<< HEAD (ad2a8a Update git submodules) - 'eo', 'hi', 'is', 'vec', 'pms', 'ban', 'cy', 'mr', 'lij', 'da', 'et', -======= 'eo', 'hi', 'is', 'vec', 'pms', 'cy', 'ban', 'mr', 'lij', 'da', 'et', ->>>>>>> BRANCH (2645ee [8.0] Publish Pywikibot 8) 'mk', 'as', 'yi', 'bg', 'wa', 'li', 'jv', 'lt', 'pa', 'eu', 'or', 'gl', 'bs', 'sah', 'sk', 'zh-min-nan', 'fo', ] diff --git a/pywikibot/families/wiktionary_family.py b/pywikibot/families/wiktionary_family.py index daebbf2..45ba4d9 100644 --- a/pywikibot/families/wiktionary_family.py +++ b/pywikibot/families/wiktionary_family.py @@ -36,32 +36,17 @@ 'ku', 'lt', 'ca', 'it', 'fi', 'ta', 'hu', 'tr', 'ja', 'io', 'hy', 'ko', 'pt', 'kn', 'vi', 'sr', 'th', 'hi', 'ro', 'no', 'id', 'et', 'cs', 'ml', 'my', 'skr', 'uz', 'li', 'or', 'eo', 'te', 'fa', 'gl', 'ar', 'oc', -<<<<<<< HEAD (ad2a8a Update git submodules) - 'jv', 'az', 'eu', 'uk', 'ast', 'br', 'sg', 'is', 'bn', 'da', 'lo', - 'simple', 'la', 'mnw', 'hr', 'fj', 'sk', 'shn', 'tg', 'ky', 'bg', 'wa', - 'ur', 'ps', 'cy', 'vo', 'he', 'om', 'sl', 'lmo', 'af', 'zh-min-nan', - 'scn', 'tl', 'pa', 'ms', 'sw', 'fy', 'nn', 'ka', 'lv', 'min', 'sq', -======= 'jv', 'az', 'eu', 'uk', 'ast', 'br', 'is', 'sg', 'bn', 'da', 'lo', 'simple', 'mnw', 'la', 'hr', 'shn', 'fj', 'sk', 'tg', 'ky', 'bg', 'wa', 'ur', 'ps', 'cy', 'vo', 'he', 'lmo', 'om', 'sl', 'af', 'zh-min-nan', 'scn', 'tl', 'pa', 'ms', 'fy', 'sw', 'nn', 'ka', 'lv', 'min', 'sq', ->>>>>>> BRANCH (2645ee [8.0] Publish Pywikibot 8) 'nds', 'lb', 'co', 'mn', 'pnb', 'bs', 'nah', 'yue', 'sa', 'kk', 'km', 'vec', 'be', 'diq', 'tk', 'mk', 'nia', 'sm', 'hsb', 'ks', 'shy', 'su', -<<<<<<< HEAD (ad2a8a Update git submodules) - 'gd', 'ga', 'bcl', 'an', 'gom', 'mr', 'wo', 'mni', 'ia', 'ang', 'mt', - 'bjn', 'fo', 'sd', 'tt', 'gn', 'so', 'ie', 'mi', 'csb', 'ug', 'si', - 'ha', 'st', 'roa-rup', 'hif', 'tpi', 'guw', 'jbo', 'kl', 'zu', 'ay', - 'yi', 'ln', 'gu', 'na', 'gv', 'kw', 'am', 'ne', 'rw', 'ts', 'ig', 'qu', - 'ss', 'iu', 'chr', 'dv', 'gor', 'ti', 'tn', -======= 'gd', 'ga', 'bcl', 'an', 'gom', 'mr', 'gor', 'wo', 'mni', 'ia', 'ang', 'bjn', 'mt', 'fo', 'sd', 'tt', 'gn', 'so', 'ie', 'mi', 'csb', 'ug', 'si', 'ha', 'st', 'roa-rup', 'hif', 'guw', 'tpi', 'jbo', 'kl', 'zu', 'ay', 'yi', 'ln', 'gu', 'na', 'gv', 'kw', 'am', 'ne', 'rw', 'ts', 'ig', 'qu', 'ss', 'iu', 'chr', 'dv', 'ti', 'tn', ->>>>>>> BRANCH (2645ee [8.0] Publish Pywikibot 8) ] category_redirect_templates = { diff --git a/pywikibot/textlib.py b/pywikibot/textlib.py index ecc0a90..3079c22 100644 --- a/pywikibot/textlib.py +++ b/pywikibot/textlib.py @@ -26,10 +26,7 @@ from pywikibot.tools import ( ModuleDeprecationWrapper, deprecated, -<<<<<<< HEAD (ad2a8a Update git submodules) -======= deprecated_args, ->>>>>>> BRANCH (2645ee [8.0] Publish Pywikibot 8) first_lower, first_upper, ) @@ -1870,12 +1867,6 @@ # site.months_names do not. if short.endswith('.'): self.origNames2monthNum[func(short[:-1])] = n -<<<<<<< HEAD (ad2a8a Update git submodules) - - self.groups = ['year', 'month', 'hour', 'time', 'day', 'minute', - 'tzinfo'] -======= ->>>>>>> BRANCH (2645ee [8.0] Publish Pywikibot 8) timeR = (r'(?P<time>(?P<hour>([0-1]\d|2[0-3]))[:\.h]' r'(?P<minute>[0-5]\d))') diff --git a/setup.py b/setup.py index c6f6f45..1f9e32f 100755 --- a/setup.py +++ b/setup.py @@ -48,11 +48,7 @@ # vulnerability found in Pillow<8.1.1 but toolforge uses 5.4.1 'Tkinter': ['Pillow>=8.1.1'], 'mwoauth': ['mwoauth!=0.3.1,>=0.2.4'], -<<<<<<< HEAD (ad2a8a Update git submodules) - 'html': ['BeautifulSoup4'], -======= 'html': ['beautifulsoup4>=4.7.1'], ->>>>>>> BRANCH (2645ee [8.0] Publish Pywikibot 8) 'http': [ 'fake_useragent<0.1.14; python_version < "3.7"', 'fake_useragent>1.0.1; python_version >= "3.7"', @@ -63,34 +59,18 @@ 'pydocstyle>=6.2.3', 'flake8-bugbear!=23.1.14', 'flake8-coding', -<<<<<<< HEAD (ad2a8a Update git submodules) - 'flake8-comprehensions>=3.1.4; python_version >= "3.8"', - 'flake8-comprehensions>=2.2.0; python_version < "3.8"', - 'flake8-docstrings>=1.3.1', - 'verve-flake8-mock>=0.4', - 'flake8-print>=2.0.1', - # flake8-quotes is incompatible with flake8 6 (T323752), - # jenkins CI ignores "3.8.1" - 'flake8-quotes>=3.3.0; python_version < "3.8"', -======= 'flake8-comprehensions', 'flake8-docstrings>=1.4.0', 'flake8-mock-x2', 'flake8-print>=4.0.1', 'flake8-quotes>=3.3.2', ->>>>>>> BRANCH (2645ee [8.0] Publish Pywikibot 8) 'flake8-string-format', 'flake8-tuple>=0.4.1', 'flake8-no-u-prefixed-strings>=0.2', 'pep8-naming>=0.12.1, <0.13.0; python_version < "3.7"', 'pep8-naming>=0.13.3; python_version >= "3.7"', ], - 'hacking': [ - 'hacking', - # importlib-metadata module already installed with hacking 4.1.0 - # but importlib-metadata 5 fails, so adjust it - 'importlib-metadata<5.0.0; python_version < "3.8"', - ], + 'hacking': ['hacking'], } diff --git a/tests/site_detect_tests.py b/tests/site_detect_tests.py index 8ec8b25..3b56837 100755 --- a/tests/site_detect_tests.py +++ b/tests/site_detect_tests.py @@ -129,137 +129,11 @@ with self.subTest(url=urlparse(url).netloc): self.assertNoSite(url) -<<<<<<< HEAD (ad2a8a Update git submodules) - def test_gentoo(self): - """Test detection of MediaWiki sites for wiki.gentoo.org.""" - self.assertSite('https://wiki.gentoo.org/wiki/$1') - - def test_arabeyes(self): - """Test detection of MediaWiki sites for www.arabeyes.org.""" - self.assertSite('https://www.arabeyes.org/$1') - - def test_tfwiki(self): - """Test detection of MediaWiki sites for tfwiki.net.""" - self.assertNoSite('http://tfwiki.net/wiki/$1') # 1.19.5-1+deb7u1 - - -class Pre119SiteTestCase(SiteDetectionTestCase): - - """Test pre 1.19 sites which should be detected as unsupported.""" - - def test_hrwiki(self): - """Test detection of MediaWiki sites for www.hrwiki.org.""" - self.assertNoSite('http://www.hrwiki.org/index.php/$1') # v 1.15.4 - - def test_wikifon(self): - """Test detection of MediaWiki sites for www.wikifon.org.""" - self.assertNoSite('http://www.wikifon.org/$1') # v1.11.0 - - -class PreAPISiteTestCase(SiteDetectionTestCase): - - """Test detection of MediaWiki sites prior to the API.""" - - def test_thelemapedia(self): - """Test detection of MediaWiki sites for www.thelemapedia.org.""" - self.assertNoSite('http://www.thelemapedia.org/index.php/$1') - - def test_werelate(self): - """Test detection of MediaWiki sites for www.werelate.org.""" - self.assertNoSite('http://www.werelate.org/wiki/$1') - - def test_otterstedt(self): - """Test detection of MediaWiki sites for www.otterstedt.de.""" - self.assertNoSite('http://www.otterstedt.de/wiki/index.php/$1') - - -class APIHiddenTestCase(SiteDetectionTestCase): - - """Test MediaWiki sites with a hidden enabled API.""" - - def test_wikisophia(self): - """Test wikisophia.org which has redirect problems. - - /index.php?title=$1 reports 404, however a wiki exists there, - but the API is also hidden. - """ - self.assertNoSite('http://wikisophia.org/index.php?title=$1') - - -class FailingSiteTestCase(SiteDetectionTestCase): - - """Test detection failure for MediaWiki sites with an API.""" - - def test_animutationportal(self): - """Test detection of MediaWiki sites for wiki.animutationportal.com. - - SSL certificate verification fails. - """ - self.assertNoSite('http://wiki.animutationportal.com/index.php/$1') - - -class NoSiteTestCase(SiteDetectionTestCase): - - """Test detection of non-wiki sites.""" - - def test_imdb(self): - """Test detection of MediaWiki sites for www.imdb.com.""" - self.assertNoSite('http://www.imdb.com/name/nm$1/') - - def test_ecyrd(self): - """Test detection of MediaWiki sites for www.ecyrd.com.""" - self.assertNoSite('http://www.ecyrd.com/JSPWiki/Wiki.jsp?page=$1') - - def test_tvtropes(self): - """Test detection of MediaWiki sites for www.tvtropes.org.""" - self.assertNoSite('http://www.tvtropes.org/pmwiki/pmwiki.php/Main/$1') - - def test_c2(self): - """Test detection of MediaWiki sites for c2.com.""" - self.assertNoSite('http://c2.com/cgi/wiki?$1') - - def test_phabricator(self): - """Test detection of MediaWiki sites for phabricator.wikimedia.org.""" - self.assertNoSite('https://phabricator.wikimedia.org/$1') - - def test_merriam_webster(self): - """Test detection of MediaWiki sites for www.merriam-webster.com.""" - self.assertNoSite( - 'http://www.merriam-webster.com/' - 'cgi-bin/dictionary?book=Dictionary&va=$1') - - def test_arxiv(self): - """Test detection of MediaWiki sites for arxiv.org.""" - self.assertNoSite('http://arxiv.org/abs/$1') - - -class OfflineSiteTestCase(SiteDetectionTestCase): - - """Test offline sites.""" - - def test_opensprints_wiki(self): - """Test detection of MediaWiki sites for wiki.opensprints.org.""" - self.assertNoSite('http://wiki.opensprints.org/index.php?title=$1') - - -class OtherSiteTestCase(SiteDetectionTestCase): - - """Test other non-MediaWiki sites.""" - - def test_musicbrainz(self): - """Test http://musicbrainz.org/doc/ which has a page 'api.php'. - - Possible false positive caused by the existence of a page called - http://musicbrainz.org/doc/api.php. - """ - self.assertNoSite('http://musicbrainz.org/doc/$1') -======= def test_failing_sites(self): """Test detection of failing MediaWiki sites.""" for url, reason in self.failing_sites: with self.subTest(url=urlparse(url).netloc, reason=reason): self.assertNoSite(url) ->>>>>>> BRANCH (2645ee [8.0] Publish Pywikibot 8) class PrivateWikiTestCase(PatchingTestCase): diff --git a/tox.ini b/tox.ini index 5ec5400..a5f454b 100644 --- a/tox.ini +++ b/tox.ini @@ -77,10 +77,6 @@ deps = pytest >= 7.0.1 .[eventstreams] -<<<<<<< HEAD (ad2a8a Update git submodules) - .[mwparserfromhell] -======= ->>>>>>> BRANCH (2645ee [8.0] Publish Pywikibot 8) .[mysql] [testenv:venv] @@ -135,11 +131,7 @@ # DARXXX: Darglint docstring issues to be solved -<<<<<<< HEAD (ad2a8a Update git submodules) -ignore = B007,C103,D105,D211,D401,D413,D412,DAR003,DAR101,DAR102,DAR201,DAR202,DAR301,DAR401,DAR402,DAR501,F401,H101,H238,H301,H306,H404,H405,H903,P101,P102,P103,P205,W503 -======= ignore = B007,D105,D211,D401,D413,D412,DAR003,DAR101,DAR102,DAR201,DAR202,DAR301,DAR401,DAR402,DAR501,H101,H238,H301,H306,H404,H405,H903,P101,P102,P103,P205,W503 ->>>>>>> BRANCH (2645ee [8.0] Publish Pywikibot 8) enable-extensions = H203,H204,H205,N818 color = always -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/882000 To unsubscribe, or for help writing mail filters, visit https://gerrit.wikimedia.org/r/settings Gerrit-Project: pywikibot/core Gerrit-Branch: stable Gerrit-Change-Id: I5597702e0e005537b18ebb9bf39111b9ecd24095 Gerrit-Change-Number: 882000 Gerrit-PatchSet: 2 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

1 0

[Gerrit] ...core[master]: [8.0] Publish Pywikibot 8
by jenkins-bot (Code Review) 21 Jan '23

21 Jan '23

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/881999 ) Change subject: [8.0] Publish Pywikibot 8 ...................................................................... [8.0] Publish Pywikibot 8 - Update version - update ROADMAP.rst - update languages_by_size - update WbTime.fromTimestamp documentation Bug: T308258 Change-Id: Ie809c74ba8954a432b60ff1b561d9e220a0e6ee6 --- M pywikibot/__init__.py M ROADMAP.rst M pywikibot/__metadata__.py M pywikibot/families/wikiquote_family.py M pywikibot/families/wiktionary_family.py M pywikibot/families/wikipedia_family.py 6 files changed, 57 insertions(+), 37 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/ROADMAP.rst b/ROADMAP.rst index 77eb8a1..a1ed684 100644 --- a/ROADMAP.rst +++ b/ROADMAP.rst @@ -4,6 +4,7 @@ Improvements ^^^^^^^^^^^^ +* Allow copying timezone from timestamp in :class:`pywikibot.WbTime` (:phab:`T325864`) * Support federated Wikibase (:phab:`T173195`) * Improve warning if a Non-JSON response was received from server (:phab:`T326046`) * Allow normalization of :class:`pywikibot.WbTime` objects (:phab:`T123888`) diff --git a/pywikibot/__init__.py b/pywikibot/__init__.py index 25c39d2..c9a2149 100644 --- a/pywikibot/__init__.py +++ b/pywikibot/__init__.py @@ -570,38 +570,42 @@ precision, before, after, timezone, calendarmodel, site) @classmethod - def fromTimestamp(cls: Type['WbTime'], timestamp: 'Timestamp', + def fromTimestamp(cls: Type['WbTime'], + timestamp: 'Timestamp', precision: Union[int, str] = 14, - before: int = 0, after: int = 0, - timezone: int = 0, calendarmodel: Optional[str] = None, + before: int = 0, + after: int = 0, + timezone: int = 0, + calendarmodel: Optional[str] = None, site: Optional[DataSite] = None, copy_timezone: bool = False) -> 'WbTime': - """ - Create a new WbTime object from a pywikibot.Timestamp. + """Create a new WbTime object from a pywikibot.Timestamp. + + .. versionchanged:: 8.0 + Added *copy_timezone* parameter. :param timestamp: Timestamp - :param precision: The unit of the precision of the time. Defaults to - 14 (second). - :param before: Number of units after the given time it could be, if - uncertain. The unit is given by the precision. - :param after: Number of units before the given time it could be, if - uncertain. The unit is given by the precision. + :param precision: The unit of the precision of the time. + Defaults to 14 (second). + :param before: Number of units after the given time it could be, + if uncertain. The unit is given by the precision. + :param after: Number of units before the given time it could be, + if uncertain. The unit is given by the precision. :param timezone: Timezone information in minutes. :param calendarmodel: URI identifying the calendar model. - :param site: The Wikibase site. If not provided, retrieves the data - repository from the default site from user-config.py. + :param site: The Wikibase site. If not provided, retrieves the + data repository from the default site from user-config.py. Only used if calendarmodel is not given. - :param copy_timezone: Whether to copy the timezone from the Timestamp - if it has timezone information. Defaults to False to maintain - backwards compatibility. If a timezone is given, timezone - information is discarded. + :param copy_timezone: Whether to copy the timezone from the + timestamp if it has timezone information. Defaults to False + to maintain backwards compatibility. If a timezone is given, + timezone information is discarded. """ if not timezone and timestamp.tzinfo and copy_timezone: timezone = int(timestamp.utcoffset().total_seconds() / 60) return cls.fromTimestr(timestamp.isoformat(), precision=precision, - before=before, after=after, - timezone=timezone, calendarmodel=calendarmodel, - site=site) + before=before, after=after, timezone=timezone, + calendarmodel=calendarmodel, site=site) def normalize(self) -> 'WbTime': """Normalizes the WbTime object to account for precision. diff --git a/pywikibot/__metadata__.py b/pywikibot/__metadata__.py index 152253c..a9e6e99 100644 --- a/pywikibot/__metadata__.py +++ b/pywikibot/__metadata__.py @@ -11,7 +11,7 @@ __name__ = 'pywikibot' -__version__ = '8.0.0.dev0' +__version__ = '8.0.0' __description__ = 'Python MediaWiki Bot Framework' __maintainer__ = 'The Pywikibot team' __maintainer_email__ = 'pywikibot(a)lists.wikimedia.org' diff --git a/pywikibot/families/wikipedia_family.py b/pywikibot/families/wikipedia_family.py index dbb42ae..0a0603e 100644 --- a/pywikibot/families/wikipedia_family.py +++ b/pywikibot/families/wikipedia_family.py @@ -30,32 +30,32 @@ 'ja', 'zh', 'vi', 'war', 'uk', 'ar', 'pt', 'fa', 'ca', 'sr', 'id', 'ko', 'no', 'fi', 'tr', 'hu', 'cs', 'ce', 'tt', 'sh', 'ro', 'zh-min-nan', 'eu', 'ms', 'eo', 'he', 'hy', 'da', 'bg', 'cy', 'sk', - 'azb', 'et', 'kk', 'be', 'min', 'simple', 'uz', 'el', 'hr', 'lt', 'gl', + 'azb', 'et', 'kk', 'be', 'simple', 'min', 'uz', 'el', 'hr', 'lt', 'gl', 'az', 'ur', 'sl', 'ka', 'nn', 'hi', 'th', 'ta', 'la', 'bn', 'mk', 'ast', 'zh-yue', 'lv', 'tg', 'af', 'my', 'mg', 'bs', 'mr', 'oc', 'sq', 'nds', 'ml', 'ky', 'be-tarask', 'te', 'br', 'sw', 'new', 'jv', 'lld', 'vec', 'ht', 'pnb', 'pms', 'ba', 'lb', 'su', 'ku', 'ga', 'lmo', 'szl', 'is', 'cv', 'fy', 'ckb', 'tl', 'an', 'wuu', 'diq', 'sco', 'pa', 'io', - 'vo', 'yo', 'ne', 'gu', 'als', 'kn', 'ia', 'bar', 'scn', 'avk', 'bpy', + 'vo', 'yo', 'ne', 'gu', 'als', 'kn', 'ia', 'bar', 'avk', 'scn', 'bpy', 'qu', 'crh', 'mn', 'nv', 'ha', 'xmf', 'si', 'ban', 'bat-smg', 'ps', 'frr', 'os', 'or', 'sah', 'gd', 'bug', 'cdo', 'yi', 'ilo', 'sd', 'am', - 'nap', 'li', 'fo', 'hsb', 'gor', 'map-bms', 'mai', 'mzn', 'ig', 'bcl', + 'nap', 'li', 'gor', 'fo', 'hsb', 'map-bms', 'mai', 'mzn', 'ig', 'bcl', 'eml', 'ace', 'shn', 'zh-classical', 'sa', 'wa', 'ie', 'lij', 'as', 'zu', 'mhr', 'mrj', 'hyw', 'hif', 'bjn', 'mni', 'sn', 'hak', 'km', 'roa-tara', 'so', 'pam', 'rue', 'nso', 'bh', 'tum', 'se', 'sat', 'mi', - 'myv', 'vls', 'nds-nl', 'nah', 'sc', 'vep', 'kw', 'kab', 'tk', 'gan', + 'myv', 'vls', 'nds-nl', 'nah', 'sc', 'kw', 'vep', 'kab', 'tk', 'gan', 'co', 'glk', 'dag', 'fiu-vro', 'ary', 'bo', 'ab', 'gv', 'frp', 'zea', 'skr', 'ug', 'kv', 'pcd', 'udm', 'csb', 'mt', 'gn', 'ay', 'smn', 'nrm', 'lez', 'lfn', 'stq', 'olo', 'lo', 'rw', 'mwl', 'ang', 'fur', 'rm', 'lad', 'gom', 'koi', 'ext', 'tyv', 'dsb', 'av', 'dty', 'ln', 'cbk-zam', 'pap', 'kaa', 'dv', 'ksh', 'gag', 'bxr', 'pfl', 'ks', 'pag', 'pi', - 'szy', 'haw', 'mdf', 'tw', 'awa', 'tay', 'za', 'blk', 'inh', 'krc', + 'tw', 'mdf', 'szy', 'haw', 'awa', 'tay', 'za', 'blk', 'inh', 'krc', 'xal', 'pdc', 'atj', 'to', 'arc', 'tcy', 'lg', 'mnw', 'kbp', 'jam', 'na', 'wo', 'kbd', 'nia', 'nov', 'ki', 'bi', 'nqo', 'tpi', 'tet', 'shi', 'jbo', 'roa-rup', 'fj', 'lbe', 'kg', 'xh', 'ty', 'cu', 'om', - 'guw', 'trv', 'srn', 'sm', 'gcr', 'alt', 'chr', 'ltg', 'tn', 'ny', - 'st', 'pih', 'mad', 'got', 'ami', 'rmy', 'bm', 've', 'ts', 'ff', 'chy', - 'ss', 'rn', 'kcg', 'ak', 'iu', 'ch', 'ee', 'pnt', 'ik', 'ady', 'pcm', + 'guw', 'trv', 'srn', 'sm', 'gcr', 'alt', 'chr', 'tn', 'ltg', 'ny', + 'st', 'mad', 'pih', 'got', 'ami', 'rmy', 'bm', 've', 'ts', 'ff', 'chy', + 'ss', 'rn', 'kcg', 'ak', 'iu', 'ee', 'ch', 'pnt', 'ik', 'ady', 'pcm', 'sg', 'pwn', 'din', 'ti', 'kl', 'dz', 'cr', ] diff --git a/pywikibot/families/wikiquote_family.py b/pywikibot/families/wikiquote_family.py index 249561a..8f93dcc 100644 --- a/pywikibot/families/wikiquote_family.py +++ b/pywikibot/families/wikiquote_family.py @@ -30,7 +30,7 @@ 'it', 'en', 'pl', 'ru', 'cs', 'et', 'pt', 'fa', 'uk', 'de', 'he', 'fr', 'es', 'eo', 'tr', 'sk', 'bs', 'az', 'ca', 'fi', 'sr', 'sl', 'zh', 'lt', 'ar', 'bg', 'hy', 'hr', 'su', 'el', 'nn', 'id', 'sv', 'li', 'hu', 'ko', - 'nl', 'sah', 'ja', 'la', 'ta', 'gl', 'gu', 'ur', 'hi', 'ig', 'be', + 'nl', 'sah', 'ja', 'la', 'ta', 'gl', 'gu', 'hi', 'ur', 'ig', 'be', 'te', 'guw', 'tl', 'vi', 'cy', 'no', 'sq', 'ml', 'bn', 'kn', 'ro', 'eu', 'ku', 'as', 'uz', 'ka', 'da', 'sa', 'is', 'bcl', 'br', 'mr', 'af', 'th', 'wo', 'ky', diff --git a/pywikibot/families/wiktionary_family.py b/pywikibot/families/wiktionary_family.py index b8ab714..45ba4d9 100644 --- a/pywikibot/families/wiktionary_family.py +++ b/pywikibot/families/wiktionary_family.py @@ -37,16 +37,16 @@ 'pt', 'kn', 'vi', 'sr', 'th', 'hi', 'ro', 'no', 'id', 'et', 'cs', 'ml', 'my', 'skr', 'uz', 'li', 'or', 'eo', 'te', 'fa', 'gl', 'ar', 'oc', 'jv', 'az', 'eu', 'uk', 'ast', 'br', 'is', 'sg', 'bn', 'da', 'lo', - 'simple', 'mnw', 'la', 'hr', 'fj', 'shn', 'sk', 'tg', 'ky', 'bg', 'wa', - 'ur', 'ps', 'cy', 'vo', 'he', 'om', 'lmo', 'sl', 'af', 'zh-min-nan', + 'simple', 'mnw', 'la', 'hr', 'shn', 'fj', 'sk', 'tg', 'ky', 'bg', 'wa', + 'ur', 'ps', 'cy', 'vo', 'he', 'lmo', 'om', 'sl', 'af', 'zh-min-nan', 'scn', 'tl', 'pa', 'ms', 'fy', 'sw', 'nn', 'ka', 'lv', 'min', 'sq', 'nds', 'lb', 'co', 'mn', 'pnb', 'bs', 'nah', 'yue', 'sa', 'kk', 'km', 'vec', 'be', 'diq', 'tk', 'mk', 'nia', 'sm', 'hsb', 'ks', 'shy', 'su', - 'gd', 'ga', 'bcl', 'an', 'gom', 'mr', 'wo', 'mni', 'ia', 'ang', 'bjn', - 'mt', 'fo', 'sd', 'tt', 'gn', 'so', 'ie', 'mi', 'csb', 'ug', 'si', - 'ha', 'st', 'roa-rup', 'hif', 'guw', 'tpi', 'jbo', 'kl', 'zu', 'ay', - 'yi', 'ln', 'gu', 'na', 'gv', 'kw', 'am', 'ne', 'rw', 'ts', 'ig', 'qu', - 'ss', 'iu', 'chr', 'gor', 'dv', 'ti', 'tn', + 'gd', 'ga', 'bcl', 'an', 'gom', 'mr', 'gor', 'wo', 'mni', 'ia', 'ang', + 'bjn', 'mt', 'fo', 'sd', 'tt', 'gn', 'so', 'ie', 'mi', 'csb', 'ug', + 'si', 'ha', 'st', 'roa-rup', 'hif', 'guw', 'tpi', 'jbo', 'kl', 'zu', + 'ay', 'yi', 'ln', 'gu', 'na', 'gv', 'kw', 'am', 'ne', 'rw', 'ts', 'ig', + 'qu', 'ss', 'iu', 'chr', 'dv', 'ti', 'tn', ] category_redirect_templates = { -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/881999 To unsubscribe, or for help writing mail filters, visit https://gerrit.wikimedia.org/r/settings Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Change-Id: Ie809c74ba8954a432b60ff1b561d9e220a0e6ee6 Gerrit-Change-Number: 881999 Gerrit-PatchSet: 3 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

1 0

[Gerrit] ...core[master]: Access match object by name
by jenkins-bot (Code Review) 20 Jan '23

20 Jan '23

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/881415 ) Change subject: Access match object by name ...................................................................... Access match object by name Bug: T308261 Change-Id: I604964e4fa0d3885cd511308658cdc255f2a3582 --- M pywikibot/time.py 1 file changed, 11 insertions(+), 1 deletion(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/time.py b/pywikibot/time.py index 656b5f4..da10ecb 100644 --- a/pywikibot/time.py +++ b/pywikibot/time.py @@ -143,7 +143,7 @@ raise ValueError( f'time data {timestr!r} does not match ISO8601 format.') - strpfmt = '%Y-%m-%d{sep}%H:%M:%S'.format(sep=m.group('sep')) + strpfmt = f'%Y-%m-%d{m["sep"]}%H:%M:%S' strpstr = timestr[:19] if m['u']: -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/881415 To unsubscribe, or for help writing mail filters, visit https://gerrit.wikimedia.org/r/settings Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Change-Id: I604964e4fa0d3885cd511308658cdc255f2a3582 Gerrit-Change-Number: 881415 Gerrit-PatchSet: 2 Gerrit-Owner: Ayush Anand33 <ayushanand_mc21a11_34(a)dtu.ac.in> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

1 0

[Gerrit] ...i18n[master]: Localisation updates from https://translatewiki.net.
by jenkins-bot (Code Review) 19 Jan '23

19 Jan '23

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/i18n/+/881583 ) Change subject: Localisation updates from https://translatewiki.net. ...................................................................... Localisation updates from https://translatewiki.net. Change-Id: Ib63fb1ef0b253a79f0305e35460661a4886b3af1 --- M category/de.json 1 file changed, 10 insertions(+), 1 deletion(-) Approvals: L10n-bot: Looks good to me, approved jenkins-bot: Verified diff --git a/category/de.json b/category/de.json index 86906d3..5763868 100644 --- a/category/de.json +++ b/category/de.json @@ -12,7 +12,7 @@ }, "category-adding": "Bot: Ergänze Kategorie [[:Category:%(newcat)s|%(newcat)s]]", "category-also-in": "(auch in %(alsocat)s)", - "category-clean": "Bot: Entfernen der Kategorie %(category)s, die bereits in %(child)s enthalten ist", + "category-clean": "Bot: Entferne Kategorie %(category)s, weil sie bereits unter %(child)s ist", "category-listifying": "Bot: Liste aus %(fromcat)s ({{PLURAL:num|1 Eintrag|%(num)d Einträge}})", "category-removing": "Bot: Entferne aus %(oldcat)s", "category-renamed": "Bot: Verschoben von %(oldcat)s. Autoren: %(authors)s", -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/i18n/+/881583 To unsubscribe, or for help writing mail filters, visit https://gerrit.wikimedia.org/r/settings Gerrit-Project: pywikibot/i18n Gerrit-Branch: master Gerrit-Change-Id: Ib63fb1ef0b253a79f0305e35460661a4886b3af1 Gerrit-Change-Number: 881583 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 Gerrit-MessageType: merged

1 0

[Gerrit] ...core[master]: [bugfix] Fix setup.read_desc() regex
by jenkins-bot (Code Review) 18 Jan '23

18 Jan '23

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/880881 ) Change subject: [bugfix] Fix setup.read_desc() regex ...................................................................... [bugfix] Fix setup.read_desc() regex If a space was behind a sphinx link and the link was different from the label, the link was removed but the alignment does not match the previous line. Modify the regex pattern to remove a following space in such case. Also test the long_description created by setup.py in make_dist.py script Bug: T327056 Change-Id: Ie71c4f9feb38e4ba822330b6978d19f506304c95 --- M setup.py M make_dist.py 2 files changed, 25 insertions(+), 3 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/make_dist.py b/make_dist.py index 4c75e43..d58c8f5 100755 --- a/make_dist.py +++ b/make_dist.py @@ -45,7 +45,7 @@ import shutil import sys from pathlib import Path -from subprocess import check_call +from subprocess import check_call, run import setup from pywikibot import __version__, error, info, input_yn, warning @@ -109,6 +109,10 @@ finally: self.cleanup() + # check description + if run('twine check dist/*', shell=True).returncode: + return + if self.local: check_call('pip uninstall pywikibot -y', shell=True) check_call( diff --git a/setup.py b/setup.py index 961cec2..081dbab 100755 --- a/setup.py +++ b/setup.py @@ -184,7 +184,7 @@ Combine included restructured text files which must be done before uploading because the source isn't available after creating the package. """ - pattern = r'\:\w+\:`([^`]+?)(?:<.+>)?`', r'\1' + pattern = r'(?:\:\w+\:`([^`]+?)(?:<.+>)?` *)', r'\1' desc = [] with open(filename) as f: for line in f: @@ -219,7 +219,7 @@ version=version, description=metadata.__description__, long_description=read_desc('README.rst'), - # long_description_content_type + long_description_content_type='text/x-rst', # author # author_email maintainer=metadata.__maintainer__, -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/880881 To unsubscribe, or for help writing mail filters, visit https://gerrit.wikimedia.org/r/settings Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Change-Id: Ie71c4f9feb38e4ba822330b6978d19f506304c95 Gerrit-Change-Number: 880881 Gerrit-PatchSet: 1 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot Gerrit-CC: KBach <kbach(a)wikimedia.org> Gerrit-MessageType: merged

1 0

[Gerrit] ...core[master]: [Feature] Allow copying timezone from Timestamp
by jenkins-bot (Code Review) 18 Jan '23

18 Jan '23

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/878200 ) Change subject: [Feature] Allow copying timezone from Timestamp ...................................................................... [Feature] Allow copying timezone from Timestamp Bug: T325864 Change-Id: Ib6aa3c8d96baa21f21bd21030ced0719c2eaa5e2 --- M pywikibot/__init__.py M tests/wikibase_tests.py 2 files changed, 25 insertions(+), 1 deletion(-) Approvals: Matěj Suchánek: Looks good to me, but someone else must approve Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/__init__.py b/pywikibot/__init__.py index 8aea5a8..22c7b38 100644 --- a/pywikibot/__init__.py +++ b/pywikibot/__init__.py @@ -574,7 +574,8 @@ precision: Union[int, str] = 14, before: int = 0, after: int = 0, timezone: int = 0, calendarmodel: Optional[str] = None, - site: Optional[DataSite] = None) -> 'WbTime': + site: Optional[DataSite] = None, + copy_timezone: bool = False) -> 'WbTime': """ Create a new WbTime object from a pywikibot.Timestamp. @@ -590,7 +591,13 @@ :param site: The Wikibase site. If not provided, retrieves the data repository from the default site from user-config.py. Only used if calendarmodel is not given. + :param copy_timezone: Whether to copy the timezone from the Timestamp + if it has timezone information. Defaults to False to maintain + backwards compatibility. If a timezone is given, timezone + information is discarded. """ + if not timezone and timestamp.tzinfo and copy_timezone: + timezone = int(timestamp.utcoffset().total_seconds() / 60) return cls.fromTimestr(timestamp.isoformat(), precision=precision, before=before, after=after, timezone=timezone, calendarmodel=calendarmodel, diff --git a/tests/wikibase_tests.py b/tests/wikibase_tests.py index 3bb61e5..6173dd3 100755 --- a/tests/wikibase_tests.py +++ b/tests/wikibase_tests.py @@ -490,6 +490,13 @@ self.assertEqual(t.toTimestamp(), timestamp) self.assertEqual( t, pywikibot.WbTime.fromTimestamp(timestamp, site=repo)) + timezone = datetime.timezone(datetime.timedelta(hours=-5)) + ts = pywikibot.Timestamp(2020, 1, 1, 12, 43, 0, tzinfo=timezone) + t = pywikibot.WbTime.fromTimestamp(ts, site=repo, copy_timezone=True) + self.assertEqual(t.timezone, -5 * 60) + t = pywikibot.WbTime.fromTimestamp(ts, site=repo, copy_timezone=True, + timezone=60) + self.assertEqual(t.timezone, 60) def test_WbTime_errors(self): """Test WbTime precision errors.""" -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/878200 To unsubscribe, or for help writing mail filters, visit https://gerrit.wikimedia.org/r/settings Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Change-Id: Ib6aa3c8d96baa21f21bd21030ced0719c2eaa5e2 Gerrit-Change-Number: 878200 Gerrit-PatchSet: 2 Gerrit-Owner: RPI2026F1 <sarkaraoyan+rpi2026f1(a)gmail.com> Gerrit-Reviewer: Matěj Suchánek <matejsuchanek97(a)gmail.com> Gerrit-Reviewer: Mpaa <mpaa.wiki(a)gmail.com> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

1 0

[Gerrit] ...core[master]: [flake8] Ignore flake8-bugbear 23.1.14
by Xqt (Code Review) 18 Jan '23

18 Jan '23

Xqt has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/881261 ) Change subject: [flake8] Ignore flake8-bugbear 23.1.14 ...................................................................... [flake8] Ignore flake8-bugbear 23.1.14 The bugbear B028 introduced with 23.1.14 was removed in 23.1.17. The https://github.com/PyCQA/flake8-bugbear/issues/329 issue was solved upstream Change-Id: I308b766fe62ca9007c802b0728a07b1acbd6c01e --- M setup.py M tox.ini 2 files changed, 15 insertions(+), 3 deletions(-) Approvals: jenkins-bot: Verified Xqt: Looks good to me, approved diff --git a/setup.py b/setup.py index 961cec2..66fac58 100755 --- a/setup.py +++ b/setup.py @@ -57,7 +57,7 @@ 'flake8>=5.0.4', 'darglint', 'pydocstyle>=6.2.3', - 'flake8-bugbear', + 'flake8-bugbear!=23.1.14', 'flake8-coding', 'flake8-comprehensions', 'flake8-docstrings>=1.4.0', diff --git a/tox.ini b/tox.ini index a55b81b..a5f454b 100644 --- a/tox.ini +++ b/tox.ini @@ -109,7 +109,6 @@ [flake8] # The following are intentionally ignored, possibly pending consensus -# B028: False positive, see https://github.com/PyCQA/flake8-bugbear/issues/329 # D105: Missing docstring in magic method # D211: No blank lines allowed before class docstring # FI1: __future__ import "x" missing @@ -132,7 +131,7 @@ # DARXXX: Darglint docstring issues to be solved -ignore = B007,B028,D105,D211,D401,D413,D412,DAR003,DAR101,DAR102,DAR201,DAR202,DAR301,DAR401,DAR402,DAR501,H101,H238,H301,H306,H404,H405,H903,P101,P102,P103,P205,W503 +ignore = B007,D105,D211,D401,D413,D412,DAR003,DAR101,DAR102,DAR201,DAR202,DAR301,DAR401,DAR402,DAR501,H101,H238,H301,H306,H404,H405,H903,P101,P102,P103,P205,W503 enable-extensions = H203,H204,H205,N818 color = always -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/881261 To unsubscribe, or for help writing mail filters, visit https://gerrit.wikimedia.org/r/settings Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Change-Id: I308b766fe62ca9007c802b0728a07b1acbd6c01e Gerrit-Change-Number: 881261 Gerrit-PatchSet: 2 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

1 0

[Gerrit] ...i18n[master]: Localisation updates from https://translatewiki.net.
by jenkins-bot (Code Review) 16 Jan '23

16 Jan '23

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/i18n/+/880446 ) Change subject: Localisation updates from https://translatewiki.net. ...................................................................... Localisation updates from https://translatewiki.net. Change-Id: I354e3435dc33f5f62c422395994fa69446c8c674 --- M solve_disambiguation/sl.json M category/nl.json M category/ia.json 3 files changed, 17 insertions(+), 7 deletions(-) Approvals: L10n-bot: Looks good to me, approved jenkins-bot: Verified diff --git a/category/ia.json b/category/ia.json index 29105db..ee7b362 100644 --- a/category/ia.json +++ b/category/ia.json @@ -6,7 +6,7 @@ }, "category-adding": "Robot: Addition del categoria [[:Category:%(newcat)s|%(newcat)s]]", "category-also-in": "(equalmente in %(alsocat)s)", - "category-clean": "Robot: Remove le categoria %(category)s que es ja in %(child)s", + "category-clean": "Robot: Remove le categoria %(category)s perque illo es ja sub %(child)s", "category-listifying": "Robot: Face lista de articulos in %(fromcat)s ({{PLURAL:%(num)d|1 entrata|%(num)d entratas}})", "category-removing": "Robot: Removite de %(oldcat)s", "category-renamed": "Robot: Transferite de %(oldcat)s. Autores: %(authors)s", diff --git a/category/nl.json b/category/nl.json index 06b86fa..17736c8 100644 --- a/category/nl.json +++ b/category/nl.json @@ -9,6 +9,7 @@ }, "category-adding": "Robot: categorie [[:Category:%(newcat)s|%(newcat)s]] toegevoegd", "category-also-in": "(ook in %(alsocat)s)", + "category-clean": "Robot: Verwijdering van categorie %(category)s omdat deze al onder %(child)s staat", "category-listifying": "Robot: lijst van %(fromcat)s (%(num)d pagina's)", "category-removing": "Robot: verwijderd uit %(oldcat)s", "category-renamed": "Robot: hernoemd van %(oldcat)s. Auteurs: %(authors)s", diff --git a/solve_disambiguation/sl.json b/solve_disambiguation/sl.json index 3fd5bc1..797c229 100644 --- a/solve_disambiguation/sl.json +++ b/solve_disambiguation/sl.json @@ -5,11 +5,11 @@ "Eleassar" ] }, - "solve_disambiguation-adding-dn-template": "Razločitev s pomočjo robota: %(from)s – Označeno kot potrebno pozornosti strokovnjaka", - "solve_disambiguation-links-removed": "Razločitev s pomočjo robota: %(from)s – odstranitev povezav", - "solve_disambiguation-links-resolved": "Razločitev s pomočjo robota: %(from)s – Sprememba povezav v %(to)s", - "solve_disambiguation-redirect-adding-dn-template": "Razločitev s pomočjo robota: %(from)s – Označeno kot potrebno pozornosti strokovnjaka", - "solve_disambiguation-redirect-removed": "Razločitev s pomočjo robota: %(from)s – odstranitev povezav", - "solve_disambiguation-redirect-resolved": "Razločitev s pomočjo robota: %(from)s – Sprememba povezav v %(to)s", + "solve_disambiguation-adding-dn-template": "Razločitev s pomočjo bota: %(from)s – označeno kot potrebno pozornosti strokovnjaka", + "solve_disambiguation-links-removed": "Razločitev s pomočjo bota: %(from)s – odstranitev povezav(e).", + "solve_disambiguation-links-resolved": "Razločitev s pomočjo bota: %(from)s – sprememba povezav(e) v %(to)s", + "solve_disambiguation-redirect-adding-dn-template": "Razločitev s pomočjo bota: %(from)s – označeno kot potrebno pozornosti strokovnjaka", + "solve_disambiguation-redirect-removed": "Razločitev s pomočjo bota: %(from)s – odstranitev povezav(e)", + "solve_disambiguation-redirect-resolved": "Razločitev s pomočjo bota: %(from)s – sprememba povezav(e) v %(to)s", "solve_disambiguation-unknown-page": "(neznano)" } -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/i18n/+/880446 To unsubscribe, or for help writing mail filters, visit https://gerrit.wikimedia.org/r/settings Gerrit-Project: pywikibot/i18n Gerrit-Branch: master Gerrit-Change-Id: I354e3435dc33f5f62c422395994fa69446c8c674 Gerrit-Change-Number: 880446 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 Gerrit-MessageType: merged

1 0

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

Pywikibot-commits