Skip to content

Commit ab6bbfe

Browse files
committed
Revert "Move ubuntu doctests for pypy 3.9 and Python 3.10-3.12 to Jenkins CI"
This reverts commit 6d15101. Reason for revert: Currently doctests needs 10 minutes to fail Bug: T419203 Change-Id: I7837358cecda5ef76a2d32ffbbe747bcd7718553
1 parent 436b33b commit ab6bbfe

2 files changed

Lines changed: 8 additions & 45 deletions

File tree

.github/workflows/doctest.yml

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,15 @@ jobs:
2121
strategy:
2222
fail-fast: false
2323
matrix:
24-
python-version: [pypy3.11, '3.9', '3.10', '3.11', '3.12', '3.13', '3.14']
25-
os: ['windows-latest', 'macOS-latest']
24+
python-version: [pypy3.9, pypy3.11, '3.9', '3.10', '3.11', '3.12', '3.13', '3.14']
25+
os: ['windows-latest', 'macOS-latest', 'ubuntu-latest']
2626
include:
27-
# Other test are already made on Jenkins
28-
- python-version: pypy3.11
2927
- python-version: 3.15-dev
28+
exclude: # Test already made on Jenkins
29+
- python-version: '3.9'
30+
os: ubuntu-latest
31+
- python-version: '3.14'
32+
os: ubuntu-latest
3033
steps:
3134
- name: Checkout Repository
3235
uses: actions/checkout@v6

tox.ini

Lines changed: 1 addition & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -90,62 +90,22 @@ allowlist_externals = tox
9090
deps =
9191
commands =
9292
tox -e doctest-py39
93-
tox -e doctest-py310
94-
tox -e doctest-py311
95-
tox -e doctest-py312
96-
tox -e doctest-py313
9793
tox -e doctest-py314
98-
tox -e doctest-pypy
9994

10095
[testenv:doctest-py39]
10196
basepython = python3.9
10297
commands =
10398
python {[params]generate_user_files}
104-
# user files exists for other doctests subtests from doctest-py39 run
105-
python -m pytest pywikibot --doctest-modules {[params]DOCTEST_IGNORES}
106-
deps = {[doctest]deps}
107-
108-
[testenv:doctest-py310]
109-
basepython = python3.10
110-
commands =
111-
python -m pytest pywikibot --doctest-modules {[params]DOCTEST_IGNORES}
112-
deps = {[doctest]deps}
113-
114-
115-
[testenv:doctest-py311]
116-
basepython = python3.11
117-
commands =
118-
python -m pytest pywikibot --doctest-modules {[params]DOCTEST_IGNORES}
119-
deps = {[doctest]deps}
120-
121-
[testenv:doctest-py312]
122-
basepython = python3.12
123-
commands =
124-
python -m pytest pywikibot --doctest-modules {[params]DOCTEST_IGNORES}
125-
deps = {[doctest]deps}
126-
127-
[testenv:doctest-py313]
128-
basepython = python3.13
129-
commands =
13099
python -m pytest pywikibot --doctest-modules {[params]DOCTEST_IGNORES}
131100
deps = {[doctest]deps}
132101

133102
[testenv:doctest-py314]
134103
basepython = python3.14
135104
commands =
105+
# user files already exists from doctest-py39 run
136106
python -m pytest pywikibot --doctest-modules {[params]DOCTEST_IGNORES}
137107
deps = {[doctest]deps}
138108

139-
[testenv:doctest-pypy]
140-
basepython = pypy3
141-
commands =
142-
python -m pytest pywikibot --doctest-modules {[params]DOCTEST_IGNORES}
143-
deps =
144-
pytest != 9.0.0
145-
# wikitextparser needs regex package which fails
146-
.[eventstreams]
147-
.[mysql]
148-
149109
[testenv:venv]
150110
commands = {posargs}
151111

0 commit comments

Comments
 (0)