jenkins-bot has submitted this change. (
https://gerrit.wikimedia.org/r/c/pywikibot/core/+/1123759?usp=email )
Change subject: [10] Publish Pywikibot 10
......................................................................
[10] Publish Pywikibot 10
Merge branch 'master' into stable
Bug: T378891
Change-Id: I5328baeb100e69745aa498d2ab4787e6ddc70efb
---
M .pre-commit-config.yaml
M HISTORY.rst
M ROADMAP.rst
M pywikibot/__init__.py
M pywikibot/__metadata__.py
M pywikibot/families/wikipedia_family.py
M pywikibot/site/_apisite.py
M scripts/CHANGELOG.rst
M scripts/pyproject.toml
M tests/utils.py
11 files changed, 221 insertions(+), 177 deletions(-)
Approvals:
Xqt: Looks good to me, approved
jenkins-bot: Verified
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index ec419ea..8e264d5 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -58,13 +58,7 @@
- id: rst-inline-touching-normal
- id: text-unicode-replacement-char
- repo: https://github.com/astral-sh/ruff-pre-commit
-<<<<<<< HEAD (95b965 Update git submodules)
- rev: v0.9.7
-||||||| BASE
- rev: v0.8.0
-=======
rev: v0.9.9
->>>>>>> BRANCH (c2b799 [10] Publish Pywikibot 10)
hooks:
- id: ruff
args:
@@ -87,13 +81,7 @@
- --remove-unused-variables
exclude: '^pywikibot/backports\.py$'
- repo: https://github.com/PyCQA/isort
-<<<<<<< HEAD (95b965 Update git submodules)
- rev: 6.0.0
-||||||| BASE
- rev: 5.13.2
-=======
rev: 6.0.1
->>>>>>> BRANCH (c2b799 [10] Publish Pywikibot 10)
hooks:
- id: isort
exclude: '^pwb\.py$'
diff --git a/HISTORY.rst b/HISTORY.rst
index 1e4c8a1..fcca87c 100644
--- a/HISTORY.rst
+++ b/HISTORY.rst
@@ -1,24 +1,6 @@
Release History
===============
-<<<<<<< HEAD (95b965 Update git submodules)
-9.6.2
------
-*02 February 2025*
-
-* Add support for kncwiki (:phab:`T385187`)
-* Fix a f-string in :meth:`Claim.fromJSON()<pywikibot.Claim.fromJSON>`
-* i18n updates.
-
-9.6.1
------
-*13 December 2024*
-
-* Add support for tigwiki (:phab:`T381381`)
-* Fix use of importlib.metadata.entry_points for pywikibot-scripts with Python
3.8 and 3.9 (:phab:`T358635`)
-* i18n updates.
-||||||| BASE
-=======
9.6.3
-----
*22 February 2025*
@@ -45,7 +27,6 @@
* Fix use of importlib.metadata.entry_points for pywikibot-scripts with Python
3.8 and 3.9 (:phab:`T358635`)
* i18n updates.
->>>>>>> BRANCH (c2b799 [10] Publish Pywikibot 10)
9.6.0
-----
diff --git a/ROADMAP.rst b/ROADMAP.rst
index 2024ea8..0fb1b14 100644
--- a/ROADMAP.rst
+++ b/ROADMAP.rst
@@ -1,12 +1,6 @@
Current Release Changes
=======================
-<<<<<<< HEAD (95b965 Update git submodules)
-* Add support for satwiktionary (:phab:`T386633`)
-* Update wiktionary family file
-* i18n updates.
-||||||| BASE
-=======
**Improvements**
* Add *sort* parameter to :func:`pagegenerators.SearchPageGenerator` and
:meth:`APISite.search()
@@ -84,7 +78,6 @@
* Python 3.7 support was dropped (:phab:`T378893`), including
*importlib_metadata* of
:mod:`backports`.
* See also Current Deprecations below.
->>>>>>> BRANCH (c2b799 [10] Publish Pywikibot 10)
Current Deprecations
@@ -122,14 +115,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 deprecated
-<<<<<<< HEAD (95b965 Update git submodules)
-||||||| BASE
-=======
Pending removal in Pywikibot 11
-------------------------------
->>>>>>> BRANCH (c2b799 [10] Publish Pywikibot 10)
* 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
@@ -155,70 +144,3 @@
:attr:`userinfo['messages']<pywikibot.site._apisite.APISite.userinfo>`
* 8.0.0: :meth:`Page.editTime()<page.BasePage.editTime>` method is deprecated
and should be replaced by
:attr:`Page.latest_revision.timestamp<page.BasePage.latest_revision>`
-<<<<<<< HEAD (95b965 Update git submodules)
-
-
-Pending removal in Pywikibot 10
--------------------------------
-
-* 9.6.0: Python 3.7 support is deprecated and will be dropped with Pywikibot 10
-* 9.4.0: :mod:`flow` support is deprecated and will be removed
(:phab:`T371180`)
-* 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`
-* 7.6.0: :mod:`tools.itertools` datatypes should no longer imported from
:mod:`tools`
-* 7.6.0: :mod:`tools.collections` datatypes should no longer imported from
:mod:`tools`
-* 7.5.0: :mod:`textlib`.tzoneFixedOffset class will be removed in favour of
:class:`time.TZoneFixedOffset`
-* 7.4.0: ``FilePage.usingPages()`` was renamed to
:meth:`using_pages()<pywikibot.FilePage.using_pages>`
-* 7.3.0: Old color escape sequences like ``\03{color}`` is deprecated in
favour of new color format like <<color>>
-* 7.3.0: ``linktrail`` method of :class:`family.Family` is deprecated; use
:meth:`APISite.linktrail()
- <pywikibot.site._apisite.APISite.linktrail>` instead
-* 7.2.0: Positional arguments *decoder*, *layer* and *newline* for
:mod:`logging` functions were dropped; keyword
- arguments must be used instead.
-* 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
-* 7.0.0: A boolean watch parameter in Page.save() is deprecated and will be
desupported
-* 7.0.0: baserevid parameter of editSource(), editQualifier(), removeClaims(),
removeSources(), remove_qualifiers()
- DataSite methods will be removed
-* 7.0.0: Values of APISite.allpages() parameter filterredir other than True,
False and None are deprecated
-* 7.0.0: The i18n identifier 'cosmetic_changes-append' will be removed in
favour of 'pywikibot-cosmetic-changes'
-||||||| BASE
-
-
-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`
-* 7.6.0: :mod:`tools.itertools` datatypes should no longer imported from
:mod:`tools`
-* 7.6.0: :mod:`tools.collections` datatypes should no longer imported from
:mod:`tools`
-* 7.5.0: :mod:`textlib`.tzoneFixedOffset class will be removed in favour of
:class:`time.TZoneFixedOffset`
-* 7.4.0: ``FilePage.usingPages()`` was renamed to
:meth:`using_pages()<pywikibot.FilePage.using_pages>`
-* 7.3.0: Old color escape sequences like ``\03{color}`` is deprecated in
favour of new color format like <<color>>
-* 7.3.0: ``linktrail`` method of :class:`family.Family` is deprecated; use
:meth:`APISite.linktrail()
- <pywikibot.site._apisite.APISite.linktrail>` instead
-* 7.2.0: Positional arguments *decoder*, *layer* and *newline* for
:mod:`logging` functions were dropped; keyword
- arguments must be used instead.
-* 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
-* 7.0.0: A boolean watch parameter in Page.save() is deprecated and will be
desupported
-* 7.0.0: baserevid parameter of editSource(), editQualifier(), removeClaims(),
removeSources(), remove_qualifiers()
- DataSite methods will be removed
-* 7.0.0: Values of APISite.allpages() parameter filterredir other than True,
False and None are deprecated
-* 7.0.0: The i18n identifier 'cosmetic_changes-append' will be removed in
favour of 'pywikibot-cosmetic-changes'
-=======
->>>>>>> BRANCH (c2b799 [10] Publish Pywikibot 10)
diff --git a/pywikibot/__init__.py b/pywikibot/__init__.py
index 09056e0..9449596 100644
--- a/pywikibot/__init__.py
+++ b/pywikibot/__init__.py
@@ -59,7 +59,7 @@
)
from pywikibot.site import BaseSite as _BaseSite
from pywikibot.time import Timestamp
-from pywikibot.tools import PYTHON_VERSION, normalize_username
+from pywikibot.tools import normalize_username
if TYPE_CHECKING:
@@ -87,15 +87,6 @@
_sites: dict[str, APISite] = {}
-if PYTHON_VERSION < (3, 8):
- __version = sys.version.split(maxsplit=1)[0]
- warn(f"""
-
- Python {__version} will be dropped soon with Pywikibot 10.
- It is recommended to use Python 3.8 or above.
- See phab: T379227 for further information.
-""", FutureWarning) # adjust this line no in utils.execute()
-
@cache
def _code_fam_from_url(url: str, name: str | None = None
diff --git a/pywikibot/__metadata__.py b/pywikibot/__metadata__.py
index 7e0906c..fe86eaf 100644
--- a/pywikibot/__metadata__.py
+++ b/pywikibot/__metadata__.py
@@ -12,12 +12,6 @@
from time import strftime
-<<<<<<< HEAD (95b965 Update git submodules)
-__version__ = '9.6.3'
-||||||| BASE
-__version__ = '9.6.1'
-=======
__version__ = '10.0.0'
->>>>>>> BRANCH (c2b799 [10] Publish Pywikibot 10)
__url__ = 'https://www.mediawiki.org/wiki/Manual:Pywikibot'
__copyright__ = f'2003-{strftime("%Y")}, Pywikibot team'
diff --git a/pywikibot/families/wikipedia_family.py
b/pywikibot/families/wikipedia_family.py
index 1d14240..1600016 100644
--- a/pywikibot/families/wikipedia_family.py
+++ b/pywikibot/families/wikipedia_family.py
@@ -55,28 +55,12 @@
'roa-rup', 'roa-tara', 'rsk', 'ru', 'rue', 'rw', 'sa', 'sah', 'sat',
'sc', 'scn', 'sco', 'sd', 'se', 'sg', 'sh', 'shi', 'shn', 'si',
'simple', 'sk', 'skr', 'sl', 'sm', 'smn', 'sn', 'so', 'sq', 'sr',
-<<<<<<< HEAD (95b965 Update git submodules)
- 'srn', 'ss', 'st', 'stq', 'su', 'sv', 'sw', 'szl', 'szy', 'ta', 'tay',
- 'tcy', 'tdd', 'te', 'tet', 'tg', 'th', 'ti', 'tig', 'tk', 'tl', 'tly',
- 'tn', 'to', 'tpi', 'tr', 'trv', 'ts', 'tt', 'tum', 'tw', 'ty', 'tyv',
- 'udm', 'ug', 'uk', 'ur', 'uz', 've', 'vec', 'vep', 'vi', 'vls', 'vo',
- 'wa', 'war', 'wo', 'wuu', 'xal', 'xh', 'xmf', 'yi', 'yo', 'za', 'zea',
- 'zgh', 'zh', 'zh-classical', 'zh-min-nan', 'zh-yue', 'zu',
-||||||| BASE
- 'srn', 'ss', 'st', 'stq', 'su', 'sv', 'sw', 'szl', 'szy', 'ta', 'tay',
- 'tcy', 'tdd', 'te', 'tet', 'tg', 'th', 'ti', 'tk', 'tl', 'tly', 'tn',
- 'to', 'tpi', 'tr', 'trv', 'ts', 'tt', 'tum', 'tw', 'ty', 'tyv', 'udm',
- 'ug', 'uk', 'ur', 'uz', 've', 'vec', 'vep', 'vi', 'vls', 'vo', 'wa',
- 'war', 'wo', 'wuu', 'xal', 'xh', 'xmf', 'yi', 'yo', 'za', 'zea', 'zgh',
- 'zh', 'zh-classical', 'zh-min-nan', 'zh-yue', 'zu',
-=======
'srn', 'ss', 'st', 'stq', 'su', 'sv', 'sw', 'syl', 'szl', 'szy', 'ta',
'tay', 'tcy', 'tdd', 'te', 'tet', 'tg', 'th', 'ti', 'tig', 'tk', 'tl',
'tly', 'tn', 'to', 'tpi', 'tr', 'trv', 'ts', 'tt', 'tum', 'tw', 'ty',
'tyv', 'udm', 'ug', 'uk', 'ur', 'uz', 've', 'vec', 'vep', 'vi', 'vls',
'vo', 'wa', 'war', 'wo', 'wuu', 'xal', 'xh', 'xmf', 'yi', 'yo', 'za',
'zea', 'zgh', 'zh', 'zh-classical', 'zh-min-nan', 'zh-yue', 'zu',
->>>>>>> BRANCH (c2b799 [10] Publish Pywikibot 10)
}
# Sites we want to edit but not count as real languages
diff --git a/pywikibot/site/_apisite.py b/pywikibot/site/_apisite.py
index 527f9a5..9480955 100644
--- a/pywikibot/site/_apisite.py
+++ b/pywikibot/site/_apisite.py
@@ -1232,18 +1232,6 @@
raise
if MediaWikiVersion(version) < '1.31':
-<<<<<<< HEAD (95b965 Update git submodules)
- warn('\n'
- + fill(f'Support of MediaWiki {version} will be dropped. '
- 'It is recommended to use MediaWiki 1.31 or above. '
- 'You may use every Pywikibot 9.X for older MediaWiki '
- 'versions. See T378984 for further information.'),
- FutureWarning)
-
- if MediaWikiVersion(version) < '1.27':
-||||||| BASE
-=======
->>>>>>> BRANCH (c2b799 [10] Publish Pywikibot 10)
raise RuntimeError(f'Pywikibot "{pywikibot.__version__}" does not '
f'support MediaWiki "{version}".\nUse '
f'Pywikibot prior to "10.0" branch instead.')
diff --git a/scripts/CHANGELOG.rst b/scripts/CHANGELOG.rst
index 90a4772..3ec3911 100644
--- a/scripts/CHANGELOG.rst
+++ b/scripts/CHANGELOG.rst
@@ -1,13 +1,6 @@
Scripts Changelog
=================
-<<<<<<< HEAD (95b965 Update git submodules)
-9.6.1
------
-
-* Require Pywikibot 9.6.1 (:phab:`T358635`)
-||||||| BASE
-=======
10.0.0
------
@@ -38,7 +31,6 @@
* Require Pywikibot 9.6.1 (:phab:`T358635`)
* i18n updates
->>>>>>> BRANCH (c2b799 [10] Publish Pywikibot 10)
9.6.0
-----
diff --git a/scripts/pyproject.toml b/scripts/pyproject.toml
index 683ea07..3c2a57f 100644
--- a/scripts/pyproject.toml
+++ b/scripts/pyproject.toml
@@ -7,13 +7,7 @@
[project]
name = "pywikibot-scripts"
-<<<<<<< HEAD (95b965 Update git submodules)
-version = "9.6.1"
-||||||| BASE
-version = "9.6.0"
-=======
version = "10.0.0"
->>>>>>> BRANCH (c2b799 [10] Publish Pywikibot 10)
authors = [
{name = "xqt", email = "[email protected]"},
@@ -25,13 +19,7 @@
readme = "scripts/README.rst"
requires-python = ">=3.8.0"
dependencies = [
-<<<<<<< HEAD (95b965 Update git submodules)
- "pywikibot >= 9.6.1",
-||||||| BASE
- "pywikibot >= 9.4.0",
-=======
"pywikibot >= 10.0.0",
->>>>>>> BRANCH (c2b799 [10] Publish Pywikibot 10)
"isbnlib",
"langdetect",
"mwparserfromhell",
diff --git a/tests/utils.py b/tests/utils.py
index 89b92bb..c80e331 100644
--- a/tests/utils.py
+++ b/tests/utils.py
@@ -23,7 +23,6 @@
from pywikibot.exceptions import APIError
from pywikibot.login import LoginStatus
from pywikibot.site import Namespace
-from pywikibot.tools import PYTHON_VERSION
from pywikibot.tools.collections import EMPTY_DEFAULT
from tests import _pwb_py
@@ -474,9 +473,6 @@
:param command: executable to run and arguments to use
"""
- if PYTHON_VERSION < (3, 8):
- command.insert(1, '-W ignore::FutureWarning:pywikibot:97')
-
env = os.environ.copy()
# Prevent output by test package; e.g. 'max_retries reduced from x to y'
--
To view, visit
https://gerrit.wikimedia.org/r/c/pywikibot/core/+/1123759?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: stable
Gerrit-Change-Id: I5328baeb100e69745aa498d2ab4787e6ddc70efb
Gerrit-Change-Number: 1123759
Gerrit-PatchSet: 1
Gerrit-Owner: Xqt <[email protected]>
Gerrit-Reviewer: Xqt <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
Pywikibot-commits mailing list -- [email protected]
To unsubscribe send an email to [email protected]
