jenkins-bot has submitted this change. (
https://gerrit.wikimedia.org/r/c/pywikibot/core/+/1074413?usp=email )
Change subject: Revert "[tests] install wikitextparser instead of mwpfh for
Python 3.13"
......................................................................
Revert "[tests] install wikitextparser instead of mwpfh for Python 3.13"
Seems this issue is solved by Python 3.13rc2.
This reverts commit a57f71a05b4c68b8a5851bc661ff48a448c52c20.
Bug: T372162
Change-Id: Ia0fd6f58b5b5e00388f3c31c6d84dece94ebba9e
---
M .github/workflows/doctest.yml
M .github/workflows/login_tests-ci.yml
M .github/workflows/oauth_tests-ci.yml
M requirements.txt
M setup.py
5 files changed, 5 insertions(+), 9 deletions(-)
Approvals:
jenkins-bot: Verified
Xqt: Looks good to me, approved
diff --git a/.github/workflows/doctest.yml b/.github/workflows/doctest.yml
index 6b68291..a8c91f0 100644
--- a/.github/workflows/doctest.yml
+++ b/.github/workflows/doctest.yml
@@ -58,7 +58,7 @@
pip --version
pip install coverage
pip install "importlib_metadata ; python_version < '3.8'"
- pip install "mwparserfromhell ; python_version != '3.13'"
+ pip install mwparserfromhell
pip install packaging
pip install "PyMySQL >= 1.0.0"
pip install pytest
diff --git a/.github/workflows/login_tests-ci.yml
b/.github/workflows/login_tests-ci.yml
index 897f9cd..dc1de99 100644
--- a/.github/workflows/login_tests-ci.yml
+++ b/.github/workflows/login_tests-ci.yml
@@ -73,8 +73,7 @@
pip --version
pip install coverage
pip install "importlib_metadata ; python_version < '3.8'"
- pip install "mwparserfromhell ; python_version != '3.13'"
- pip install "wikitextparser ; python_version == '3.13'"
+ 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 2a25b00..b2f516f 100644
--- a/.github/workflows/oauth_tests-ci.yml
+++ b/.github/workflows/oauth_tests-ci.yml
@@ -77,8 +77,7 @@
pip --version
pip install coverage
pip install "importlib_metadata ; python_version < '3.8'"
- pip install "mwparserfromhell ; python_version != '3.13'"
- pip install "wikitextparser ; python_version == '3.13'"
+ pip install mwparserfromhell
pip install mwoauth
pip install packaging
pip install requests
diff --git a/requirements.txt b/requirements.txt
index 5058dd0..6c3d89d 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -18,9 +18,8 @@
# $ awk -F '[#>=]' '{print $1}' requirements.txt | xargs apt-cache search
# mandatory dependencies, others are optional
-# mwparserfromhell fails with Python 3.13 (T372162)
importlib_metadata ; python_version < '3.8'
-mwparserfromhell>=0.5.2; python_version != '3.13'
+mwparserfromhell>=0.5.2
packaging
requests>=2.21.0
diff --git a/setup.py b/setup.py
index e0135d9..3932956 100755
--- a/setup.py
+++ b/setup.py
@@ -68,8 +68,7 @@
# packages which are mandatory
dependencies = [
'importlib_metadata ; python_version < "3.8"',
- 'mwparserfromhell>=0.5.2; python_version != "3.13"',
- 'wikitextparser; python_version == "3.13"',
+ 'mwparserfromhell>=0.5.2',
'packaging',
'requests>=2.21.0',
]
--
To view, visit
https://gerrit.wikimedia.org/r/c/pywikibot/core/+/1074413?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: Ia0fd6f58b5b5e00388f3c31c6d84dece94ebba9e
Gerrit-Change-Number: 1074413
Gerrit-PatchSet: 1
Gerrit-Owner: Xqt <i...@gno.de>
Gerrit-Reviewer: Xqt <i...@gno.de>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
Pywikibot-commits mailing list -- pywikibot-commits@lists.wikimedia.org
To unsubscribe send an email to pywikibot-commits-le...@lists.wikimedia.org
