jenkins-bot has submitted this change. (
https://gerrit.wikimedia.org/r/c/pywikibot/core/+/1100402?usp=email )
Change subject: cleanup: deprecate backports.importlib_metadata
......................................................................
cleanup: deprecate backports.importlib_metadata
Bug: T378898
Change-Id: I369dbadfef2c98540846d2104be9629434dfef90
---
M ROADMAP.rst
M pywikibot/backports.py
M pywikibot/scripts/wrapper.py
M pywikibot/tools/__init__.py
4 files changed, 10 insertions(+), 15 deletions(-)
Approvals:
Xqt: Looks good to me, approved
jenkins-bot: Verified
diff --git a/ROADMAP.rst b/ROADMAP.rst
index d151e04..6b032c3 100644
--- a/ROADMAP.rst
+++ b/ROADMAP.rst
@@ -19,6 +19,7 @@
Current Deprecations
====================
+* 10.0.0: *importlib_metadata* of :mod:`backports` is deprecated
* 9.6.0:
:meth:`BaseSite.languages()<pywikibot.site._basesite.BaseSite.languages>` will
be removed in favour of
:attr:`BaseSite.codes<pywikibot.site._basesite.BaseSite.codes>`
* 9.5.0:
:meth:`DataSite.getPropertyType()<pywikibot.site._datasite.DataSite.getPropertyType>`
will be removed
@@ -47,7 +48,7 @@
* 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
+* 9.0.0: *nullcontext* context manager and *SimpleQueue* queue of
:mod:`backports` are deprecated
Pending removal in Pywikibot 11
-------------------------------
diff --git a/pywikibot/backports.py b/pywikibot/backports.py
index 986786b..f083ed9 100644
--- a/pywikibot/backports.py
+++ b/pywikibot/backports.py
@@ -205,12 +205,6 @@
from itertools import batched # type: ignore[no-redef]
-try:
- import importlib.metadata as importlib_metadata
-except ImportError:
- import importlib_metadata
-
-
# import ModuleDeprecationWrapper here to prevent circular import
from pywikibot.tools import ModuleDeprecationWrapper # noqa: E402
@@ -222,3 +216,6 @@
wrapper.add_deprecated_attr('SimpleQueue',
replacement_name='queue.SimpleQueue',
since='9.0.0')
+wrapper.add_deprecated_attr('importlib_metadata',
+ replacement_name='importlib.metadata',
+ since='10.0.0')
diff --git a/pywikibot/scripts/wrapper.py b/pywikibot/scripts/wrapper.py
index 3a16b28..62d4e82 100755
--- a/pywikibot/scripts/wrapper.py
+++ b/pywikibot/scripts/wrapper.py
@@ -233,9 +233,10 @@
:return: True if all dependencies are installed
:raise RuntimeError: wrong Python version found in setup.py
"""
+ import importlib.metadata as importlib_metadata
+
from packaging.requirements import Requirement
- from pywikibot.backports import importlib_metadata
from setup import script_deps
missing_requirements = []
@@ -247,7 +248,7 @@
from setup import dependencies
for dependency in dependencies:
- if dependency.startswith(('importlib_metadata', 'packaging')):
+ if dependency.startswith('packaging'):
# Ignore these dependencies because ImportError is raised in an
# early state when they are imported in backports. They are already
# used at this point. This is a workaound for toolforge where some
diff --git a/pywikibot/tools/__init__.py b/pywikibot/tools/__init__.py
index ba49aa0..6390671 100644
--- a/pywikibot/tools/__init__.py
+++ b/pywikibot/tools/__init__.py
@@ -26,6 +26,7 @@
import bz2
import gzip
import hashlib
+import importlib.metadata as importlib_metadata
import ipaddress
import lzma
import os
@@ -41,12 +42,7 @@
import packaging.version
import pywikibot # T306760
-from pywikibot.backports import (
- PYTHON_VERSION,
- SPHINX_RUNNING,
- Callable,
- importlib_metadata,
-)
+from pywikibot.backports import PYTHON_VERSION, SPHINX_RUNNING, Callable
from pywikibot.tools._deprecate import (
ModuleDeprecationWrapper,
add_decorated_full_name,
--
To view, visit
https://gerrit.wikimedia.org/r/c/pywikibot/core/+/1100402?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: I369dbadfef2c98540846d2104be9629434dfef90
Gerrit-Change-Number: 1100402
Gerrit-PatchSet: 2
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]
