Pywikibot-commits January 2024

pywikibot-commits@lists.wikimedia.org

1 participants
53 discussions

[Gerrit] ...core[master]: [IMPR] Refactor xmlreader
by jenkins-bot (Code Review) 05 Jan '24

05 Jan '24

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/986614 ) Change subject: [IMPR] Refactor xmlreader ...................................................................... [IMPR] Refactor xmlreader 1) remove state from XmlDump class 2) keep common logic in one place 3) move parse_restrictions() inside XmlDump class 4) since Elements are analized in 'page' blocks, keep event logic and memory cleanup in one place. 5) simplify XmlEntry() code 6) add type hints Change-Id: I8f67f0cdb360fc548f6dc36e63621d270afdd7c5 --- M pywikibot/xmlreader.py 1 file changed, 199 insertions(+), 129 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/xmlreader.py b/pywikibot/xmlreader.py index ea675a6..fa5f53b 100644 --- a/pywikibot/xmlreader.py +++ b/pywikibot/xmlreader.py @@ -18,6 +18,9 @@ from __future__ import annotations import re +from dataclasses import dataclass +from typing import NamedTuple +from xml.etree.ElementTree import Element try: @@ -25,54 +28,53 @@ except ImportError: from xml.etree.ElementTree import iterparse, ParseError -from pywikibot.backports import Callable -from pywikibot.tools import issue_deprecation_warning, open_archive +from pywikibot.backports import Callable, Iterator +from pywikibot.tools import ( + ModuleDeprecationWrapper, + issue_deprecation_warning, + open_archive, +) -def parseRestrictions(restrictions): - """ - Parse the characters within a restrictions tag. - - Returns strings representing user groups allowed to edit and - to move a page, where None means there are no restrictions. - """ - if not restrictions: - return None, None - editRestriction = None - moveRestriction = None - editLockMatch = re.search('edit=([^:]*)', restrictions) - if editLockMatch: - editRestriction = editLockMatch[1] - moveLockMatch = re.search('move=([^:]*)', restrictions) - if moveLockMatch: - moveRestriction = moveLockMatch[1] - if restrictions == 'sysop': - editRestriction = 'sysop' - moveRestriction = 'sysop' - return editRestriction, moveRestriction - - +@dataclass class XmlEntry: """Represent a page.""" - def __init__(self, title, ns, id, text, username, ipedit, timestamp, - editRestriction, moveRestriction, revisionid, comment, - redirect) -> None: - """Initializer.""" - # TODO: there are more tags we can read. - self.title = title - self.ns = ns - self.id = id - self.text = text - self.username = username.strip() - self.ipedit = ipedit - self.timestamp = timestamp - self.editRestriction = editRestriction - self.moveRestriction = moveRestriction - self.revisionid = revisionid - self.comment = comment - self.isredirect = redirect + # TODO: there are more tags we can read. + title: str + ns: str + id: str + text: str + username: str + ipedit: bool + timestamp: str + editRestriction: str # noqa: N815 + moveRestriction: str # noqa: N815 + revisionid: str + comment: str + isredirect: bool + + +class Headers(NamedTuple): + + """Represent the common info of a page.""" + + title: str + ns: str + pageid: str + isredirect: bool + edit_restriction: str + move_restriction: str + + +class RawRev(NamedTuple): + + """Represent a raw revision.""" + + headers: Headers + revision: Element + revid: int class XmlDump: @@ -119,12 +121,15 @@ Default: `first_found` """ - def __init__(self, filename, *, - allrevisions: bool | str = None, - # when allrevisions removed, revisions can default to 'latest' - revisions: str = 'first_found', - on_error: None | ( - Callable[[type[BaseException]], None]) = None) -> None: + def __init__( + self, + filename, + *, + allrevisions: bool | str = None, + # when allrevisions removed, revisions can default to 'latest' + revisions: str = 'first_found', + on_error: Callable[[ParseError], None] | None = None, + ) -> None: """Initializer.""" self.filename = filename self.on_error = on_error @@ -154,9 +159,10 @@ actions = str(list(self.rev_actions.keys())).strip('[]') raise ValueError(f"'revisions' must be one of {actions}.") - self._parse = self.rev_actions.get(revisions) + self._parse = self.rev_actions[revisions] + self.uri = None - def parse(self): + def parse(self) -> Iterator[XmlEntry]: """Generator using ElementTree iterparse function. .. versionchanged:: 7.2 @@ -165,7 +171,8 @@ """ with open_archive(self.filename) as source: context = iterparse(source, events=('start', 'end', 'start-ns')) - self.root = None + root = None + while True: try: event, elem = next(context) @@ -178,98 +185,144 @@ raise if event == 'start-ns' and elem[0] == '': - self.uri = elem[1] + self.uri = f'{{{elem[1]}}}' continue - if event == 'start' and self.root is None: - self.root = elem - continue - yield from self._parse(event, elem) - def _parse_only_first_found(self, event, elem): + # get the root element + if event == 'start' and root is None: + root = elem + + if not (event == 'end' and elem.tag == f'{self.uri}page'): + continue + + yield from self._parse(elem) + + # clear references in the root, to allow garbage collection. + elem.clear() + root.clear() + + def _parse_only_first_found(self, elem: Element) -> Iterator[XmlEntry]: """ Deprecated parser that yields the first revision found. Documentation had wrongly indicated it returned the latest revision. :phab: `T340804` """ - if event == 'end' and elem.tag == f'{{{self.uri}}}page': - self._headers(elem) - revision = elem.find(f'{{{self.uri}}}revision') - yield self._create_revision(revision) - elem.clear() - self.root.clear() + raw_revs = self._fetch_revs(elem) + try: + raw_rev = next(raw_revs) + yield self._create_revision(raw_rev.headers, raw_rev.revision) + except StopIteration: + return - def _parse_only_latest(self, event, elem): + def _parse_only_latest(self, elem: Element) -> Iterator[XmlEntry]: """Parser that yields only the latest revision.""" - if event == 'end' and elem.tag == f'{{{self.uri}}}page': - self._headers(elem) - latest_revision = None - latest_revisionid = 0 - for revision in elem.findall(f'{{{self.uri}}}revision'): - revisionid = int(revision.findtext(f'{{{self.uri}}}id')) - if latest_revision is None or revisionid > latest_revisionid: - latest_revision = revision - latest_revisionid = revisionid - if latest_revision is not None: - yield self._create_revision(latest_revision) - elem.clear() - self.root.clear() + raw_revs = self._fetch_revs(elem, with_id=True) + raw_rev = max(raw_revs, default=None, key=lambda rev: rev.revid) + if raw_rev is not None: + yield self._create_revision(raw_rev.headers, raw_rev.revision) - def _parse_only_earliest(self, event, elem): + def _parse_only_earliest(self, elem: Element) -> Iterator[XmlEntry]: """Parser that yields only the earliest revision.""" - if event == 'end' and elem.tag == f'{{{self.uri}}}page': - self._headers(elem) - earliest_revision = None - earliest_revisionid = float('inf') # Initialize positive infinity - for revision in elem.findall(f'{{{self.uri}}}revision'): - revisionid = int(revision.findtext(f'{{{self.uri}}}id')) - if revisionid < earliest_revisionid: - earliest_revisionid = revisionid - earliest_revision = revision - if earliest_revision is not None: - yield self._create_revision(earliest_revision) - elem.clear() - self.root.clear() + raw_revs = self._fetch_revs(elem, with_id=True) + raw_rev = min(raw_revs, default=None, key=lambda rev: rev.revid) + if raw_rev is not None: + yield self._create_revision(raw_rev.headers, raw_rev.revision) - def _parse_all(self, event, elem): + def _parse_all(self, elem: Element) -> Iterator[XmlEntry]: """Parser that yields all revisions.""" - if event == 'end' and elem.tag == f'{{{self.uri}}}page': - self._headers(elem) - for revision in elem.findall(f'{{{self.uri}}}revision'): - yield self._create_revision(revision) - elem.clear() - self.root.clear() + raw_revs = self._fetch_revs(elem) + for raw_rev in raw_revs: + yield self._create_revision(raw_rev.headers, raw_rev.revision) - def _headers(self, elem) -> None: + def _fetch_revs(self, elem: Element, with_id=False) -> Iterator[RawRev]: + """Yield all revisions in a page.""" + uri = self.uri + headers = self._headers(elem) + for revision in elem.findall(f'{uri}revision'): + if with_id: + revid = int(revision.findtext(f'{uri}id')) + else: + revid = 0 + yield RawRev(headers, revision, revid) + + @staticmethod + def parse_restrictions(restrictions: str) -> tuple[str | None, str | None]: + """ + Parse the characters within a restrictions tag. + + Returns strings representing user groups allowed to edit and + to move a page, where None means there are no restrictions. + """ + if not restrictions: + return None, None + + edit_restriction, move_restriction = None, None + + edit_lock_match = re.search('edit=([^:]*)', restrictions) + if edit_lock_match: + edit_restriction = edit_lock_match[1] + + move_lock_match = re.search('move=([^:]*)', restrictions) + if move_lock_match: + move_restriction = move_lock_match[1] + + if restrictions == 'sysop': + edit_restriction = 'sysop' + move_restriction = 'sysop' + + return edit_restriction, move_restriction + + def _headers(self, elem: Element) -> Headers: """Extract headers from XML chunk.""" - self.title = elem.findtext(f'{{{self.uri}}}title') - self.ns = elem.findtext(f'{{{self.uri}}}ns') - self.pageid = elem.findtext(f'{{{self.uri}}}id') - self.restrictions = elem.findtext(f'{{{self.uri}}}restrictions') - self.isredirect = elem.findtext(f'{{{self.uri}}}redirect') is not None - self.editRestriction, self.moveRestriction = parseRestrictions( - self.restrictions) + uri = self.uri + edit_restriction, move_restriction = self.parse_restrictions( + elem.findtext(f'{uri}restrictions') + ) - def _create_revision(self, revision): - """Create a single revision.""" - revisionid = revision.findtext(f'{{{self.uri}}}id') - timestamp = revision.findtext(f'{{{self.uri}}}timestamp') - comment = revision.findtext(f'{{{self.uri}}}comment') - contributor = revision.find(f'{{{self.uri}}}contributor') - ipeditor = contributor.findtext(f'{{{self.uri}}}ip') - username = ipeditor or contributor.findtext(f'{{{self.uri}}}username') - # could get comment, minor as well - text = revision.findtext(f'{{{self.uri}}}text') - return XmlEntry(title=self.title, - ns=self.ns, - id=self.pageid, - text=text or '', - username=username or '', # username might be deleted - ipedit=bool(ipeditor), - timestamp=timestamp, - editRestriction=self.editRestriction, - moveRestriction=self.moveRestriction, - revisionid=revisionid, - comment=comment, - redirect=self.isredirect - ) + headers = Headers( + title=elem.findtext(f'{uri}title'), + ns=elem.findtext(f'{uri}ns'), + pageid=elem.findtext(f'{uri}id'), + isredirect=elem.findtext(f'{uri}redirect') is not None, + edit_restriction=edit_restriction, + move_restriction=move_restriction, + ) + + return headers + + def _create_revision( + self, headers: Headers, revision: Element + ) -> XmlEntry: + """Create a Single revision.""" + uri = self.uri + contributor = revision.find(f'{uri}contributor') + ip_editor = contributor.findtext(f'{uri}ip') + username = ip_editor or contributor.findtext(f'{uri}username') + username = username or '' # username might be deleted + + xml_entry = XmlEntry( + title=headers.title, + ns=headers.ns, + id=headers.pageid, + editRestriction=headers.edit_restriction, + moveRestriction=headers.move_restriction, + isredirect=headers.isredirect, + text=revision.findtext(f'{uri}text'), + username=username, + ipedit=bool(ip_editor), + timestamp=revision.findtext(f'{uri}timestamp'), + revisionid=revision.findtext(f'{uri}id'), + comment=revision.findtext(f'{uri}comment'), + # could get comment, minor as well + ) + + return xml_entry + + +wrapper = ModuleDeprecationWrapper(__name__) +wrapper.add_deprecated_attr( + 'parseRestrictions', + XmlDump.parse_restrictions, + replacement_name='pywikibot.xmlreader.XmlDump.parseRestrictions', + since='9.0.0') -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/986614 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: I8f67f0cdb360fc548f6dc36e63621d270afdd7c5 Gerrit-Change-Number: 986614 Gerrit-PatchSet: 12 Gerrit-Owner: Mpaa <mpaa.wiki(a)gmail.com> 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) 04 Jan '24

04 Jan '24

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/i18n/+/987755 ) Change subject: Localisation updates from https://translatewiki.net. ...................................................................... Localisation updates from https://translatewiki.net. Change-Id: Id30e8ba4231e31bdba0f9a76853dae0e9e9c5f63 --- M protect/ar.json A replicate_wiki/ar.json M checkimages/ar.json 3 files changed, 28 insertions(+), 2 deletions(-) Approvals: L10n-bot: Looks good to me, approved Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/checkimages/ar.json b/checkimages/ar.json index c4f2ad2..2a0b455 100644 --- a/checkimages/ar.json +++ b/checkimages/ar.json @@ -2,6 +2,7 @@ "@metadata": { "authors": [ "Meno25", + "Sandra Hanbo", "xqt" ] }, @@ -9,6 +10,9 @@ "checkimages-doubles-file-comment": "بوت: الملف موجود في كومنز، يمكن حذفه", "checkimages-doubles-head": "ملف مكرر", "checkimages-doubles-talk-comment": "بوت: إخطار أن الملف موجود فعلا في كومنز", + "checkimages-doubles-talk-text": "شكرًا لتحميلك %(upload)s. ومع ذلك، هذا الملف عبارة عن نسخة من:%(image)s قام البوت بوضع علامة على الملف المكرر باعتباره الملف الأقل استخدامًا أو الأحدث. إذا رأيت أنه من المناسب ترك الملف محددًا بأنه سيتم حذفه على الفور، فلا تتردد في حذف الملفات المكررة وإزالة قالب الحذف من القالب الذي سيتم تركه. هذه رسالة تلقائية من %(bot)s.", + "checkimages-forced-mode": "('''الوضع القسري''')", + "checkimages-has-duplicates": "يحتوي على التكرارات التالية%(force)s:", "checkimages-log-comment": "بوت: تحديث السجل", "checkimages-no-license-head": "صورة بدون ترخيص", "checkimages-source-tag-comment": "بوت: التعليم على ملف مرفوع حديثا غير موسوم", diff --git a/protect/ar.json b/protect/ar.json index a6c059b..8cfb254 100644 --- a/protect/ar.json +++ b/protect/ar.json @@ -1,12 +1,13 @@ { "@metadata": { "authors": [ - "Meno25" + "Meno25", + "Sandra Hanbo" ] }, "protect-category": "بوت: حماية كل الصفحات من التصنيف %(cat)s", "protect-images": "بوت: حماية كل الصور في الصفحة %(page)s", "protect-links": "بوت: حماية كل الصفحات الموصولة من %(page)s", - "protect-ref": "بوت: حماية كل الصفحات الراجعة من %(page)s", + "protect-ref": "بوت: رفع حماية كل الصفحات التي ترجع من %(page)s", "protect-simple": "بوت: حماية قائمة من الملفات." } diff --git a/replicate_wiki/ar.json b/replicate_wiki/ar.json new file mode 100644 index 0000000..1b1c9c2 --- /dev/null +++ b/replicate_wiki/ar.json @@ -0,0 +1,12 @@ +{ + "@metadata": { + "authors": [ + "Sandra Hanbo" + ] + }, + "replicate_wiki-headline": "صفحات تختلف عن الأصلية", + "replicate_wiki-missing-users": "الإداريون من الأصل المفقودون هنا", + "replicate_wiki-same-pages": "جميع الصفحات المهمة هي نفسها", + "replicate_wiki-same-users": "جميع المستخدمين من الأصل موجودون أيضًا على هذا الويكي", + "replicate_wiki-summary": "بوت: مزامنة الويكي من %(source)s" +} -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/i18n/+/987755 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: Id30e8ba4231e31bdba0f9a76853dae0e9e9c5f63 Gerrit-Change-Number: 987755 Gerrit-PatchSet: 1 Gerrit-Owner: L10n-bot <l10n-bot(a)translatewiki.net> Gerrit-Reviewer: L10n-bot <l10n-bot(a)translatewiki.net> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

1 0

[Gerrit] ...i18n[master]: [tests] Update dependencies
by jenkins-bot (Code Review) 04 Jan '24

04 Jan '24

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/i18n/+/987770 ) Change subject: [tests] Update dependencies ...................................................................... [tests] Update dependencies - add packaging to requirements - Use Python 3.8 to run the tests; otherwise importlib_metadata would be required Bug: T354325 Change-Id: Id731f69765826fcb9e64d6b58dd9993c9626869f --- M tox.ini 1 file changed, 16 insertions(+), 1 deletion(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/tox.ini b/tox.ini index 732623c..403d987 100644 --- a/tox.ini +++ b/tox.ini @@ -7,12 +7,13 @@ skip_missing_interpreters = True # Environments to execute when invoking 'tox' -envlist = py37 +envlist = py38 [testenv] commands = ./run-tests.sh {envtmpdir} deps = + packaging requests wikitextparser allowlist_externals = * -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/i18n/+/987770 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: Id731f69765826fcb9e64d6b58dd9993c9626869f Gerrit-Change-Number: 987770 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]: [doc] update CHANGELOG.rst and ROADMAP
by jenkins-bot (Code Review) 04 Jan '24

04 Jan '24

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/987452 ) Change subject: [doc] update CHANGELOG.rst and ROADMAP ...................................................................... [doc] update CHANGELOG.rst and ROADMAP Change-Id: I21668ec0b00d3e66212198d7ae6a0d98f10e1c58 --- M ROADMAP.rst M scripts/CHANGELOG.rst 2 files changed, 33 insertions(+), 0 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/ROADMAP.rst b/ROADMAP.rst index 22f6916..34a838d 100644 --- a/ROADMAP.rst +++ b/ROADMAP.rst @@ -4,6 +4,9 @@ Improvements ^^^^^^^^^^^^ +* ``revisions`` parameter of :class:`xmlreader.XmlDump` was introduced to specify parsing method + (:phab:`T340804`) +* Pass global -nolog argument into bot script from wrapper (:phab:`T328900`) * Add :meth:`site.APISite.ratelimit()<pywikibot.site._apisite.APISite.ratelimit>` method and :class:`tools.collections.RateLimit` NamedTuple (:phab:`T304808`) * L10N Updates @@ -12,6 +15,7 @@ Bugfixes ^^^^^^^^ +* Use only ``end`` tags in ElementTree.iterparse in :mod:`xmlreader` module (:phab:`T354095`) * Suppress error in :meth:`cosmetic_changes.CosmeticChangesToolkit.cleanUpLinks` (:phab:`T337045`) * :func:`pywikibot.input_choice` validates *default* parameter (:phab:`T353097`) * Remove typing imports from user-config.py file (:phab:`T352965`) @@ -19,6 +23,13 @@ Breaking changes and code cleanups ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +* ``tools.Version`` class was removed; use classes from ``packaging.version`` instead (:phab:`T340640`) +* ``packaging`` package is mandatory; ``importlib_metadata`` package is required for Python 3.7 (:phab:`T340640`) +* ``SelfCallMixin``, ``SelfCallDict`` and ``SelfCallString`` of :mod:`tools` module were removed +* Calling :attr:`site.BaseSite.sitename<pywikibot.site._basesite.BaseSite.sitename>` as a function + is no longer supported +* ``config.register_family_file()`` function was removed +* require ``PyMySQL >= 1.0.0`` if necessary * ``keys()`` and ``items()`` methods of :class:`data.api.Reques` gives a view instead a list (:phab:`T310953`) * ``SequenceOutputter.format_list()`` was removed in favour of :attr:`tools.formatter.SequenceOutputter.out` property * *output* parameter of :class:`bot_choice.OutputProxyOption` (i.e. ``OutputOption`` instance) without *out* property is no longer supported @@ -37,6 +48,7 @@ ------------ * 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`` * 9.0.0: ``SequenceOutputter.output()`` is deprecated in favour of :attr:`tools.formatter.SequenceOutputter.out` property * 9.0.0: *nullcontext* context manager and *SimpleQueue* queue of :mod:`backports` are derecated diff --git a/scripts/CHANGELOG.rst b/scripts/CHANGELOG.rst index 6dc7f76..d1b701c 100644 --- a/scripts/CHANGELOG.rst +++ b/scripts/CHANGELOG.rst @@ -4,11 +4,23 @@ 9.0.0 ----- +category_graph +^^^^^^^^^^^^^^ + +* Check for ``-from`` option first (:phab:`T354162`) +* Validate file path input (:phab:`T346417`) + category_redirect ^^^^^^^^^^^^^^^^^ * provide category_redirect categories for all WM sites (:phab:`T348914`) +touch +^^^^^ + +* Use site.ratelimit for bulk purge in PurgeBot + + 8.5.0 ----- -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/987452 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: I21668ec0b00d3e66212198d7ae6a0d98f10e1c58 Gerrit-Change-Number: 987452 Gerrit-PatchSet: 2 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: D3r1ck01 <dalangi-ctr(a)wikimedia.org> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

1 0

[Gerrit] ...core[master]: [fix] Add mandatory dependencies to workflows
by Xqt (Code Review) 04 Jan '24

04 Jan '24

Xqt has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/987746 ) Change subject: [fix] Add mandatory dependencies to workflows ...................................................................... [fix] Add mandatory dependencies to workflows Bug: T354325 Change-Id: I6eb73b94cf9ea56196262002d9c908b58110b047 --- M README.rst M .github/workflows/doctest.yml M .github/workflows/oauth_tests-ci.yml M .github/workflows/login_tests-ci.yml 4 files changed, 28 insertions(+), 11 deletions(-) Approvals: Xqt: Verified; Looks good to me, approved diff --git a/.github/workflows/doctest.yml b/.github/workflows/doctest.yml index 335addd..496cc31 100644 --- a/.github/workflows/doctest.yml +++ b/.github/workflows/doctest.yml @@ -52,12 +52,14 @@ run: | python -m pip install --upgrade pip pip --version - pip install -U setuptools - pip install pytest - pip install "sseclient<0.0.23,>=0.0.18" - pip install mwparserfromhell - pip install "PyMySQL >= 0.9.3" pip install coverage + pip install "importlib_metadata ; python_version < '3.8'" + pip install mwparserfromhell + pip install packaging + pip install "PyMySQL >= 1.0.0" + pip install pytest + pip install -U setuptools + pip install "sseclient<0.0.23,>=0.0.18" python -c "import setuptools; print('setuptools:', setuptools.__version__)" - name: Generate user files diff --git a/.github/workflows/login_tests-ci.yml b/.github/workflows/login_tests-ci.yml index a1f1f7c..bac844f 100644 --- a/.github/workflows/login_tests-ci.yml +++ b/.github/workflows/login_tests-ci.yml @@ -77,10 +77,12 @@ run: | python -m pip install --upgrade pip pip --version - pip install -U setuptools - pip install requests - pip install mwparserfromhell pip install coverage + pip install "importlib_metadata ; python_version < '3.8'" + pip install mwparserfromhell + pip install packaging + pip install requests + pip install -U setuptools python -c "import setuptools; print('setuptools:', setuptools.__version__)" - name: Generate family files diff --git a/.github/workflows/oauth_tests-ci.yml b/.github/workflows/oauth_tests-ci.yml index 497573c..1b3f0a3 100644 --- a/.github/workflows/oauth_tests-ci.yml +++ b/.github/workflows/oauth_tests-ci.yml @@ -84,11 +84,13 @@ run: | python -m pip install --upgrade pip pip --version - pip install -U setuptools - pip install requests + pip install coverage + pip install "importlib_metadata ; python_version < '3.8'" pip install mwparserfromhell pip install mwoauth - pip install coverage + pip install packaging + pip install requests + pip install -U setuptools python -c "import setuptools; print('setuptools:', setuptools.__version__)" - name: Generate family files diff --git a/README.rst b/README.rst index ed72d48..7064b6b 100644 --- a/README.rst +++ b/README.rst @@ -52,6 +52,7 @@ .. code:: text pip install requests + pip install packaging git clone https://gerrit.wikimedia.org/r/pywikibot/core.git cd core git submodule update --init -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/987746 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: I6eb73b94cf9ea56196262002d9c908b58110b047 Gerrit-Change-Number: 987746 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]: [fix] Add mandatory dependencies to requirements.txt
by Xqt (Code Review) 04 Jan '24

04 Jan '24

Xqt has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/987711 ) Change subject: [fix] Add mandatory dependencies to requirements.txt ...................................................................... [fix] Add mandatory dependencies to requirements.txt Bug: T354325 Change-Id: Ifedc038dc994e8c07a0c82d5cd35a20ce17032db --- M requirements.txt 1 file changed, 12 insertions(+), 0 deletions(-) Approvals: jenkins-bot: Verified Xqt: Looks good to me, approved diff --git a/requirements.txt b/requirements.txt index ff2d96d..249a822 100644 --- a/requirements.txt +++ b/requirements.txt @@ -18,7 +18,9 @@ # $ awk -F '[#>=]' '{print $1}' requirements.txt | xargs apt-cache search # mandatory dependencies, others are optional +importlib_metadata ; python_version < '3.8' mwparserfromhell>=0.5.2 +packaging requests>=2.21.0 setuptools>=48.0.0 ; python_version >= '3.10' setuptools>=40.8.0 ; python_version < '3.10' -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/987711 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: Ifedc038dc994e8c07a0c82d5cd35a20ce17032db Gerrit-Change-Number: 987711 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]: [IMPR] Raise TypeError when argument has wrong type
by jenkins-bot (Code Review) 03 Jan '24

03 Jan '24

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/987450 ) Change subject: [IMPR] Raise TypeError when argument has wrong type ...................................................................... [IMPR] Raise TypeError when argument has wrong type As suggested in the definition of TypeError itself. Change-Id: If46449966b926c4063f811af472c42c86db8d991 --- M pywikibot/time.py 1 file changed, 23 insertions(+), 2 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/time.py b/pywikibot/time.py index 8a32bfc..4761535 100644 --- a/pywikibot/time.py +++ b/pywikibot/time.py @@ -251,7 +251,12 @@ # to create a clone. if isinstance(ts, cls): return ts.replace() - assert isinstance(ts, str) + + if not isinstance(ts, str): + raise TypeError( + f'ts argument must be a string or a Timestamp object,' + f' not {type(ts).__name__}') + return cls._from_iso8601(f'{ts[:10]}{sep}{ts[11:]}') @classmethod @@ -289,7 +294,12 @@ # to create a clone. if isinstance(ts, cls): return ts.replace() - assert isinstance(ts, str) + + if not isinstance(ts, str): + raise TypeError( + f'ts argument must be a string or a Timestamp object,' + f' not {type(ts).__name__}') + if len(ts) == 8 and not strict: # year, month and day are given only ts += '000000' -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/987450 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: If46449966b926c4063f811af472c42c86db8d991 Gerrit-Change-Number: 987450 Gerrit-PatchSet: 1 Gerrit-Owner: 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]: [bugfix] Do not pass None to Timestamp.fromtimestampformat()
by jenkins-bot (Code Review) 03 Jan '24

03 Jan '24

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/987433 ) Change subject: [bugfix] Do not pass None to Timestamp.fromtimestampformat() ...................................................................... [bugfix] Do not pass None to Timestamp.fromtimestampformat() Bug: T354281 Change-Id: I1e612266e0f5b7b6a55cc99eb56e72bca3861261 --- M pywikibot/pagegenerators/_factory.py 1 file changed, 18 insertions(+), 9 deletions(-) Approvals: JJMC89: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/pagegenerators/_factory.py b/pywikibot/pagegenerators/_factory.py index 80c8081..4de0b08 100644 --- a/pywikibot/pagegenerators/_factory.py +++ b/pywikibot/pagegenerators/_factory.py @@ -1,6 +1,6 @@ """GeneratorFactory module wich handles pagegenerators options.""" # -# (C) Pywikibot team, 2008-2023 +# (C) Pywikibot team, 2008-2024 # # Distributed under the terms of the MIT license. # @@ -413,14 +413,13 @@ 'positive int.'.format(start)) return None - try: - end = pywikibot.Timestamp.fromtimestampformat(end) - except ValueError as err: - pywikibot.error( - f'{err}. End parameter has wrong format!') - return None - except TypeError: # end is None - pass + if end is not None: + try: + end = pywikibot.Timestamp.fromtimestampformat(end) + except ValueError as err: + pywikibot.error( + f'{err}. End parameter has wrong format!') + return None if start or end: pywikibot.info('Fetching log events in range: {} - {}.' -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/987433 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: I1e612266e0f5b7b6a55cc99eb56e72bca3861261 Gerrit-Change-Number: 987433 Gerrit-PatchSet: 1 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: JJMC89 <JJMC89.Wikimedia(a)gmail.com> Gerrit-Reviewer: jenkins-bot Gerrit-CC: Mpaa <mpaa.wiki(a)gmail.com> Gerrit-MessageType: merged

1 0

[Gerrit] ...core[master]: [L10N] Update languages_by_size
by jenkins-bot (Code Review) 03 Jan '24

03 Jan '24

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/986664 ) Change subject: [L10N] Update languages_by_size ...................................................................... [L10N] Update languages_by_size Change-Id: Ibc5bb888d26d099306abe642b152ddcd51b48a3f --- M pywikibot/families/wikisource_family.py M pywikibot/families/wikiversity_family.py M pywikibot/families/wikiquote_family.py M pywikibot/families/wiktionary_family.py M pywikibot/families/wikipedia_family.py 5 files changed, 38 insertions(+), 29 deletions(-) Approvals: Meno25: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/families/wikipedia_family.py b/pywikibot/families/wikipedia_family.py index 226c1dc..75dbc41 100644 --- a/pywikibot/families/wikipedia_family.py +++ b/pywikibot/families/wikipedia_family.py @@ -1,6 +1,6 @@ """Family module for Wikipedia.""" # -# (C) Pywikibot team, 2004-2023 +# (C) Pywikibot team, 2004-2024 # # Distributed under the terms of the MIT license. # @@ -35,29 +35,29 @@ 'sk', 'simple', 'azb', 'et', 'be', 'kk', 'el', 'min', 'hr', 'lt', 'gl', 'ur', 'az', 'sl', 'lld', 'ka', 'nn', 'ta', 'th', 'hi', 'bn', 'mk', 'la', 'zh-yue', 'ast', 'lv', 'af', 'tg', 'my', 'mg', 'sq', 'mr', 'bs', - 'te', 'oc', 'br', 'ml', 'be-tarask', 'nds', 'sw', 'ky', 'ku', 'lmo', + 'te', 'oc', 'br', 'be-tarask', 'ml', 'nds', 'sw', 'ky', 'ku', 'lmo', 'jv', 'new', 'pnb', 'vec', 'ht', 'pms', 'ba', 'lb', 'su', 'ga', 'is', - 'szl', 'ckb', 'fy', 'cv', 'pa', 'tl', 'an', 'io', 'wuu', 'diq', 'vo', - 'ha', 'sco', 'yo', 'ne', 'kn', 'gu', 'als', 'avk', 'crh', 'bar', 'ia', - 'scn', 'bpy', 'qu', 'ig', 'mn', 'nv', 'ban', 'xmf', 'si', 'frr', 'mzn', + 'szl', 'ckb', 'fy', 'cv', 'pa', 'tl', 'an', 'io', 'wuu', 'diq', 'ha', + 'vo', 'sco', 'yo', 'ne', 'kn', 'gu', 'als', 'avk', 'crh', 'bar', 'ia', + 'scn', 'bpy', 'qu', 'ig', 'mn', 'nv', 'ban', 'xmf', 'si', 'mzn', 'frr', 'ps', 'tum', 'os', 'or', 'bat-smg', 'sah', 'cdo', 'bcl', 'gd', 'bug', - 'sd', 'yi', 'ilo', 'am', 'li', 'nap', 'gor', 'fo', 'mai', 'hsb', + 'sd', 'yi', 'ilo', 'am', 'li', 'nap', 'gor', 'mai', 'fo', 'hsb', 'map-bms', 'shn', 'eml', 'ace', 'zh-classical', 'as', 'sa', 'wa', 'ie', 'hyw', 'sn', 'mhr', 'lij', 'zu', 'hif', 'bjn', 'mrj', 'km', 'mni', - 'hak', 'sat', 'ary', 'roa-tara', 'pam', 'rue', 'bh', 'nso', 'dag', - 'co', 'so', 'vls', 'mi', 'nds-nl', 'myv', 'se', 'sc', 'bo', 'vep', + 'hak', 'sat', 'ary', 'roa-tara', 'pam', 'rue', 'bh', 'dag', 'nso', + 'co', 'vls', 'so', 'mi', 'nds-nl', 'myv', 'se', 'sc', 'bo', 'vep', 'kw', 'glk', 'tk', 'kab', 'gan', 'rw', 'fiu-vro', 'gv', 'zea', 'ab', - 'ug', 'nah', 'mt', 'skr', 'tly', 'frp', 'udm', 'pcd', 'gn', 'kv', - 'smn', 'csb', 'ay', 'nrm', 'ks', 'lez', 'olo', 'mdf', 'mwl', 'lfn', - 'kaa', 'ang', 'stq', 'lo', 'fur', 'rm', 'tw', 'ext', 'lad', 'pap', - 'gom', 'tyv', 'koi', 'ln', 'av', 'dsb', 'dty', 'cbk-zam', 'dv', 'ksh', + 'skr', 'ug', 'mt', 'nah', 'tly', 'frp', 'udm', 'pcd', 'gn', 'kv', + 'smn', 'csb', 'ay', 'nrm', 'ks', 'lez', 'mdf', 'olo', 'mwl', 'kaa', + 'lfn', 'ang', 'stq', 'lo', 'fur', 'rm', 'tw', 'lad', 'ext', 'pap', + 'gom', 'ln', 'tyv', 'koi', 'av', 'dsb', 'dty', 'cbk-zam', 'dv', 'ksh', 'za', 'lg', 'gag', 'bxr', 'pfl', 'szy', 'blk', 'tay', 'pag', 'pi', - 'haw', 'awa', 'inh', 'krc', 'pdc', 'to', 'atj', 'tcy', 'arc', 'mnw', - 'shi', 'ff', 'xal', 'jam', 'kbp', 'xh', 'wo', 'nia', 'om', 'anp', - 'kbd', 'nov', 'ki', 'nqo', 'zgh', 'bi', 'tpi', 'tet', 'roa-rup', 'jbo', + 'haw', 'awa', 'inh', 'krc', 'pdc', 'to', 'atj', 'tcy', 'mnw', 'arc', + 'ff', 'shi', 'xal', 'xh', 'jam', 'kbp', 'wo', 'nia', 'om', 'anp', + 'kbd', 'nov', 'ki', 'zgh', 'nqo', 'bi', 'tpi', 'tet', 'roa-rup', 'jbo', 'tn', 'fj', 'kg', 'lbe', 'guw', 'ty', 'cu', 'rmy', 'mad', 'trv', 'ami', - 'srn', 'sm', 'alt', 'ltg', 'gcr', 'chr', 'ny', 'dga', 'pcm', 'st', - 'gpe', 'kcg', 'pih', 'ss', 'got', 'gur', 'ee', 'bm', 'ts', 've', 'bbc', + 'srn', 'sm', 'alt', 'ltg', 'gcr', 'chr', 'dga', 'ny', 'pcm', 'st', + 'gpe', 'kcg', 'pih', 'got', 'ss', 'gur', 'ee', 'bm', 'ts', 've', 'bbc', 'chy', 'rn', 'fon', 'ik', 'ady', 'ch', 'guc', 'fat', 'pnt', 'iu', 'pwn', 'sg', 'din', 'ti', 'kl', 'dz', 'cr', ] diff --git a/pywikibot/families/wikiquote_family.py b/pywikibot/families/wikiquote_family.py index 33b1000..8882948 100644 --- a/pywikibot/families/wikiquote_family.py +++ b/pywikibot/families/wikiquote_family.py @@ -1,6 +1,6 @@ """Family module for Wikiquote.""" # -# (C) Pywikibot team, 2005-2023 +# (C) Pywikibot team, 2005-2024 # # Distributed under the terms of the MIT license. # @@ -34,7 +34,7 @@ 'ar', 'id', 'su', 'bg', 'hy', 'hr', 'el', 'nn', 'sv', 'li', 'hu', 'ko', 'sah', 'nl', 'ja', 'la', 'ta', 'ig', 'hi', 'as', 'bn', 'gl', 'gu', 'te', 'guw', 'ur', 'bjn', 'tl', 'vi', 'be', 'cy', 'no', 'sq', 'ml', - 'kn', 'eu', 'ro', 'ku', 'uz', 'ka', 'th', 'da', 'sa', 'is', 'bcl', + 'kn', 'eu', 'ro', 'ku', 'uz', 'th', 'ka', 'da', 'sa', 'is', 'bcl', 'br', 'mr', 'af', 'ky', ] diff --git a/pywikibot/families/wikisource_family.py b/pywikibot/families/wikisource_family.py index fc7a987..c4764bf 100644 --- a/pywikibot/families/wikisource_family.py +++ b/pywikibot/families/wikisource_family.py @@ -1,6 +1,6 @@ """Family module for Wikisource.""" # -# (C) Pywikibot team, 2004-2023 +# (C) Pywikibot team, 2004-2024 # # Distributed under the terms of the MIT license. # @@ -31,7 +31,7 @@ 'mul', 'gu', 'cs', 'sr', 'pt', 'bn', 'sv', 'fa', 'ko', 'ta', 'hu', 'ml', 'sa', 'be', 'te', 'tr', 'sl', 'la', 'vi', 'hy', 'nl', 'el', 'ja', 'ro', 'fi', 'nap', 'az', 'ca', 'br', 'hr', 'id', 'th', 'no', 'kn', - 'hi', 'cy', 'vec', 'eo', 'is', 'mr', 'ban', 'pms', 'lij', 'da', 'et', + 'hi', 'cy', 'vec', 'eo', 'is', 'mr', 'pms', 'ban', 'lij', 'da', 'et', 'as', 'mk', 'yi', 'bg', 'jv', 'wa', 'li', 'lt', 'pa', 'or', 'eu', 'gl', 'bs', 'sah', 'sk', 'su', 'zh-min-nan', 'fo', ] diff --git a/pywikibot/families/wikiversity_family.py b/pywikibot/families/wikiversity_family.py index 38be891..e82cba5 100644 --- a/pywikibot/families/wikiversity_family.py +++ b/pywikibot/families/wikiversity_family.py @@ -1,6 +1,6 @@ """Family module for Wikiversity.""" # -# (C) Pywikibot team, 2007-2023 +# (C) Pywikibot team, 2007-2024 # # Distributed under the terms of the MIT license. # @@ -19,7 +19,7 @@ languages_by_size = [ 'de', 'en', 'fr', 'zh', 'it', 'cs', 'ru', 'pt', 'es', 'sl', 'ar', 'sv', - 'fi', 'el', 'hi', 'ko', 'ja', + 'fi', 'el', 'ko', 'hi', 'ja', ] test_codes = ['beta'] diff --git a/pywikibot/families/wiktionary_family.py b/pywikibot/families/wiktionary_family.py index 9786dc6..75dfb26 100644 --- a/pywikibot/families/wiktionary_family.py +++ b/pywikibot/families/wiktionary_family.py @@ -1,6 +1,6 @@ """Family module for Wiktionary.""" # -# (C) Pywikibot team, 2005-2023 +# (C) Pywikibot team, 2005-2024 # # Distributed under the terms of the MIT license. # @@ -38,15 +38,15 @@ 'pl', 'lt', 'hu', 'ca', 'it', 'fi', 'pt', 'ta', 'ja', 'tr', 'io', 'hy', 'ko', 'kn', 'vi', 'sr', 'th', 'hi', 'ro', 'id', 'no', 'et', 'skr', 'cs', 'ml', 'my', 'uz', 'li', 'eo', 'or', 'te', 'fa', 'gl', 'sg', 'oc', - 'ar', 'is', 'jv', 'az', 'uk', 'ast', 'eu', 'bn', 'br', 'mnw', 'da', - 'simple', 'lo', 'la', 'shn', 'hr', 'sk', 'fj', 'wa', 'lmo', 'ky', 'bg', + 'ar', 'is', 'jv', 'ast', 'az', 'uk', 'eu', 'bn', 'br', 'mnw', 'da', + 'simple', 'lo', 'la', 'shn', 'hr', 'sk', 'lmo', 'fj', 'wa', 'ky', 'bg', 'kbd', 'ur', 'cy', 'ps', 'tg', 'he', 'vo', 'om', 'sl', 'af', 'zh-min-nan', 'ms', 'scn', 'tl', 'pa', 'fy', 'sw', 'ka', 'kk', 'nn', - 'min', 'lv', 'nds', 'gor', 'sq', 'lb', 'bs', 'co', 'mn', 'pnb', 'nah', - 'yue', 'ckb', 'diq', 'sa', 'km', 'be', 'vec', 'nia', 'tk', 'mk', 'sm', + 'min', 'lv', 'nds', 'gor', 'sq', 'lb', 'bs', 'co', 'mn', 'pnb', 'yue', + 'nah', 'ckb', 'diq', 'sa', 'km', 'be', 'vec', 'nia', 'tk', 'mk', 'sm', 'hsb', 'ks', 'shy', 'bcl', 'su', 'ga', 'btm', 'gd', 'an', 'gom', 'mr', 'ha', 'wo', 'mni', 'ia', 'blk', 'bjn', 'so', 'ang', 'mt', 'tt', 'sd', - 'fo', 'si', 'gn', 'mi', 'ie', 'csb', 'ug', 'guw', 'st', 'jbo', 'hif', + 'si', 'fo', 'gn', 'mi', 'ie', 'csb', 'ug', 'guw', 'st', 'jbo', 'hif', 'roa-rup', 'kl', 'zu', 'ay', 'ln', 'yi', 'gu', 'kcg', 'na', 'gv', 'kw', 'tpi', 'am', 'ne', 'rw', 'ts', 'ig', 'qu', 'ss', 'iu', 'chr', 'dv', 'ti', 'tn', -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/986664 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: Ibc5bb888d26d099306abe642b152ddcd51b48a3f Gerrit-Change-Number: 986664 Gerrit-PatchSet: 2 Gerrit-Owner: Meno25 <meno25mail(a)gmail.com> Gerrit-Reviewer: Meno25 <meno25mail(a)gmail.com> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

1 0

[Gerrit] ...core[master]: [fix] do not check for installed 'importlib_metadata' and 'packaging'
by jenkins-bot (Code Review) 03 Jan '24

03 Jan '24

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/987422 ) Change subject: [fix] do not check for installed 'importlib_metadata' and 'packaging' ...................................................................... [fix] do not check for installed 'importlib_metadata' and 'packaging' Both meodules are imported in backports and needed for the check_modules funktion. Missing modules are already printed during import of pywikibot. Change-Id: I0c46b5be772812a169de25d329ffb37ee628bab2 --- M pywikibot/scripts/wrapper.py 1 file changed, 22 insertions(+), 2 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/scripts/wrapper.py b/pywikibot/scripts/wrapper.py index 3b24e25..730b201 100755 --- a/pywikibot/scripts/wrapper.py +++ b/pywikibot/scripts/wrapper.py @@ -38,7 +38,7 @@ renamed to wrapper.py """ # -# (C) Pywikibot team, 2012-2023 +# (C) Pywikibot team, 2012-2024 # # Distributed under the terms of the MIT license. # @@ -241,6 +241,14 @@ from setup import dependencies for dependency in dependencies: + if dependency.startswith(('importlib_metadata', 'packaging')): + # Ignore these dependencies because ImportError is raised in an + # early state when they are imported in backports. They are already + # used at this point. This is a workaound for toolforge where some + # modules are not installed as a site-package. + # TODO: Check imports from external source + continue + requirement = Requirement(dependency) if requirement.marker is None or requirement.marker.evaluate(): try: @@ -304,7 +312,7 @@ # we need to re-start the entire process. Ask the user to do so. print('Now, you have to re-execute the command to start your script.') sys.exit(1) -except ImportError as e: # raised in textlib +except ImportError as e: # raised in textlib or backports sys.exit(e) -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/987422 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: I0c46b5be772812a169de25d329ffb37ee628bab2 Gerrit-Change-Number: 987422 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

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

Pywikibot-commits January 2024