Xqt has submitted this change. (
https://gerrit.wikimedia.org/r/c/pywikibot/core/+/1268067?usp=email )
Change subject: Revert "Move ubuntu doctests for pypy 3.9 and Python 3.10-3.12
to Jenkins CI"
......................................................................
Revert "Move ubuntu doctests for pypy 3.9 and Python 3.10-3.12 to Jenkins CI"
This reverts commit 6d15101497de489cd25df348f27df33671bb78fa.
Reason for revert: Currently doctests needs 10 minutes to fail
Bug: T419203
Change-Id: I7837358cecda5ef76a2d32ffbbe747bcd7718553
---
M .github/workflows/doctest.yml
M tox.ini
2 files changed, 8 insertions(+), 45 deletions(-)
Approvals:
Xqt: Verified; Looks good to me, approved
diff --git a/.github/workflows/doctest.yml b/.github/workflows/doctest.yml
index 9292a47..6a4ef78 100644
--- a/.github/workflows/doctest.yml
+++ b/.github/workflows/doctest.yml
@@ -21,12 +21,15 @@
strategy:
fail-fast: false
matrix:
- python-version: [pypy3.11, '3.9', '3.10', '3.11', '3.12', '3.13',
'3.14']
- os: ['windows-latest', 'macOS-latest']
+ python-version: [pypy3.9, pypy3.11, '3.9', '3.10', '3.11', '3.12',
'3.13', '3.14']
+ os: ['windows-latest', 'macOS-latest', 'ubuntu-latest']
include:
- # Other test are already made on Jenkins
- - python-version: pypy3.11
- python-version: 3.15-dev
+ exclude: # Test already made on Jenkins
+ - python-version: '3.9'
+ os: ubuntu-latest
+ - python-version: '3.14'
+ os: ubuntu-latest
steps:
- name: Checkout Repository
uses: actions/checkout@v6
diff --git a/tox.ini b/tox.ini
index f9d22a9..503ea9b 100644
--- a/tox.ini
+++ b/tox.ini
@@ -90,62 +90,22 @@
deps =
commands =
tox -e doctest-py39
- tox -e doctest-py310
- tox -e doctest-py311
- tox -e doctest-py312
- tox -e doctest-py313
tox -e doctest-py314
- tox -e doctest-pypy
[testenv:doctest-py39]
basepython = python3.9
commands =
python {[params]generate_user_files}
- # user files exists for other doctests subtests from doctest-py39 run
- python -m pytest pywikibot --doctest-modules {[params]DOCTEST_IGNORES}
-deps = {[doctest]deps}
-
-[testenv:doctest-py310]
-basepython = python3.10
-commands =
- python -m pytest pywikibot --doctest-modules {[params]DOCTEST_IGNORES}
-deps = {[doctest]deps}
-
-
-[testenv:doctest-py311]
-basepython = python3.11
-commands =
- python -m pytest pywikibot --doctest-modules {[params]DOCTEST_IGNORES}
-deps = {[doctest]deps}
-
-[testenv:doctest-py312]
-basepython = python3.12
-commands =
- python -m pytest pywikibot --doctest-modules {[params]DOCTEST_IGNORES}
-deps = {[doctest]deps}
-
-[testenv:doctest-py313]
-basepython = python3.13
-commands =
python -m pytest pywikibot --doctest-modules {[params]DOCTEST_IGNORES}
deps = {[doctest]deps}
[testenv:doctest-py314]
basepython = python3.14
commands =
+ # user files already exists from doctest-py39 run
python -m pytest pywikibot --doctest-modules {[params]DOCTEST_IGNORES}
deps = {[doctest]deps}
-[testenv:doctest-pypy]
-basepython = pypy3
-commands =
- python -m pytest pywikibot --doctest-modules {[params]DOCTEST_IGNORES}
-deps =
- pytest != 9.0.0
- # wikitextparser needs regex package which fails
- .[eventstreams]
- .[mysql]
-
[testenv:venv]
commands = {posargs}
--
To view, visit
https://gerrit.wikimedia.org/r/c/pywikibot/core/+/1268067?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: I7837358cecda5ef76a2d32ffbbe747bcd7718553
Gerrit-Change-Number: 1268067
Gerrit-PatchSet: 3
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]
