Pywikibot-commits

pywikibot-commits@lists.wikimedia.org

1 participants
13480 discussions

[Gerrit] ...core[master]: [bugfix] lazy import setuptools in setup.py
by jenkins-bot (Code Review) 08 Jan '24

08 Jan '24

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/988397 ) Change subject: [bugfix] lazy import setuptools in setup.py ...................................................................... [bugfix] lazy import setuptools in setup.py Bug: T354515 Change-Id: I1444a1cdb29a55a96dad686c69206f1fbe6bd35e --- M setup.py 1 file changed, 12 insertions(+), 2 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/setup.py b/setup.py index c38db44..f0cf7d3 100755 --- a/setup.py +++ b/setup.py @@ -28,8 +28,6 @@ import re import sys -from setuptools import setup - if sys.version_info[:3] >= (3, 9): List = list @@ -211,6 +209,8 @@ def main() -> None: """Setup entry point.""" + from setuptools import setup + version = get_validated_version() setup( name=metadata.__name__, -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/988397 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: I1444a1cdb29a55a96dad686c69206f1fbe6bd35e Gerrit-Change-Number: 988397 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]: [cleanup] No longer require setuptools because packaging is used
by jenkins-bot (Code Review) 07 Jan '24

07 Jan '24

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/987776 ) Change subject: [cleanup] No longer require setuptools because packaging is used ...................................................................... [cleanup] No longer require setuptools because packaging is used pkg_resources was replaced with importlib.metadata and packaging. Therefore vendor package of setuptools is no longer required. Bug: T340640 Bug: T347052 Change-Id: I8495ee84985e669ede3a32f1982da10e6034f6a5 --- M README.rst M .github/workflows/doctest.yml M .github/workflows/write_tests-ci.yml M setup.py M .github/workflows/oauth_tests-ci.yml M .github/workflows/pywikibot-ci.yml M tests/tools_tests.py M make_dist.py M requirements.txt M pywikibot/scripts/version.py M .github/workflows/login_tests-ci.yml 11 files changed, 24 insertions(+), 30 deletions(-) Approvals: JJMC89: Looks good to me, approved jenkins-bot: Verified diff --git a/.github/workflows/doctest.yml b/.github/workflows/doctest.yml index 496cc31..7805c82 100644 --- a/.github/workflows/doctest.yml +++ b/.github/workflows/doctest.yml @@ -58,9 +58,7 @@ 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 run: | diff --git a/.github/workflows/login_tests-ci.yml b/.github/workflows/login_tests-ci.yml index bac844f..bcf58d4 100644 --- a/.github/workflows/login_tests-ci.yml +++ b/.github/workflows/login_tests-ci.yml @@ -82,8 +82,6 @@ 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 run: | diff --git a/.github/workflows/oauth_tests-ci.yml b/.github/workflows/oauth_tests-ci.yml index 1b3f0a3..2223ebf 100644 --- a/.github/workflows/oauth_tests-ci.yml +++ b/.github/workflows/oauth_tests-ci.yml @@ -90,8 +90,6 @@ pip install mwoauth pip install packaging pip install requests - pip install -U setuptools - python -c "import setuptools; print('setuptools:', setuptools.__version__)" - name: Generate family files if: ${{ matrix.family == 'wpbeta' }} diff --git a/.github/workflows/pywikibot-ci.yml b/.github/workflows/pywikibot-ci.yml index 8d16258..4ae59a3 100644 --- a/.github/workflows/pywikibot-ci.yml +++ b/.github/workflows/pywikibot-ci.yml @@ -89,11 +89,9 @@ run: | python -m pip install --upgrade pip pip --version - pip install -U setuptools if [ -f dev-requirements.txt ]; then pip install -r dev-requirements.txt; fi if [ -f requirements.txt ]; then pip install -r requirements.txt; fi pip install wikitextparser - python -c "import setuptools; print('setuptools:', setuptools.__version__)" - name: Generate family files run: | diff --git a/.github/workflows/write_tests-ci.yml b/.github/workflows/write_tests-ci.yml index 06cf699..756add1 100644 --- a/.github/workflows/write_tests-ci.yml +++ b/.github/workflows/write_tests-ci.yml @@ -43,10 +43,8 @@ run: | python -m pip install --upgrade pip pip --version - pip install -U setuptools if [ -f dev-requirements.txt ]; then pip install -r dev-requirements.txt; fi if [ -f requirements.txt ]; then pip install -r requirements.txt; fi - python -c "import setuptools; print('setuptools:', setuptools.__version__)" - name: Generate user files run: | diff --git a/README.rst b/README.rst index 7064b6b..e80988e 100644 --- a/README.rst +++ b/README.rst @@ -62,7 +62,6 @@ .. code:: text - pip install -U setuptools pip install pywikibot pwb <scriptname> diff --git a/make_dist.py b/make_dist.py index 3b1fcb4..8dc2a13 100755 --- a/make_dist.py +++ b/make_dist.py @@ -37,7 +37,6 @@ - *nodist* option was added .. versionchanged:: 8.1 - Python 3.7+ required because *dataclasses* module is used. *nodist* option was removed, *clear* option does not create a distribution. *local* and *remote* option clears old distributions first. @@ -46,7 +45,7 @@ option also installs packages if necessary. """ # -# (C) Pywikibot team, 2022-2023 +# (C) Pywikibot team, 2022-2024 # # Distributed under the terms of the MIT license. # @@ -201,9 +200,6 @@ def handle_args() -> tuple[bool, bool, bool, bool]: """Handle arguments and print documentation if requested. - Read arguments from `sys.argv` and adjust it passing `sdist` to - `setuptools.setup`. - :return: Return whether dist is to be installed locally or to be uploaded """ diff --git a/pywikibot/scripts/version.py b/pywikibot/scripts/version.py index 9e1f129..b0e1156 100755 --- a/pywikibot/scripts/version.py +++ b/pywikibot/scripts/version.py @@ -5,7 +5,7 @@ version script was moved to the framework scripts folder """ # -# (C) Pywikibot team, 2007-2022 +# (C) Pywikibot team, 2007-2024 # # Distributed under the terms of the MIT license. # @@ -27,9 +27,9 @@ try: - import setuptools + import packaging except ImportError: - setuptools = DummyModule() + packaging = DummyModule() try: import mwparserfromhell @@ -54,7 +54,7 @@ """Print pywikibot version and important settings.""" pywikibot.info('Pywikibot: ' + getversion()) pywikibot.info('Release version: ' + pywikibot.__version__) - pywikibot.info('setuptools version: ' + setuptools.__version__) + pywikibot.info('packaging version: ' + packaging.__version__) pywikibot.info('mwparserfromhell version: ' + mwparserfromhell.__version__) pywikibot.info('wikitextparser version: ' + wikitextparser.__version__) pywikibot.info('requests version: ' + requests.__version__) diff --git a/requirements.txt b/requirements.txt index 249a822..6bdd15f 100644 --- a/requirements.txt +++ b/requirements.txt @@ -22,8 +22,6 @@ 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' # MediaWiki markup parser # mwparserfromhell is mandatory but wikitextparser can be used instead diff --git a/setup.py b/setup.py index 51ebfaf..c38db44 100755 --- a/setup.py +++ b/setup.py @@ -20,7 +20,7 @@ .. warning: do not upload a development release to pypi. """ # -# (C) Pywikibot team, 2009-2023 +# (C) Pywikibot team, 2009-2024 # # Distributed under the terms of the MIT license. # @@ -93,9 +93,6 @@ 'mwparserfromhell>=0.5.2', 'packaging', 'requests>=2.21.0', - # PEP 440 - 'setuptools>=48.0.0 ; python_version >= "3.10"', - 'setuptools>=40.8.0 ; python_version < "3.10"', ] # ------- setup tests_require ------- # diff --git a/tests/tools_tests.py b/tests/tools_tests.py index 4f3d41d..070c545 100755 --- a/tests/tools_tests.py +++ b/tests/tools_tests.py @@ -1,7 +1,7 @@ #!/usr/bin/env python3 """Test tools package alone which don't fit into other tests.""" # -# (C) Pywikibot team, 2015-2023 +# (C) Pywikibot team, 2015-2024 # # Distributed under the terms of the MIT license. from __future__ import annotations @@ -847,8 +847,8 @@ def test_when_present(self): """Test when the module is available.""" - self.assertTrue(has_module('setuptools')) - self.assertTrue(has_module('setuptools', '1.0')) + self.assertTrue(has_module('requests')) + self.assertTrue(has_module('requests', '1.0')) def test_when_missing(self): """Test when the module is unavailable.""" @@ -859,7 +859,7 @@ ImportWarning) def test_when_insufficient_version(self): """Test when the module is older than what we need.""" - self.assertFalse(has_module('setuptools', '99999')) + self.assertFalse(has_module('requests', '99999')) class TestStringFunctions(TestCase): -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/987776 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: I8495ee84985e669ede3a32f1982da10e6034f6a5 Gerrit-Change-Number: 987776 Gerrit-PatchSet: 2 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: JJMC89 <JJMC89.Wikimedia(a)gmail.com> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

1 0

[Gerrit] ...core[master]: [doc] Update documentation
by jenkins-bot (Code Review) 06 Jan '24

06 Jan '24

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/988018 ) Change subject: [doc] Update documentation ...................................................................... [doc] Update documentation Change-Id: I115f1bdc94617513e1507de2f43c35007113be7f --- M ROADMAP.rst M pywikibot/xmlreader.py M pywikibot/_wbtypes.py 3 files changed, 41 insertions(+), 14 deletions(-) Approvals: DannyS712: Looks good to me, but someone else must approve Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/ROADMAP.rst b/ROADMAP.rst index 34a838d..b399e0f 100644 --- a/ROADMAP.rst +++ b/ROADMAP.rst @@ -4,9 +4,10 @@ Improvements ^^^^^^^^^^^^ +* :meth:`pywikibot.WbTime.equal_instant` was added (:phab:`T325248`) * ``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`) +* 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 @@ -23,6 +24,7 @@ Breaking changes and code cleanups ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +* ``root`` attribute of :class:`xmlreader.XmlDump` was removed * ``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 @@ -30,7 +32,7 @@ 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`) +* ``keys()`` and ``items()`` methods of :class:`data.api.Request` 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 * ``OutputOption.output()`` method was removed diff --git a/pywikibot/_wbtypes.py b/pywikibot/_wbtypes.py index 47322df5..1daf583 100644 --- a/pywikibot/_wbtypes.py +++ b/pywikibot/_wbtypes.py @@ -1,6 +1,6 @@ """Wikibase data type classes.""" # -# (C) Pywikibot team, 2013-2023 +# (C) Pywikibot team, 2013-2024 # # Distributed under the terms of the MIT license. # @@ -530,6 +530,8 @@ For example, a time with at 10:00 UTC-5 would return false if checked with == with a time at 15:00 UTC, but would return true with this method. + + .. versionadded:: 9.0 """ return self._getSecondsAdjusted() == other._getSecondsAdjusted() diff --git a/pywikibot/xmlreader.py b/pywikibot/xmlreader.py index fa5f53b..bb8c4d1 100644 --- a/pywikibot/xmlreader.py +++ b/pywikibot/xmlreader.py @@ -11,7 +11,7 @@ vulnerable XML attacks. *defusedxml* 0.7.1 or higher is recommended. """ # -# (C) Pywikibot team, 2005-2023 +# (C) Pywikibot team, 2005-2024 # # Distributed under the terms of the MIT license. # @@ -58,7 +58,10 @@ class Headers(NamedTuple): - """Represent the common info of a page.""" + """Represent the common info of a page. + + .. versionadded:: 9.0 + """ title: str ns: str @@ -70,7 +73,10 @@ class RawRev(NamedTuple): - """Represent a raw revision.""" + """Represent a raw revision. + + .. versionadded:: 9.0 + """ headers: Headers revision: Element @@ -89,8 +95,9 @@ .. versionchanged:: 7.2 `allrevisions` parameter must be given as keyword parameter .. versionchanged:: 9.0 - `allrevisions` parameter deprecated due to :phab:`T340804` - `revisions` parameter introduced as replacement + `allrevisions` parameter is deprecated due to :phab:`T340804`, + `revisions` parameter was introduced as replacement. + `root` attribute was removed. Usage example: @@ -202,11 +209,9 @@ root.clear() def _parse_only_first_found(self, elem: Element) -> Iterator[XmlEntry]: - """ - Deprecated parser that yields the first revision found. + """Parser that yields the first revision found. - Documentation had wrongly indicated it returned the latest revision. - :phab: `T340804` + .. versionadded:: 9.0 """ raw_revs = self._fetch_revs(elem) try: @@ -223,7 +228,10 @@ yield self._create_revision(raw_rev.headers, raw_rev.revision) def _parse_only_earliest(self, elem: Element) -> Iterator[XmlEntry]: - """Parser that yields only the earliest revision.""" + """Parser that yields only the earliest revision. + + .. versionadded:: 9.0 + """ 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: @@ -236,7 +244,10 @@ yield self._create_revision(raw_rev.headers, raw_rev.revision) def _fetch_revs(self, elem: Element, with_id=False) -> Iterator[RawRev]: - """Yield all revisions in a page.""" + """Yield all revisions in a page. + + .. versionadded:: 9.0 + """ uri = self.uri headers = self._headers(elem) for revision in elem.findall(f'{uri}revision'): @@ -253,6 +264,9 @@ Returns strings representing user groups allowed to edit and to move a page, where None means there are no restrictions. + + .. versionadded:: 9.0 + replaces deprecated ``parseRestrictions`` function. """ if not restrictions: return None, None -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/988018 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: I115f1bdc94617513e1507de2f43c35007113be7f Gerrit-Change-Number: 988018 Gerrit-PatchSet: 2 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: DannyS712 <dannys712.wiki(a)gmail.com> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot Gerrit-CC: Mpaa <mpaa.wiki(a)gmail.com> Gerrit-MessageType: merged

1 0

[Gerrit] ...core[master]: [Feature] Add equal_instant()
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/+/871017 ) Change subject: [Feature] Add equal_instant() ...................................................................... [Feature] Add equal_instant() Bug: T325248 Change-Id: Ibd771356ae457145b6613822f256aff782b23d62 --- M tests/wikibase_tests.py M pywikibot/_wbtypes.py 2 files changed, 82 insertions(+), 0 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/_wbtypes.py b/pywikibot/_wbtypes.py index e260de8..857ffa9 100644 --- a/pywikibot/_wbtypes.py +++ b/pywikibot/_wbtypes.py @@ -519,6 +519,19 @@ return self._getSecondsAdjusted() >= other._getSecondsAdjusted() return NotImplemented + def equal_instant(self, other: WbTime) -> bool: + """Checks if the two times represent the same instant in time. + + This is different from the equality operator, which will return false + for two times that are the same number of UTC seconds, but with + different timezone information. + + For example, a time with at 10:00 UTC-5 would return false if checked + with == with a time at 15:00 UTC, but would return true with + this method. + """ + return self._getSecondsAdjusted() == other._getSecondsAdjusted() + @classmethod def fromTimestr(cls, datetimestr: str, diff --git a/tests/wikibase_tests.py b/tests/wikibase_tests.py index b8b2399..5d689cc 100755 --- a/tests/wikibase_tests.py +++ b/tests/wikibase_tests.py @@ -589,6 +589,65 @@ t2 = pywikibot.WbTime.fromTimestamp(ts2, timezone=0, site=repo) self.assertGreater(t1, t2) + def test_comparison_timezones_equal(self): + """Test when two WbTime's have equal instants but not the same tz.""" + repo = self.get_repo() + ts1 = pywikibot.Timestamp( + year=2023, month=12, day=21, hour=13, + tzinfo=datetime.timezone(datetime.timedelta(hours=-5))) + ts2 = pywikibot.Timestamp( + year=2023, month=12, day=21, hour=18, + tzinfo=datetime.timezone.utc) + self.assertEqual(ts1.timestamp(), ts2.timestamp()) + + t1 = pywikibot.WbTime.fromTimestamp(ts1, timezone=-300, site=repo) + t2 = pywikibot.WbTime.fromTimestamp(ts2, timezone=0, site=repo) + self.assertGreaterEqual(t1, t2) + self.assertGreaterEqual(t2, t1) + self.assertNotEqual(t1, t2) + self.assertNotEqual(t2, t1) + # Ignore H205: We specifically want to test the operator + self.assertFalse(t1 > t2) # noqa: H205 + self.assertFalse(t2 > t1) # noqa: H205 + self.assertFalse(t1 < t2) # noqa: H205 + self.assertFalse(t2 < t1) # noqa: H205 + + def test_comparison_equal_instant(self): + """Test the equal_instant method.""" + repo = self.get_repo() + + ts1 = pywikibot.Timestamp( + year=2023, month=12, day=21, hour=13, + tzinfo=datetime.timezone(datetime.timedelta(hours=-5))) + ts2 = pywikibot.Timestamp( + year=2023, month=12, day=21, hour=18, + tzinfo=datetime.timezone.utc) + ts3 = pywikibot.Timestamp( + year=2023, month=12, day=21, hour=19, + tzinfo=datetime.timezone(datetime.timedelta(hours=1))) + ts4 = pywikibot.Timestamp( + year=2023, month=12, day=21, hour=13, + tzinfo=datetime.timezone(datetime.timedelta(hours=-6))) + + self.assertEqual(ts1.timestamp(), ts2.timestamp()) + self.assertEqual(ts1.timestamp(), ts3.timestamp()) + self.assertEqual(ts2.timestamp(), ts3.timestamp()) + self.assertNotEqual(ts1.timestamp(), ts4.timestamp()) + self.assertNotEqual(ts2.timestamp(), ts4.timestamp()) + self.assertNotEqual(ts3.timestamp(), ts4.timestamp()) + + t1 = pywikibot.WbTime.fromTimestamp(ts1, timezone=-300, site=repo) + t2 = pywikibot.WbTime.fromTimestamp(ts2, timezone=0, site=repo) + t3 = pywikibot.WbTime.fromTimestamp(ts3, timezone=60, site=repo) + t4 = pywikibot.WbTime.fromTimestamp(ts4, timezone=-360, site=repo) + + self.assertTrue(t1.equal_instant(t2)) + self.assertTrue(t1.equal_instant(t3)) + self.assertTrue(t2.equal_instant(t3)) + self.assertFalse(t1.equal_instant(t4)) + self.assertFalse(t2.equal_instant(t4)) + self.assertFalse(t3.equal_instant(t4)) + class TestWbQuantity(WbRepresentationTestCase): -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/871017 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: Ibd771356ae457145b6613822f256aff782b23d62 Gerrit-Change-Number: 871017 Gerrit-PatchSet: 4 Gerrit-Owner: RPI2026F1 <sarkaraoyan+rpi2026f1(a)gmail.com> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

1 0

[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

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

Pywikibot-commits