Pywikibot-commits December 2024

pywikibot-commits@lists.wikimedia.org

1 participants
114 discussions

[Gerrit] ...core[master]: Tests: Update CI tests
by Xqt (Code Review) 03 Dec '24

03 Dec '24

Xqt has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/1100180?usp=email ) Change subject: Tests: Update CI tests ...................................................................... Tests: Update CI tests Change-Id: I953dbe221ce0397269c837aa8b27af261a438523 Signed-off-by: Xqt <info(a)gno.de> --- M tox.ini 1 file changed, 1 insertion(+), 3 deletions(-) Approvals: Xqt: Verified; Looks good to me, approved jenkins-bot: Verified diff --git a/tox.ini b/tox.ini index 8c4dd0b..c6ba50f 100644 --- a/tox.ini +++ b/tox.ini @@ -14,8 +14,6 @@ [testenv] basepython = - # use Python 3.8 with py37 to until config is updated upstream - py37: python3.8 py38: python3.8 py39: python3.9 py310: python3.10 @@ -38,7 +36,7 @@ lint: pre-commit run --all-files --show-diff-on-failure deeptest: python {[params]generate_user_files} - deeptest-py37: python -m unittest discover -vv -p "*_tests.py" + deeptest-py38: python -m unittest discover -vv -p "*_tests.py" deeptest-py312: pytest fasttest: python {[params]generate_user_files} -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/1100180?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.wikimedia.org/r/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Change-Id: I953dbe221ce0397269c837aa8b27af261a438523 Gerrit-Change-Number: 1100180 Gerrit-PatchSet: 2 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot

1 0

[Gerrit] ...core[master]: cleanup: remove deprecated RedirectPageBot and NoRedirectPageBot
by jenkins-bot (Code Review) 03 Dec '24

03 Dec '24

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/1100143?usp=email ) Change subject: cleanup: remove deprecated RedirectPageBot and NoRedirectPageBot ...................................................................... cleanup: remove deprecated RedirectPageBot and NoRedirectPageBot Change-Id: I550b8b068c241db39285460928a4380e0e02fb93 --- M ROADMAP.rst M pywikibot/bot.py 2 files changed, 8 insertions(+), 59 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/ROADMAP.rst b/ROADMAP.rst index 756468c..d151e04 100644 --- a/ROADMAP.rst +++ b/ROADMAP.rst @@ -11,6 +11,8 @@ **Breaking changes and code cleanups** +* 7.2.0: RedirectPageBot and NoRedirectPageBot bot classes were removed in favour of + :attr:`use_redirects<bot.BaseBot.use_redirects>` attribute * Python 3.7 support was dropped (:phab:`T378893`) @@ -95,8 +97,6 @@ * 7.2.0: ``tb`` parameter of :func:`exception()<pywikibot.logging.exception>` function was renamed to ``exc_info`` * 7.2.0: XMLDumpOldPageGenerator is deprecated in favour of a ``content`` parameter of :func:`XMLDumpPageGenerator<pagegenerators.XMLDumpPageGenerator>` (:phab:`T306134`) -* 7.2.0: RedirectPageBot and NoRedirectPageBot bot classes are deprecated in favour of - :attr:`use_redirects<bot.BaseBot.use_redirects>` attribute * 7.2.0: :func:`tools.formatter.color_format<tools.formatter.color_format>` is deprecated and will be removed * 7.1.0: Unused ``get_redirect`` parameter of :meth:`Page.getOldVersion()<page.BasePage.getOldVersion>` will be removed * 7.0.0: User.isBlocked() method is renamed to is_blocked for consistency diff --git a/pywikibot/bot.py b/pywikibot/bot.py index 6e9efa8..952848e 100644 --- a/pywikibot/bot.py +++ b/pywikibot/bot.py @@ -55,11 +55,6 @@ subclasses :class:`CurrentPageBot` and automatically defines the summary when :meth:`put_current` is used. -.. deprecated:: 7.2 - The bot classes :class:`RedirectPageBot` and - :class:`NoRedirectPageBot` are deprecated. Use - :attr:`use_redirects<BaseBot.use_redirects>` attribute instead. - .. deprecated:: 9.2 The functions :func:`critical()<pywikibot.logging.critical>` @@ -78,6 +73,11 @@ and ``WARNING`` imported from :mod:`logging` module are deprecated within this module. Import them directly. These functions can also be used as :mod:`pywikibot` members. + +.. versionremoved:: 10.0 + The bot classes :class:`RedirectPageBot` and + :class:`NoRedirectPageBot` are deprecated. Use + :attr:`use_redirects<BaseBot.use_redirects>` attribute instead. """ # # (C) Pywikibot team, 2008-2024 @@ -105,7 +105,6 @@ 'BaseBot', 'Bot', 'ConfigParserBot', 'SingleSiteBot', 'MultipleSitesBot', 'CurrentPageBot', 'AutomaticTWSummaryBot', 'ExistingPageBot', 'FollowRedirectPageBot', 'CreatingPageBot', - 'RedirectPageBot', 'NoRedirectPageBot', 'WikidataBot', ) @@ -189,7 +188,7 @@ from pywikibot.logging import stdout as _stdout from pywikibot.logging import warning as _warning from pywikibot.throttle import Throttle -from pywikibot.tools import issue_deprecation_warning, redirect_func, strtobool +from pywikibot.tools import redirect_func, strtobool from pywikibot.tools._logging import LoggingFormatter @@ -1937,56 +1936,6 @@ return super().skip_page(page) -class RedirectPageBot(CurrentPageBot): # pragma: no cover - - """A RedirectPageBot class which only treats redirects. - - .. deprecated:: 7.2 - use BaseBot attribute - :attr:`use_redirects = True<BaseBot.use_redirects>` instead - """ - - def __init__(self, *args, **kwargs): - """Deprecate RedirectPageBot.""" - issue_deprecation_warning('RedirectPageBot', - "BaseBot attribute 'use_redirects = True'", - since='7.2.0') - super().__init__(*args, **kwargs) - - def skip_page(self, page: pywikibot.page.BasePage) -> bool: - """Treat only redirect pages and handle IsNotRedirectPageError.""" - if not page.isRedirectPage(): - _warning(f'Page {page} on {page.site} is skipped because it is' - ' not a redirect') - return True - return super().skip_page(page) - - -class NoRedirectPageBot(CurrentPageBot): # pragma: no cover - - """A NoRedirectPageBot class which only treats non-redirects. - - .. deprecated:: 7.2 - use BaseBot attribute - :attr:`use_redirects = False<BaseBot.use_redirects>` instead - """ - - def __init__(self, *args, **kwargs): - """Deprecate NoRedirectPageBot.""" - issue_deprecation_warning('NoRedirectPageBot', - "BaseBot attribute 'use_redirects = False'", - since='7.2.0') - super().__init__(*args, **kwargs) - - def skip_page(self, page: pywikibot.page.BasePage) -> bool: - """Treat only non-redirect pages and handle IsRedirectPageError.""" - if page.isRedirectPage(): - _warning(f'Page {page} on {page.site} is skipped because it is' - ' a redirect') - return True - return super().skip_page(page) - - class WikidataBot(Bot, ExistingPageBot): """Generic Wikidata Bot to be subclassed. -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/1100143?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.wikimedia.org/r/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Change-Id: I550b8b068c241db39285460928a4380e0e02fb93 Gerrit-Change-Number: 1100143 Gerrit-PatchSet: 2 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot

1 0

[Gerrit] ...core[master]: IMPR: use self-documenting expressions with f-strings
by jenkins-bot (Code Review) 03 Dec '24

03 Dec '24

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/1100139?usp=email ) Change subject: IMPR: use self-documenting expressions with f-strings ...................................................................... IMPR: use self-documenting expressions with f-strings Bug: T379062 Change-Id: I5f13757c6ed22892047d1f4a3fce36ad3bd3b563 --- M pywikibot/comms/http.py M pywikibot/family.py M pywikibot/proofreadpage.py M pywikibot/site/_generators.py M scripts/pyproject.toml M scripts/reflinks.py 6 files changed, 11 insertions(+), 11 deletions(-) Approvals: jenkins-bot: Verified Xqt: Looks good to me, approved diff --git a/pywikibot/comms/http.py b/pywikibot/comms/http.py index 71345d6..67a89d3 100644 --- a/pywikibot/comms/http.py +++ b/pywikibot/comms/http.py @@ -400,7 +400,7 @@ if use_fake_user_agent and isinstance(use_fake_user_agent, str): return use_fake_user_agent # Custom UA. raise ValueError('Invalid parameter: ' - f'use_fake_user_agent={use_fake_user_agent}') + f'{use_fake_user_agent=!s}') def assign_user_agent(user_agent_format_string): if not user_agent_format_string or '{' in user_agent_format_string: diff --git a/pywikibot/family.py b/pywikibot/family.py index b96bf14..43d569d 100644 --- a/pywikibot/family.py +++ b/pywikibot/family.py @@ -574,7 +574,7 @@ def get_address(self, code, title) -> str: """Return the path to title using index.php with redirects disabled.""" - return f'{self.path(code)}?title={title}&redirect=no' + return f'{self.path(code)}?{title=!s}&redirect=no' def interface(self, code: str) -> str: """Return interface to use for code.""" diff --git a/pywikibot/proofreadpage.py b/pywikibot/proofreadpage.py index a452603..502d9e4 100644 --- a/pywikibot/proofreadpage.py +++ b/pywikibot/proofreadpage.py @@ -133,14 +133,14 @@ def _convert(self, value): """Handle conversion from str to int and quotes.""" if not isinstance(value, (str, int)): - raise TypeError(f'value={value} must be str or int.') + raise TypeError(f'{value=!s} must be str or int.') self._orig_value = value if isinstance(value, str): if (value.startswith('"') != value.endswith('"') or value.startswith("'") != value.endswith("'")): - raise ValueError(f'value={value} has wrong quotes.') + raise ValueError(f'{value=!s} has wrong quotes.') value = value.strip('"\'') value = int(value) if value.isdigit() else value @@ -288,7 +288,7 @@ """Initializer.""" m = self.pat_tag.search(text) if m is None: - raise ValueError(f'Invalid text={text}') + raise ValueError(f'Invalid {text=!s}') tag = m['attrs'] matches = list(self.pat_attr.finditer(tag)) @@ -1270,7 +1270,7 @@ end = self.num_pages if not 1 <= start <= end <= self.num_pages: - raise ValueError(f'start={start}, end={end} are not in valid ' + raise ValueError(f'{start=!s}, {end=!s} are not in valid ' f'range (1, {self.num_pages})') # All but 'Without Text' diff --git a/pywikibot/site/_generators.py b/pywikibot/site/_generators.py index 8f5c7f7..145430f 100644 --- a/pywikibot/site/_generators.py +++ b/pywikibot/site/_generators.py @@ -221,7 +221,7 @@ except KeyError: pywikibot.debug(f"No 'title' in {pagedata}") - pywikibot.debug(f'pageids={pageids}') + pywikibot.debug(f'{pageids=!s}') pywikibot.debug(f'titles={list(cache.keys())}') continue diff --git a/scripts/pyproject.toml b/scripts/pyproject.toml index 9dccc93..cfe050b 100644 --- a/scripts/pyproject.toml +++ b/scripts/pyproject.toml @@ -17,7 +17,7 @@ ] description = "Pywikibot Scripts Collection" readme = "scripts/README.rst" -requires-python = ">=3.7.0" +requires-python = ">=3.8.0" dependencies = [ "pywikibot >= 9.4.0", "isbnlib", diff --git a/scripts/reflinks.py b/scripts/reflinks.py index 2f7f10e..5d14b93 100755 --- a/scripts/reflinks.py +++ b/scripts/reflinks.py @@ -391,7 +391,7 @@ elif v[IX.quoted]: name = f'"{name}"' - named = f'<ref {group}name={name}>{ref}</ref>' + named = f'<ref {group}{name=!s}>{ref}</ref>' text = text.replace(v[IX.reflist][0], named, 1) # make sure that the first (named ref) is not removed later @@ -400,7 +400,7 @@ end = text[pos:] # replace multiple identical references with repeated ref - repeated_ref = f'<ref {group}name={name} />' + repeated_ref = f'<ref {group}{name=!s} />' for ref in v[IX.reflist][1:]: # Don't replace inside templates (T266411) end = replaceExcept(end, re.escape(ref), repeated_ref, @@ -415,7 +415,7 @@ name = f'"{name}"' text = re.sub(rf'<ref name\s*=\s*(?P<quote>["\']?)\s*{ref}\s*' - r'(?P=quote)\s*/>', f'<ref name={name} />', text) + r'(?P=quote)\s*/>', f'<ref {name=!s} />', text) return text -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/1100139?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.wikimedia.org/r/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Change-Id: I5f13757c6ed22892047d1f4a3fce36ad3bd3b563 Gerrit-Change-Number: 1100139 Gerrit-PatchSet: 1 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot

1 0

[Gerrit] ...core[master]: pwb 10: drop support for Python 3.7 in time module
by Xqt (Code Review) 03 Dec '24

03 Dec '24

Xqt has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/1100130?usp=email ) Change subject: pwb 10: drop support for Python 3.7 in time module ...................................................................... pwb 10: drop support for Python 3.7 in time module Bug: T378893 Change-Id: Iee79c015f2ab6fd9072aabd6446ac0d4ac40b7c8 --- M pywikibot/time.py 1 file changed, 2 insertions(+), 71 deletions(-) Approvals: Xqt: Verified; Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/time.py b/pywikibot/time.py index e8910c8..b749710 100644 --- a/pywikibot/time.py +++ b/pywikibot/time.py @@ -15,15 +15,9 @@ import time as _time import types from contextlib import suppress -from typing import overload import pywikibot -from pywikibot.tools import ( - PYTHON_VERSION, - SPHINX_RUNNING, - classproperty, - deprecated, -) +from pywikibot.tools import PYTHON_VERSION, classproperty, deprecated __all__ = ( @@ -176,7 +170,7 @@ ts = cls.strptime(strpstr, strpfmt) if ts.tzinfo is not None: ts = ts.astimezone(datetime.timezone.utc).replace(tzinfo=None) - # why pytest in py35/py37 fails without this? + # TODO: why pytest in py37 fails without this? ts = cls._from_datetime(ts) return ts @@ -436,69 +430,6 @@ return super().utcnow() return cls.nowutc(with_tz=False) - if PYTHON_VERSION < (3, 8) or SPHINX_RUNNING: - # methods which does not upcast the right class but return a - # datetime.datetime object in Python 3.7 - - def __add__(self, other: datetime.timedelta) -> Timestamp: - """Perform addition, returning a Timestamp instead of datetime.""" - newdt = super().__add__(other) - if isinstance(newdt, datetime.datetime): - return self._from_datetime(newdt) - return newdt - - @overload # type: ignore[override] - def __sub__(self, other: datetime.timedelta) -> Timestamp: - ... - - @overload - def __sub__(self, other: datetime.datetime) -> datetime.timedelta: - ... - - def __sub__( - self, - other: datetime.datetime | datetime.timedelta, - ) -> datetime.timedelta | Timestamp: - """Perform subtraction, returning Timestamp instead of datetime.""" - newdt = super().__sub__(other) # type: ignore[operator] - if isinstance(newdt, datetime.datetime): - return self._from_datetime(newdt) - return newdt - - @classmethod - def fromtimestamp(cls, timestamp: int | float, tz=None) -> Timestamp: - """Return the local date and time corresponding to the POSIX ts. - - This class method is for Python 3.7 to upcast the class if a - tz is given. - - .. versionadded:: 9.0 - .. seealso:: - - :python:`datetime.fromtimestamp() - <library/datetime.html#datetime.datetime.fromtimestamp>` - """ - ts = super().fromtimestamp(timestamp, tz) - if tz: - ts = cls.set_timestamp(ts) - return ts - - @classmethod - def now(cls, tz=None) -> Timestamp: - """Return the current local date and time. - - This class method is for Python 3.7 to upcast the class if a - *tz* is given. - - .. versionadded:: 9.0 - .. seealso:: - - :python:`datetime.now() - <library/datetime.html#datetime.datetime.now>` - """ - ts = super().now(tz) - if tz: - ts = cls.set_timestamp(ts) - return ts - class TZoneFixedOffset(datetime.tzinfo): -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/1100130?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.wikimedia.org/r/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Change-Id: Iee79c015f2ab6fd9072aabd6446ac0d4ac40b7c8 Gerrit-Change-Number: 1100130 Gerrit-PatchSet: 1 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot

1 0

[Gerrit] ...core[master]: pwb 10: drop support for Python 3.7
by Xqt (Code Review) 03 Dec '24

03 Dec '24

Xqt has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/1100127?usp=email ) Change subject: pwb 10: drop support for Python 3.7 ...................................................................... pwb 10: drop support for Python 3.7 Bug: T378893 Change-Id: Iec00194b97abe7f89d7fc49db233346f198b38b5 --- M HISTORY.rst M ROADMAP.rst M docs/index.rst M pwb.py M pyproject.toml M pywikibot/README.rst M pywikibot/backports.py M pywikibot/userinterfaces/gui.py M requirements.txt M setup.py 10 files changed, 36 insertions(+), 39 deletions(-) Approvals: jenkins-bot: Verified Xqt: Verified; Looks good to me, approved diff --git a/HISTORY.rst b/HISTORY.rst index 186f92f..b0a5618 100644 --- a/HISTORY.rst +++ b/HISTORY.rst @@ -3,6 +3,7 @@ 9.6.0 ----- +*03 December 2024* * Add support for idwikivoyage (:phab:`T381082`) * Add docstrings of :class:`tools.classproperty` methods (:phab:`T380628`) diff --git a/ROADMAP.rst b/ROADMAP.rst index a2b2b64..756468c 100644 --- a/ROADMAP.rst +++ b/ROADMAP.rst @@ -1,8 +1,19 @@ Current Release Changes ======================= +**Improvements** + * (no changes yet) +**Bugfixes** + +* (no changes yet) + +**Breaking changes and code cleanups** + +* Python 3.7 support was dropped (:phab:`T378893`) + + Current Deprecations ==================== @@ -35,6 +46,10 @@ * 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 + +Pending removal in Pywikibot 11 +------------------------------- + * 8.4.0: *modules_only_mode* parameter of :class:`data.api.ParamInfo`, its *paraminfo_keys* class attribute and its preloaded_modules property will be removed * 8.4.0: *dropdelay* and *releasepid* attributes of :class:`throttle.Throttle` will be removed @@ -65,7 +80,6 @@ Pending removal in Pywikibot 10 ------------------------------- -* 9.6.0: Python 3.7 support is deprecated and will be dropped with Pywikibot 10 * 9.1.0: :func:`version.svn_rev_info` and :func:`version.getversion_svn` will be removed. SVN is no longer supported. (:phab:`T362484`) * 7.7.0: :mod:`tools.threading` classes should no longer imported from :mod:`tools` diff --git a/docs/index.rst b/docs/index.rst index ea1163c..228bc7b 100644 --- a/docs/index.rst +++ b/docs/index.rst @@ -21,8 +21,7 @@ whether you have Python installed and to find its version, just type ``python`` at the CMD or shell prompt. -Python 3.7 or higher is currently required to run the bot but Python 3.8 or -higher is recommended. Python 3.7 support will be dropped with Pywikibot 10 soon. +Python 3.8 or higher is currently required to run. Pywikibot and this documentation are licensed under the :ref:`MIT license`; diff --git a/pwb.py b/pwb.py index 809af16..077d9a3 100755 --- a/pwb.py +++ b/pwb.py @@ -4,7 +4,7 @@ .. versionadded:: 8.0 """ # -# (C) Pywikibot team, 2022 +# (C) Pywikibot team, 2022-2024 # # Distributed under the terms of the MIT license. # @@ -16,13 +16,13 @@ Pywikibot is not available on: {version} -This version of Pywikibot only supports Python 3.7+. +This version of Pywikibot only supports Python 3.8+. """ def python_is_supported(): """Check that Python is supported.""" - return sys.version_info[:3] >= (3, 7) + return sys.version_info[:3] >= (3, 8) if not python_is_supported(): # pragma: no cover diff --git a/pyproject.toml b/pyproject.toml index df9b092..4f2613b 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -17,7 +17,7 @@ {name = "The Pywikibot team", email = "pywikibot(a)lists.wikimedia.org"}, ] description = "Python MediaWiki Bot Framework" -requires-python = ">=3.7.0" +requires-python = ">=3.8.0" keywords = [ "API", "bot", "client", "framework", "mediawiki", "pwb", "pybot", "python", "pywiki", "pywikibase", "pywikibot", "pywikipedia", "pywikipediabot", @@ -92,7 +92,6 @@ "Programming Language :: Python", "Programming Language :: Python :: 3", "Programming Language :: Python :: 3 :: Only", - "Programming Language :: Python :: 3.7", "Programming Language :: Python :: 3.8", "Programming Language :: Python :: 3.9", "Programming Language :: Python :: 3.10", @@ -171,7 +170,7 @@ [tool.isort] -py_version = 37 +py_version = 38 add_imports = ["from __future__ import annotations"] atomic = true ensure_newline_before_comments = true @@ -183,7 +182,7 @@ [tool.mypy] -python_version = 3.7 +python_version = 3.8 enable_error_code = [ "ignore-without-code", ] diff --git a/pywikibot/README.rst b/pywikibot/README.rst index 4e90b04..0de4358 100644 --- a/pywikibot/README.rst +++ b/pywikibot/README.rst @@ -27,7 +27,7 @@ * python-tkinter (optional, used by some experimental GUI stuff) -You need to have at least Python version `3.7 <https://www.python.org/downloads/>`_ +You need to have at least Python version `3.8 <https://www.python.org/downloads/>`_ or newer installed on your computer to be able to run any of the code in this package. Please refer the manual at mediawiki for further details and restrictions. diff --git a/pywikibot/backports.py b/pywikibot/backports.py index 901f315..986786b 100644 --- a/pywikibot/backports.py +++ b/pywikibot/backports.py @@ -36,9 +36,7 @@ ) -if PYTHON_VERSION < (3, 7, 2): - from typing import Dict as OrderedDict -elif PYTHON_VERSION < (3, 9): +if PYTHON_VERSION < (3, 9): from typing import OrderedDict else: from collections import OrderedDict diff --git a/pywikibot/userinterfaces/gui.py b/pywikibot/userinterfaces/gui.py index 64bcbcf..9091044 100644 --- a/pywikibot/userinterfaces/gui.py +++ b/pywikibot/userinterfaces/gui.py @@ -20,7 +20,6 @@ from __future__ import annotations import pywikibot -from pywikibot.tools import PYTHON_VERSION # Some Python distributions have tkinter but the underlying _tkinter @@ -93,28 +92,17 @@ 'width': idleConf.GetOption('main', 'EditorWindow', 'width'), 'height': idleConf.GetOption('main', 'EditorWindow', 'height'), } - if PYTHON_VERSION >= (3, 7, 4): # T241216 - config['foreground'] = idleConf.GetHighlight( - theme, 'normal')['foreground'] - config['background'] = idleConf.GetHighlight( - theme, 'normal')['background'] - config['highlightcolor'] = idleConf.GetHighlight( - theme, 'hilite')['foreground'] - config['highlightbackground'] = idleConf.GetHighlight( - theme, 'hilite')['background'] - config['insertbackground'] = idleConf.GetHighlight( - theme, 'cursor')['foreground'] - else: - config['foreground'] = idleConf.GetHighlight( - theme, 'normal', fgBg='fg') - config['background'] = idleConf.GetHighlight( - theme, 'normal', fgBg='bg') - config['highlightcolor'] = idleConf.GetHighlight( - theme, 'hilite', fgBg='fg') - config['highlightbackground'] = idleConf.GetHighlight( - theme, 'hilite', fgBg='bg') - config['insertbackground'] = idleConf.GetHighlight( - theme, 'cursor', fgBg='fg') + + config['foreground'] = idleConf.GetHighlight( + theme, 'normal')['foreground'] + config['background'] = idleConf.GetHighlight( + theme, 'normal')['background'] + config['highlightcolor'] = idleConf.GetHighlight( + theme, 'hilite')['foreground'] + config['highlightbackground'] = idleConf.GetHighlight( + theme, 'hilite')['background'] + config['insertbackground'] = idleConf.GetHighlight( + theme, 'cursor')['foreground'] return config def add_bindings(self) -> None: diff --git a/requirements.txt b/requirements.txt index 4193d61..41d2834 100644 --- a/requirements.txt +++ b/requirements.txt @@ -18,7 +18,6 @@ # $ 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 diff --git a/setup.py b/setup.py index 3f3953e..f360bf8 100755 --- a/setup.py +++ b/setup.py @@ -70,7 +70,6 @@ # ------- setup install_requires ------- # # packages which are mandatory dependencies = [ - 'importlib_metadata ; python_version < "3.8"', 'mwparserfromhell>=0.5.2', 'packaging', 'requests>=2.21.0', -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/1100127?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.wikimedia.org/r/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Change-Id: Iec00194b97abe7f89d7fc49db233346f198b38b5 Gerrit-Change-Number: 1100127 Gerrit-PatchSet: 3 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot

1 0

[Gerrit] ...core[master]: tests: run commit-message with Python 3.8 instead of Python 3.7.17
by Xqt (Code Review) 03 Dec '24

03 Dec '24

Xqt has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/1100134?usp=email ) Change subject: tests: run commit-message with Python 3.8 instead of Python 3.7.17 ...................................................................... tests: run commit-message with Python 3.8 instead of Python 3.7.17 Pywikibot package requires Python>=3.8. Keeping basepython = python3 isntalls Python 3.7.17 and the commit-message-validator will fail with ERROR: Package 'pywikibot' requires a different Python: 3.7.17 not in '>=3.8.0' Change-Id: Ie1976c1fe5941913eeb30ec2b0f1d71d676401bd --- M tox.ini 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Xqt: Verified; Looks good to me, approved diff --git a/tox.ini b/tox.ini index 8c4dd0b..2b21903 100644 --- a/tox.ini +++ b/tox.ini @@ -70,7 +70,7 @@ pytest --mypy -m mypy pywikibot [testenv:commit-message] -basepython = python3 +basepython = python3.8 deps = commit-message-validator commands = commit-message-validator -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/1100134?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.wikimedia.org/r/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Change-Id: Ie1976c1fe5941913eeb30ec2b0f1d71d676401bd Gerrit-Change-Number: 1100134 Gerrit-PatchSet: 2 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot

1 0

[Gerrit] ...core[master]: tests: update pre-commit
by Xqt (Code Review) 03 Dec '24

03 Dec '24

Xqt has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/1100118?usp=email ) Change subject: tests: update pre-commit ...................................................................... tests: update pre-commit Change-Id: I8e7eeb9710f469052f643bec7c8a5571e4aa313f --- M .pre-commit-config.yaml 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: Xqt: Verified; Looks good to me, approved jenkins-bot: Verified diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 536482a..93b1710 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -50,7 +50,7 @@ - id: python-check-mock-methods - id: python-use-type-annotations - repo: https://github.com/astral-sh/ruff-pre-commit - rev: v0.8.0 + rev: v0.8.1 hooks: - id: ruff args: @@ -60,7 +60,7 @@ hooks: - id: pyupgrade args: - - --py37-plus + - --py38-plus - repo: https://github.com/PyCQA/autoflake rev: v2.3.1 hooks: -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/1100118?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.wikimedia.org/r/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Change-Id: I8e7eeb9710f469052f643bec7c8a5571e4aa313f Gerrit-Change-Number: 1100118 Gerrit-PatchSet: 1 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot

1 0

[Gerrit] ...core[master]: tests: run github actions with Python 3.8+
by Xqt (Code Review) 03 Dec '24

03 Dec '24

Xqt has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/1100108?usp=email ) Change subject: tests: run github actions with Python 3.8+ ...................................................................... tests: run github actions with Python 3.8+ Bug: T378893 Change-Id: If13e1756453bb9fd958651ec3c33ebf0a9c2bed7 --- M .github/workflows/doctest.yml M .github/workflows/login_tests-ci.yml M .github/workflows/oauth_tests-ci.yml M .github/workflows/pywikibot-ci.yml M .github/workflows/sysop_write_tests-ci.yml M .github/workflows/windows_tests.yml 6 files changed, 25 insertions(+), 71 deletions(-) Approvals: jenkins-bot: Verified Xqt: Verified; Looks good to me, approved diff --git a/.github/workflows/doctest.yml b/.github/workflows/doctest.yml index e14c36b..cdcaafa 100644 --- a/.github/workflows/doctest.yml +++ b/.github/workflows/doctest.yml @@ -23,18 +23,10 @@ max-parallel: 17 matrix: - python-version: [ "pypy3.7", "pypy3.10", "3.8", "3.9", "3.10", "3.11", "3.12", "3.13" ] + python-version: [ "pypy3.8", "pypy3.10", "3.8", "3.9", "3.10", "3.11", "3.12", "3.13" ] os: [ windows-latest, macOS-latest, ubuntu-latest ] include: - python-version: "3.14-dev" - # ubuntu-22.04 required for Python 3.7 - - python-version: "3.7" - os: windows-latest - - python-version: "3.7" - os: ubuntu-22.04 - exclude: - - os: macOS-latest - python-version: "pypy3.7" steps: - name: Checkout Repository @@ -61,7 +53,6 @@ pip --version pip install coverage pip install "tomli; python_version < '3.11'" - pip install "importlib_metadata ; python_version < '3.8'" pip install mwparserfromhell pip install packaging pip install "PyMySQL >= 1.0.0" diff --git a/.github/workflows/login_tests-ci.yml b/.github/workflows/login_tests-ci.yml index 168790a..dcea789 100644 --- a/.github/workflows/login_tests-ci.yml +++ b/.github/workflows/login_tests-ci.yml @@ -23,40 +23,30 @@ max-parallel: 1 matrix: - python-version: [ "pypy3.7", "pypy3.10", "3.8", "3.9", "3.10", "3.11", "3.12", "3.13", "3.14-dev" ] + python-version: [ "pypy3.8", "pypy3.10", "3.8", "3.9", "3.10", "3.11", "3.12", "3.13", "3.14-dev" ] site: [ "wikipedia:en", "wikisource:zh", "wikipedia:test" ] include: - # ubuntu-22.04 required for Python 3.7 - - python-version: "3.7" - site: wikipedia:en - os: ubuntu-22.04 - - python-version: "3.7" - site: wikisource:zh - os: ubuntu-22.04 - - python-version: "3.7" - site: wikipedia:test - os: ubuntu-22.04 - - python-version: "3.7" + - python-version: "3.8" site: False family: wpbeta code: en os: ubuntu-22.04 - - python-version: "3.7" + - python-version: "3.8" site: False family: wpbeta code: zh os: ubuntu-22.04 - - python-version: "3.8" + - python-version: "3.9" site: wsbeta:en - - python-version: "3.7" + - python-version: "3.8" site: wikidata:test os: ubuntu-22.04 - - python-version: "3.9" + - python-version: "3.10" site: wiktionary:ar - - python-version: "3.7" + - python-version: "3.8" site: wikidata:wikidata os: ubuntu-22.04 - - python-version: "3.8" + - python-version: "3.9" site: wowwiki:uk - python-version: 3 site: wikipedia:de @@ -87,7 +77,6 @@ pip --version pip install coverage pip install "tomli; python_version < '3.11'" - pip install "importlib_metadata ; python_version < '3.8'" pip install mwparserfromhell pip install packaging pip install requests diff --git a/.github/workflows/oauth_tests-ci.yml b/.github/workflows/oauth_tests-ci.yml index 2af22aa..169785e 100644 --- a/.github/workflows/oauth_tests-ci.yml +++ b/.github/workflows/oauth_tests-ci.yml @@ -23,27 +23,19 @@ fail-fast: false matrix: - python-version: [ "pypy3.7", "pypy3.10", "3.8", "3.9", "3.10", "3.11", "3.12", "3.13", "3.14-dev" ] + python-version: [ "pypy3.8", "pypy3.10", "3.8", "3.9", "3.10", "3.11", "3.12", "3.13", "3.14-dev" ] family: [ wikipedia ] code: [ test ] domain: [ "test.wikipedia.org" ] include: - # ubuntu-22.04 required for Python 3.7 - - python-version: "3.7" - family: wikipedia - code: test - domain: test.wikipedia.org - os: ubuntu-22.04 - - python-version: "3.7" + - python-version: "3.8" family: wpbeta code: en domain: en.wikipedia.beta.wmflabs.org - os: ubuntu-22.04 - - python-version: "3.7" + - python-version: "3.8" family: wpbeta code: zh domain: zh.wikipedia.beta.wmflabs.org - os: ubuntu-22.04 steps: - name: Checkout Repository @@ -86,7 +78,6 @@ pip install coverage # tomli required for coverage due to T380697 pip install "tomli; python_version < '3.11'" - pip install "importlib_metadata ; python_version < '3.8'" pip install mwparserfromhell # PyJWT added due to T380270 pip install "PyJWT != 2.10.0, != 2.10.1 ; python_version > '3.8'" diff --git a/.github/workflows/pywikibot-ci.yml b/.github/workflows/pywikibot-ci.yml index 7aae45c..f888c0e 100644 --- a/.github/workflows/pywikibot-ci.yml +++ b/.github/workflows/pywikibot-ci.yml @@ -26,41 +26,29 @@ max-parallel: 18 matrix: - python-version: [ "pypy3.7", "pypy3.10", "3.8", "3.9", "3.10", "3.11", "3.12", "3.13", "3.14-dev" ] + python-version: [ "pypy3.8", "pypy3.10", "3.8", "3.9", "3.10", "3.11", "3.12", "3.13", "3.14-dev" ] site: [ "wikipedia:en", "wikisource:zh" ] include: - # ubuntu-22.04 required for Python 3.7 - - python-version: "3.7" - site: wikipedia:en - os: ubuntu-22.04 - - python-version: "3.7" - site: wikisource:zh - os: ubuntu-22.04 - - python-version: "3.7" + - python-version: "3.8" site: wikipedia:test - os: ubuntu-22.04 - - python-version: "3.7" + - python-version: "3.8" site: False family: wpbeta code: en - os: ubuntu-22.04 - - python-version: "3.7" + - python-version: "3.8" site: False family: wpbeta code: zh - os: ubuntu-22.04 - - python-version: "3.8" - site: wsbeta:en - - python-version: "3.7" - site: wikidata:test - os: ubuntu-22.04 - python-version: "3.9" + site: wsbeta:en + - python-version: "3.8" + site: wikidata:test + - python-version: "3.10" site: wiktionary:ar test_no_rc: true - - python-version: "3.7" - site: wikidata:wikidata - os: ubuntu-22.04 - python-version: "3.8" + site: wikidata:wikidata + - python-version: "3.9" site: wowwiki:uk - python-version: "3" site: wikipedia:de diff --git a/.github/workflows/sysop_write_tests-ci.yml b/.github/workflows/sysop_write_tests-ci.yml index 536010d..a840945 100644 --- a/.github/workflows/sysop_write_tests-ci.yml +++ b/.github/workflows/sysop_write_tests-ci.yml @@ -15,8 +15,7 @@ jobs: build: - # ubuntu-22.04 required for Python 3.7 - runs-on: "ubuntu-22.04" + runs-on: "ubuntu-latest" continue-on-error: ${{ matrix.experimental || false }} timeout-minutes: 100 @@ -24,7 +23,7 @@ fail-fast: false matrix: - python-version: [ "3.7" ] + python-version: [ "3.8" ] site: [ "wikipedia:test" ] attr: [ "write and not rights", "write and rights", "rights and not write" ] diff --git a/.github/workflows/windows_tests.yml b/.github/workflows/windows_tests.yml index 5a24fbc..1abdf46 100644 --- a/.github/workflows/windows_tests.yml +++ b/.github/workflows/windows_tests.yml @@ -23,7 +23,7 @@ fail-fast: false matrix: - python-version: [ "3.7.1", "3.7", "3.8", "3.9", "3.10", "3.11", "3.12", "3.13" ] + python-version: [ "3.8.0", "3.8", "3.9", "3.10", "3.11", "3.12", "3.13" ] python-arch: [ x64, x86 ] site: [ "wikipedia:en" ] @@ -47,10 +47,6 @@ python -c "import struct; print('PYTHON_ARCH:', struct.calcsize('P') << 3)" python -m pip install --upgrade pip pip --version - if ('${{ matrix.python-version }}' -eq '3.7.1') { - pip install -U setuptools; - pip install "urllib3<2.0"; - } if ('${{ matrix.python-version }}' -ge '3.12') { pip install -U setuptools; } -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/1100108?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.wikimedia.org/r/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Change-Id: If13e1756453bb9fd958651ec3c33ebf0a9c2bed7 Gerrit-Change-Number: 1100108 Gerrit-PatchSet: 1 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot

1 0

[Gerrit] ...core[master]: CI: Use Python 3.8 instead of Python 3.7 for tests
by jenkins-bot (Code Review) 03 Dec '24

03 Dec '24

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/1100094?usp=email ) Change subject: CI: Use Python 3.8 instead of Python 3.7 for tests ...................................................................... CI: Use Python 3.8 instead of Python 3.7 for tests Bug: T378893 Change-Id: If31115e9886ffc4144fd5bb2782228a149f29e16 --- M tox.ini 1 file changed, 6 insertions(+), 5 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/tox.ini b/tox.ini index e8d7d83..8c4dd0b 100644 --- a/tox.ini +++ b/tox.ini @@ -14,7 +14,8 @@ [testenv] basepython = - py37: python3.7 + # use Python 3.8 with py37 to until config is updated upstream + py37: python3.8 py38: python3.8 py39: python3.9 py310: python3.10 @@ -52,8 +53,8 @@ fasttest: mock fasttest: .[scripts] - fasttest-py37: .[html] - fasttest-py38: .[wikitextparser] + fasttest-py38: .[html] + fasttest-py39: .[wikitextparser] deeptest: .[html] deeptest: .[scripts] @@ -62,7 +63,7 @@ deeptest-py312: pytest-subtests >= 0.3.2 [testenv:typing] -basepython = python3.7 +basepython = python3.8 deps = pytest-mypy commands = mypy --version @@ -74,7 +75,7 @@ commands = commit-message-validator [testenv:doctest] -basepython = python3.7 +basepython = python3.8 commands = python {[params]generate_user_files} pytest --version -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/1100094?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.wikimedia.org/r/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Change-Id: If31115e9886ffc4144fd5bb2782228a149f29e16 Gerrit-Change-Number: 1100094 Gerrit-PatchSet: 1 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot

1 0

[Gerrit] ...core[master]: [scripts] remove dataextend script from repository
by jenkins-bot (Code Review) 03 Dec '24

03 Dec '24

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/1084740?usp=email ) Change subject: [scripts] remove dataextend script from repository ...................................................................... [scripts] remove dataextend script from repository Bug: T377066 Change-Id: I04936952dc1da94f22ff8be2f400e0a9120d0b22 --- M .codeclimate.yml M .codecov.yml M docs/scripts/archive.rst M docs/scripts/wikibase.rst M docs/scripts_ref/scripts.rst M scripts/CHANGELOG.rst D scripts/dataextend.py M tests/script_tests.py M tox.ini 9 files changed, 55 insertions(+), 17,787 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/1084740?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.wikimedia.org/r/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Change-Id: I04936952dc1da94f22ff8be2f400e0a9120d0b22 Gerrit-Change-Number: 1084740 Gerrit-PatchSet: 6 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

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

Pywikibot-commits December 2024