Xqt has submitted this change. (
https://gerrit.wikimedia.org/r/c/pywikibot/core/+/1251437?usp=email )
Change subject: Move ubuntu doctests for pypy 3.9 and Python 3.10-3.12 to
Jenkins CI
......................................................................
Move ubuntu doctests for pypy 3.9 and Python 3.10-3.12 to Jenkins CI
Bug: T419203
Change-Id: Ic38dd29c5b34e4b60c18d00fe718c7dfe568e023
---
M .github/workflows/doctest.yml
M tox.ini
2 files changed, 42 insertions(+), 16 deletions(-)
Approvals:
Xqt: Verified; Looks good to me, approved
jenkins-bot: Verified
diff --git a/.github/workflows/doctest.yml b/.github/workflows/doctest.yml
index e7a3d90..e0fc3ad 100644
--- a/.github/workflows/doctest.yml
+++ b/.github/workflows/doctest.yml
@@ -21,15 +21,13 @@
strategy:
fail-fast: false
matrix:
- 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']
+ python-version: [pypy3.11, '3.9', '3.10', '3.11', '3.12', '3.13',
'3.14']
+ os: ['windows-latest', 'macOS-latest']
include:
+ # Other test are already made on Jenkins
+ - python-version: pypy3.11
+ - python-version: '3.14'
- python-version: 3.15-dev
- exclude: # Test already made on Jenkins
- - python-version: '3.9'
- os: ubuntu-latest
- - python-version: '3.13'
- os: ubuntu-latest
steps:
- name: Checkout Repository
uses: actions/checkout@v6
diff --git a/tox.ini b/tox.ini
index 5a35511..e58a03b 100644
--- a/tox.ini
+++ b/tox.ini
@@ -74,6 +74,13 @@
deps = commit-message-validator
commands = commit-message-validator
+[doctest]
+deps =
+ pytest != 9.0.0
+ wikitextparser
+ .[eventstreams]
+ .[mysql]
+
[testenv:doctest]
basepython = python3
skip_install = True
@@ -81,31 +88,52 @@
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-pypy
[testenv:doctest-py39]
basepython = python3.9
commands =
- python -m pytest --version
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}
-deps =
- pytest != 9.0.0
- wikitextparser
- .[eventstreams]
- .[mysql]
+[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 --version
- # 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
+ # wikitextparser needs regex package which fails
.[eventstreams]
.[mysql]
--
To view, visit
https://gerrit.wikimedia.org/r/c/pywikibot/core/+/1251437?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: Ic38dd29c5b34e4b60c18d00fe718c7dfe568e023
Gerrit-Change-Number: 1251437
Gerrit-PatchSet: 6
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]
