Pywikibot-commits January 2023

pywikibot-commits@lists.wikimedia.org

1 participants
84 discussions

[Gerrit] ...core[master]: [PEP 263] Remove ignoring C103 after files are cleaned
by jenkins-bot (Code Review) 09 Jan '23

09 Jan '23

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/877150 ) Change subject: [PEP 263] Remove ignoring C103 after files are cleaned ...................................................................... [PEP 263] Remove ignoring C103 after files are cleaned Change-Id: I43ca47bd6e11344edaef40efe6598a10b6e5026c --- M tox.ini 1 file changed, 10 insertions(+), 2 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/tox.ini b/tox.ini index c9e5e54..a5f454b 100644 --- a/tox.ini +++ b/tox.ini @@ -131,7 +131,7 @@ # DARXXX: Darglint docstring issues to be solved -ignore = B007,C103,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 @@ -229,7 +229,6 @@ ignore_regex=:keyword # flake8-coding -# note: C103 can be removed from ignore if scripts are cleaned from coding part no-accept-encodings = true # pep8-naming -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/877150 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: I43ca47bd6e11344edaef40efe6598a10b6e5026c Gerrit-Change-Number: 877150 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] ...i18n[master]: Localisation updates from https://translatewiki.net.
by jenkins-bot (Code Review) 09 Jan '23

09 Jan '23

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/i18n/+/877153 ) Change subject: Localisation updates from https://translatewiki.net. ...................................................................... Localisation updates from https://translatewiki.net. Change-Id: I10ceeca2680f9be5b05a8216e594c3ec4a3f5919 --- M delete/sl.json 1 file changed, 10 insertions(+), 1 deletion(-) Approvals: L10n-bot: Looks good to me, approved jenkins-bot: Verified diff --git a/delete/sl.json b/delete/sl.json index d405a6a..146fcd5 100644 --- a/delete/sl.json +++ b/delete/sl.json @@ -6,7 +6,7 @@ ] }, "delete-from-category": "Robot: Brisanje vseh strani v kategoriji %(page)s", - "delete-from-file": "Robot: brisanje seznama strani.", + "delete-from-file": "Bot: Izbris seznama strani.", "delete-images": "Robot: Brisanje vseh slik na strani %(page)s", "delete-linked-pages": "Bot: Brisanje vseh strani, s katerimi se povezuje %(page)s", "delete-referring-pages": "Robot: Brisanje vseh strani, ki se povezujejo na %(page)s" -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/i18n/+/877153 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: I10ceeca2680f9be5b05a8216e594c3ec4a3f5919 Gerrit-Change-Number: 877153 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]: [flake8] Update flake8 requirements
by jenkins-bot (Code Review) 09 Jan '23

09 Jan '23

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/877119 ) Change subject: [flake8] Update flake8 requirements ...................................................................... [flake8] Update flake8 requirements Change-Id: I31592989355574a0d49289b1783d82ab65a29945 --- M setup.py 1 file changed, 18 insertions(+), 10 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/setup.py b/setup.py index 6b84ac6..961cec2 100755 --- a/setup.py +++ b/setup.py @@ -54,22 +54,21 @@ 'fake_useragent>1.0.1; python_version >= "3.7"', ], 'flake8': [ # Due to incompatibilities between packages the order matters. - 'flake8>=5.0.2', + 'flake8>=5.0.4', 'darglint', - 'pydocstyle>=4.0.0', - 'flake8-bugbear!=21.4.1,!=21.11.28', + 'pydocstyle>=6.2.3', + 'flake8-bugbear', 'flake8-coding', - '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-comprehensions', + 'flake8-docstrings>=1.4.0', + 'flake8-mock-x2', + 'flake8-print>=4.0.1', 'flake8-quotes>=3.3.2', 'flake8-string-format', - 'flake8-tuple>=0.2.8', + '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.12.1; python_version >= "3.7"', + 'pep8-naming>=0.13.3; python_version >= "3.7"', ], 'hacking': ['hacking'], } -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/877119 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: I31592989355574a0d49289b1783d82ab65a29945 Gerrit-Change-Number: 877119 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]: [flake8] hacking importlib-metadata dependency should be solved with v6
by jenkins-bot (Code Review) 09 Jan '23

09 Jan '23

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/877114 ) Change subject: [flake8] hacking importlib-metadata dependency should be solved with v6 ...................................................................... [flake8] hacking importlib-metadata dependency should be solved with v6 Bug: T323799 Change-Id: I09354155ce9ee179c61880d3495c52b99810dc63 --- M setup.py 1 file changed, 11 insertions(+), 6 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/setup.py b/setup.py index 6962be0..6b84ac6 100755 --- a/setup.py +++ b/setup.py @@ -71,12 +71,7 @@ 'pep8-naming>=0.12.1, <0.13.0; python_version < "3.7"', 'pep8-naming>=0.12.1; 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'], } -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/877114 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: I09354155ce9ee179c61880d3495c52b99810dc63 Gerrit-Change-Number: 877114 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]: [flake8] Use flake8 > 3.3.2
by jenkins-bot (Code Review) 09 Jan '23

09 Jan '23

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/877111 ) Change subject: [flake8] Use flake8 > 3.3.2 ...................................................................... [flake8] Use flake8 > 3.3.2 A new flake8-quotes version was released which solves imcompatibility with flake8 v6. Bug: T325197 Bug: T323752 Change-Id: I73bd312c2803105e359aae8605d4e0bb81f70b2c --- M setup.py 1 file changed, 15 insertions(+), 3 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/setup.py b/setup.py index e817c72..6962be0 100755 --- a/setup.py +++ b/setup.py @@ -64,9 +64,7 @@ '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-quotes>=3.3.2', 'flake8-string-format', 'flake8-tuple>=0.2.8', 'flake8-no-u-prefixed-strings>=0.2', -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/877111 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: I73bd312c2803105e359aae8605d4e0bb81f70b2c Gerrit-Change-Number: 877111 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]: [dependency] update python-stdnum dependency to the newest release
by jenkins-bot (Code Review) 09 Jan '23

09 Jan '23

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/877109 ) Change subject: [dependency] update python-stdnum dependency to the newest release ...................................................................... [dependency] update python-stdnum dependency to the newest release Change-Id: Ib6c1534975d124e24a0b987eb72eaecc5285e1b2 --- M setup.py M requirements.txt 2 files changed, 11 insertions(+), 2 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/requirements.txt b/requirements.txt index c4bc403..67bdf87 100644 --- a/requirements.txt +++ b/requirements.txt @@ -39,7 +39,7 @@ pydot >= 1.4.1 # cosmetic_changes -python-stdnum >= 1.17 +python-stdnum >= 1.18 # GUI Pillow >= 8.1.1 diff --git a/setup.py b/setup.py index b15942f..e817c72 100755 --- a/setup.py +++ b/setup.py @@ -39,7 +39,7 @@ extra_deps = { # Core library dependencies 'eventstreams': ['sseclient<0.0.23,>=0.0.18'], # T222885 - 'isbn': ['python-stdnum>=1.17'], + 'isbn': ['python-stdnum>=1.18'], 'Graphviz': ['pydot>=1.4.1'], 'Google': ['google>=1.7'], 'memento': ['memento_client==0.6.1'], -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/877109 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: Ib6c1534975d124e24a0b987eb72eaecc5285e1b2 Gerrit-Change-Number: 877109 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] Make mwparserfromhell mandatory
by jenkins-bot (Code Review) 09 Jan '23

09 Jan '23

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/876339 ) Change subject: [IMPR] Make mwparserfromhell mandatory ...................................................................... [IMPR] Make mwparserfromhell mandatory Require mwparserfromhell >= 0.6.3 which is preinstalled at Toolforge. Bug: T326498 Change-Id: Iaa95ea13b82fa106a5c34b03e82ff432c6b8f029 --- M pywikibot/textlib.py M README.rst M scripts/commons_information.py M .github/workflows/doctest.yml M setup.py M requirements.txt M tox.ini M scripts/patrol.py 8 files changed, 31 insertions(+), 69 deletions(-) Approvals: JJMC89: Looks good to me, approved jenkins-bot: Verified diff --git a/.github/workflows/doctest.yml b/.github/workflows/doctest.yml index 467c7fc..cdf1885 100644 --- a/.github/workflows/doctest.yml +++ b/.github/workflows/doctest.yml @@ -54,10 +54,10 @@ pip install -U setuptools pip install pytest pip install "sseclient<0.0.23,>=0.0.18" - pip install "mwparserfromhell>=0.5.0" + pip install mwparserfromhell pip install "PyMySQL >= 0.9.3" pip install codecov - pip install "coverage>=5.2.1" + pip install coverage python -c "import setuptools; print('setuptools:', setuptools.__version__)" - name: Generate user files diff --git a/README.rst b/README.rst index 8acdd16..eed4dc1 100644 --- a/README.rst +++ b/README.rst @@ -65,18 +65,6 @@ pip install pywikibot pwb <scriptname> -In addition a MediaWiki markup parser is required. Please install one of them: - -.. code:: text - - pip install mwparserfromhell - -or - -.. code:: text - - pip install wikitextparser - Our `installation guide <https://www.mediawiki.org/wiki/Manual:Pywikibot/Installation>`_ has more details for advanced usage. diff --git a/pywikibot/textlib.py b/pywikibot/textlib.py index 9d56f91..b3f4aa1 100644 --- a/pywikibot/textlib.py +++ b/pywikibot/textlib.py @@ -1,12 +1,10 @@ -""" -Functions for manipulating wiki-text. +"""Functions for manipulating wiki-text. -Unless otherwise noted, all functions take a unicode string as the argument -and return a unicode string. - +Unless otherwise noted, all functions take a unicode string as the +argument and return a unicode string. """ # -# (C) Pywikibot team, 2008-2022 +# (C) Pywikibot team, 2008-2023 # # Distributed under the terms of the MIT license. # @@ -34,24 +32,11 @@ ) from pywikibot.userinterfaces.transliteration import NON_LATIN_DIGITS - try: import wikitextparser except ImportError: - try: - import mwparserfromhell as wikitextparser - except ImportError: - # print required because pywikibot is not imported completely - raise ImportError(""" -Pywikibot is missing a MediaWiki markup parser which is necessary. -Please update the required module with either + import mwparserfromhell as wikitextparser - pip install "mwparserfromhell>=0.5.0" - -or - - pip install "wikitextparser>=0.47.5" -""") from None ETPType = List[Tuple[str, OrderedDictType[str, str]]] @@ -1672,8 +1657,8 @@ only the last value provided will be returned. This uses the package :py:obj:`mwparserfromhell` or - :py:obj:`wikitextparser` as MediaWiki markup parser. It is mandatory - that one of them is installed. + :py:obj:`wikitextparser` as MediaWiki markup parser. + ``mwparserfromhell`` is installed by default. There are minor differences between the two implementations. diff --git a/requirements.txt b/requirements.txt index 5b0d8a2..c4bc403 100644 --- a/requirements.txt +++ b/requirements.txt @@ -18,6 +18,7 @@ # $ awk -F '[#>=]' '{print $1}' requirements.txt | xargs apt-cache search # mandatory dependencies, others are optional +mwparserfromhell>=0.6.3 requests>=2.21.0, < 2.28.0; python_version < '3.7' requests>=2.21.0; python_version >= '3.7' setuptools>=48.0.0 ; python_version >= '3.10' @@ -25,10 +26,9 @@ setuptools>=40.8.0, <59.7.0 ; python_version < '3.7' # MediaWiki markup parser -# mwparserfromhell is default, wikitextparser can be used instead +# mwparserfromhell is mandatory but wikitextparser can be used instead # mwparserfromhell is still required for commons_information.py and patrol.py # wikitextparser>=0.47.5 -mwparserfromhell>=0.5.0 # OAuth support # mwoauth 0.2.4 is needed because it supports getting identity information diff --git a/scripts/commons_information.py b/scripts/commons_information.py index c98fca4..cd7f746 100755 --- a/scripts/commons_information.py +++ b/scripts/commons_information.py @@ -1,22 +1,18 @@ #!/usr/bin/python3 """Insert a language template into the description field.""" # -# (C) Pywikibot team, 2015-2022 +# (C) Pywikibot team, 2015-2023 # # Distributed under the terms of the MIT license. # import copy +import mwparserfromhell + import pywikibot from pywikibot import i18n, pagegenerators from pywikibot.bot import ExistingPageBot, SingleSiteBot - -try: - import mwparserfromhell -except ImportError as e: - mwparserfromhell = e - try: import langdetect except ImportError: @@ -101,11 +97,6 @@ rspaces = lstrip[len(lstrip.rstrip()):] param.value = f'{lspaces}{value}{rspaces}' - def setup(self): - """Raise exception if needed modules are missing.""" - if isinstance(mwparserfromhell, Exception): - raise mwparserfromhell - def treat_page(self) -> None: """Treat current page.""" page = self.current_page diff --git a/scripts/patrol.py b/scripts/patrol.py index e29c8b2..16e14f7 100755 --- a/scripts/patrol.py +++ b/scripts/patrol.py @@ -42,7 +42,7 @@ """ # -# (C) Pywikibot team, 2011-2022 +# (C) Pywikibot team, 2011-2023 # # Distributed under the terms of the MIT license. # @@ -50,16 +50,12 @@ from collections import defaultdict from contextlib import suppress +import mwparserfromhell + import pywikibot from pywikibot import pagegenerators from pywikibot.backports import Container, removeprefix -from pywikibot.bot import BaseBot, suggest_help - - -try: - import mwparserfromhell -except ImportError as e: - mwparserfromhell = e +from pywikibot.bot import BaseBot def verbose_output(string) -> None: @@ -447,10 +443,6 @@ else: recentchanges = True - if isinstance(mwparserfromhell, ImportError): - suggest_help(missing_dependencies=('mwparserfromhell',)) - return - if newpages or usercontribs: pywikibot.info('Newpages:') gen = site.newpages diff --git a/setup.py b/setup.py index 1c9edae..c6e6c80 100755 --- a/setup.py +++ b/setup.py @@ -43,7 +43,6 @@ 'Graphviz': ['pydot>=1.4.1'], 'Google': ['google>=1.7'], 'memento': ['memento_client==0.6.1'], - 'mwparserfromhell': ['mwparserfromhell>=0.5.0'], 'wikitextparser': ['wikitextparser>=0.47.0'], 'mysql': ['PyMySQL >= 0.9.3'], # toolforge # vulnerability found in Pillow<8.1.1 but toolforge uses 5.4.1 @@ -86,8 +85,6 @@ # ------- setup extra_requires for scripts ------- # script_deps = { 'create_isbn_edition.py': ['isbnlib', 'unidecode'], - 'commons_information.py': extra_deps['mwparserfromhell'], - 'patrol.py': extra_deps['mwparserfromhell'], 'weblinkchecker.py': extra_deps['memento'], } @@ -97,6 +94,7 @@ # ------- setup install_requires ------- # # packages which are mandatory dependencies = [ + 'mwparserfromhell>=0.6.3', 'requests>=2.21.0, <2.28.0; python_version < "3.7"', 'requests>=2.21.0; python_version>="3.7"', # PEP 440 @@ -104,7 +102,6 @@ 'setuptools>=40.8.0 ; python_version >= "3.7" and python_version < "3.10"', 'setuptools>=40.8.0, <59.7.0 ; python_version < "3.7"', ] -# in addition either mwparserfromhell or wikitextparser is required # ------- setup tests_require ------- # test_deps = ['mock'] diff --git a/tox.ini b/tox.ini index 4f85c2b..c9e5e54 100644 --- a/tox.ini +++ b/tox.ini @@ -52,14 +52,12 @@ fasttest: pytest-attrib>=0.1.3 fasttest: pytest-subtests >= 0.3.2 fasttest: mock - fasttest: .[mwparserfromhell] fasttest: .[scripts] fasttest-py36: .[html] fasttest-py37: .[wikitextparser] deeptest: .[html] - deeptest: .[mwparserfromhell] deeptest: .[scripts] deeptest-py39: .[wikitextparser] deeptest-py39: pytest >= 7.0.1 @@ -79,7 +77,6 @@ deps = pytest >= 7.0.1 .[eventstreams] - .[mwparserfromhell] .[mysql] [testenv:venv] -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/876339 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: Iaa95ea13b82fa106a5c34b03e82ff432c6b8f029 Gerrit-Change-Number: 876339 Gerrit-PatchSet: 7 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: D3r1ck01 <xsavitar.wiki(a)aol.com> Gerrit-Reviewer: JJMC89 <JJMC89.Wikimedia(a)gmail.com> Gerrit-Reviewer: Legoktm <legoktm(a)debian.org> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

1 0

[Gerrit] ...core[master]: [dep] Adjust dependencies to preinstalled Toolforge packages
by jenkins-bot (Code Review) 09 Jan '23

09 Jan '23

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/876343 ) Change subject: [dep] Adjust dependencies to preinstalled Toolforge packages ...................................................................... [dep] Adjust dependencies to preinstalled Toolforge packages - update dependency versions to preinstalled Toolforge packages except of PIL which is 5.4.1 on Toolforge but vulnerability found in Pillow<8.1.1 - also adjust fake_useragent dependency Change-Id: I8e7e6371a5e8261794177b3b68308afb3b1e242f --- M dev-requirements.txt M setup.py M requirements.txt 3 files changed, 34 insertions(+), 16 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/dev-requirements.txt b/dev-requirements.txt index 8f204bf..a444c00 100644 --- a/dev-requirements.txt +++ b/dev-requirements.txt @@ -11,7 +11,8 @@ # pytest-httpbin needs httpbin needs werkzeug >= 0.14.1 # Python 3.8 needs werkzeug >= 0.15.5 # httpbin 0.7 fails with werkzeug 2.1.0/1 (T305124) -werkzeug>=0.15.5, <2.1.0 +werkzeug>=0.14.1, <2.1.0; python_version<"3.8" +werkzeug>=0.15.5, <2.1.0; python_version>="3.8" pytest-httpbin diff --git a/requirements.txt b/requirements.txt index 862c1cf..5b0d8a2 100644 --- a/requirements.txt +++ b/requirements.txt @@ -18,11 +18,11 @@ # $ awk -F '[#>=]' '{print $1}' requirements.txt | xargs apt-cache search # mandatory dependencies, others are optional -requests>=2.20.1, < 2.28.0; python_version < '3.7' -requests>=2.20.1; python_version >= '3.7' +requests>=2.21.0, < 2.28.0; python_version < '3.7' +requests>=2.21.0; python_version >= '3.7' setuptools>=48.0.0 ; python_version >= '3.10' -setuptools>=38.5.2 ; python_version >= '3.7' and python_version < '3.10' -setuptools>=20.8.1, <59.7.0 ; python_version < '3.7' +setuptools>=40.8.0 ; python_version >= '3.7' and python_version < '3.10' +setuptools>=40.8.0, <59.7.0 ; python_version < '3.7' # MediaWiki markup parser # mwparserfromhell is default, wikitextparser can be used instead @@ -35,8 +35,8 @@ # about the user mwoauth>=0.2.4,!=0.3.1 -# core interwiki_graph.py: -pydot >= 1.2 +# interwiki_graph.py module and category_graph.py script: +pydot >= 1.4.1 # cosmetic_changes python-stdnum >= 1.17 @@ -53,7 +53,7 @@ PyMySQL >= 0.9.3 # core HTML comparison parser in diff module -beautifulsoup4 +beautifulsoup4>=4.7.1 # scripts/weblinkchecker.py memento_client==0.6.1 diff --git a/setup.py b/setup.py index aac66f2..1c9edae 100755 --- a/setup.py +++ b/setup.py @@ -20,7 +20,7 @@ .. warning: do not upload a development release to pypi. """ # -# (C) Pywikibot team, 2009-2022 +# (C) Pywikibot team, 2009-2023 # # Distributed under the terms of the MIT license. # @@ -40,7 +40,7 @@ # Core library dependencies 'eventstreams': ['sseclient<0.0.23,>=0.0.18'], # T222885 'isbn': ['python-stdnum>=1.17'], - 'Graphviz': ['pydot>=1.2'], + 'Graphviz': ['pydot>=1.4.1'], 'Google': ['google>=1.7'], 'memento': ['memento_client==0.6.1'], 'mwparserfromhell': ['mwparserfromhell>=0.5.0'], @@ -49,8 +49,11 @@ # 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'], - 'html': ['BeautifulSoup4'], - 'http': ['fake_useragent'], + 'html': ['beautifulsoup4>=4.7.1'], + 'http': [ + 'fake_useragent<0.1.14; python_version < "3.7"', + 'fake_useragent>1.0.1; python_version >= "3.7"', + ], 'flake8': [ # Due to incompatibilities between packages the order matters. 'flake8>=5.0.2', 'darglint', @@ -94,12 +97,12 @@ # ------- setup install_requires ------- # # packages which are mandatory dependencies = [ - 'requests>=2.20.1, <2.28.0; python_version < "3.7"', - 'requests>=2.20.1; python_version>="3.7"', + 'requests>=2.21.0, <2.28.0; python_version < "3.7"', + 'requests>=2.21.0; python_version>="3.7"', # PEP 440 'setuptools>=48.0.0 ; python_version >= "3.10"', - 'setuptools>=38.5.2 ; python_version >= "3.7" and python_version < "3.10"', - 'setuptools>=20.8.1, <59.7.0 ; python_version < "3.7"', + 'setuptools>=40.8.0 ; python_version >= "3.7" and python_version < "3.10"', + 'setuptools>=40.8.0, <59.7.0 ; python_version < "3.7"', ] # in addition either mwparserfromhell or wikitextparser is required -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/876343 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: I8e7e6371a5e8261794177b3b68308afb3b1e242f Gerrit-Change-Number: 876343 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]: [bugfix] Fix Claim.__repr__ for stub instances
by jenkins-bot (Code Review) 09 Jan '23

09 Jan '23

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/876354 ) Change subject: [bugfix] Fix Claim.__repr__ for stub instances ...................................................................... [bugfix] Fix Claim.__repr__ for stub instances Bug: T326453 Change-Id: Ib48870a8c4f9f24416f9843fd59d35230a9fdf64 --- M pywikibot/page/_wikibase.py 1 file changed, 15 insertions(+), 2 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/page/_wikibase.py b/pywikibot/page/_wikibase.py index a8640d6..405af2b 100644 --- a/pywikibot/page/_wikibase.py +++ b/pywikibot/page/_wikibase.py @@ -1458,8 +1458,11 @@ def __repr__(self) -> str: """Return the representation string.""" - return '{cls_name}.fromJSON({}, {})'.format( - repr(self.repo), self.toJSON(), cls_name=type(self).__name__) + cls_name = type(self).__name__ + if self.target: + return f'{cls_name}.fromJSON({self.repo!r}, {self.toJSON()})' + else: + return f'{cls_name}({self.repo!r}, {self.id!r})' def __eq__(self, other): if not isinstance(other, self.__class__): -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/876354 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: Ib48870a8c4f9f24416f9843fd59d35230a9fdf64 Gerrit-Change-Number: 876354 Gerrit-PatchSet: 1 Gerrit-Owner: Matěj Suchánek <matejsuchanek97(a)gmail.com> Gerrit-Reviewer: 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]: [doc] Update ROADMAP.rst and HISTORY.rst
by Xqt (Code Review) 08 Jan '23

08 Jan '23

Xqt has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/876353 ) Change subject: [doc] Update ROADMAP.rst and HISTORY.rst ...................................................................... [doc] Update ROADMAP.rst and HISTORY.rst Change-Id: Ifa1e0cd388aa0d7a1854f4d16faffd927c7569e6 --- M ROADMAP.rst M HISTORY.rst 2 files changed, 20 insertions(+), 0 deletions(-) Approvals: Xqt: Verified; Looks good to me, approved diff --git a/HISTORY.rst b/HISTORY.rst index 694c539..dfa92df 100644 --- a/HISTORY.rst +++ b/HISTORY.rst @@ -1,6 +1,13 @@ Release history =============== +7.7.3 +----- +*08 January 2023* + +* Add support for shn-wikibooks, as quote, guw quote, got-wikt families + (:phab:`T148280`, :phab:`T326141`, :phab:`T321285`, :phab:`T321297`) + 7.7.2 ----- *03 December 2022* diff --git a/ROADMAP.rst b/ROADMAP.rst index e184105..31eba69 100644 --- a/ROADMAP.rst +++ b/ROADMAP.rst @@ -4,6 +4,8 @@ Improvements ^^^^^^^^^^^^ +* 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` @@ -50,6 +52,8 @@ Bugfixes ^^^^^^^^ +* 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` -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/876353 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: Ifa1e0cd388aa0d7a1854f4d16faffd927c7569e6 Gerrit-Change-Number: 876353 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

← Newer
1
2
3
4
5
6
7
8
9
Older →

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

Pywikibot-commits January 2023