Skip to content

Commit df61175

Browse files
Fix GitHub CI and 'tox' for local CI on Ubuntu 24.04
- It has become impractical to use EOL versions like Python 3.6 in CI - It has become counterproductive to use pyre CI, disable it for now. - Move forward to run the unit tests with Python 3.11 Signed-off-by: Bernhard Kaindl <[email protected]>
1 parent 855cb9b commit df61175

File tree

3 files changed

+5
-8
lines changed

3 files changed

+5
-8
lines changed

.github/workflows/main.yml

-2
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,6 @@ jobs:
2828
fail-fast: false
2929
matrix:
3030
include:
31-
- python-version: '3.6'
32-
os: ubuntu-20.04
3331
- python-version: '3.10'
3432
os: ubuntu-22.04
3533
- python-version: '3.11'

pytest.ini

+2-1
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,11 @@
88
# These are the most of the needed pytest plugins, unfortunately this list does
99
# not support ;python_version<=3.0 or ;python_version>3.0. Therefore, it can
1010
# only list plugins available for all tested python versions (2.7, 3.6 ... 3.11):
11+
# pytest-localftpserver is also used, but its installation is not checked
12+
# to to its installation not being detected on Ubuntu 24.04:
1113
required_plugins =
1214
pytest_httpserver
1315
pytest-forked
14-
pytest-localftpserver
1516
pytest-pythonpath
1617
pytest-subprocess
1718
pytest-timeout

tox.ini

+3-5
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
# 2. python 3.6 test and pylint warnings from changed lines
66
# 3. pytype (needs Python 3.8 for best results)
77
# 4. pyre and pyright checks, pytest test report as markdown for GitHub Actions summary
8-
envlist = py38-covcombine-check, py36-lint-test, py310-pytype, py311-pyre-mdreport
8+
envlist = py38-covcombine-check, py311-lint-test, py310-pytype, py311-pyre-mdreport
99
isolated_build = true
1010
skip_missing_interpreters = true
1111
requires =
@@ -28,9 +28,9 @@ commands =
2828
# https://github.com/actions/toolkit/blob/main/docs/commands.md#problem-matchers
2929
echo "::add-matcher::.github/workflows/PYTHONWARNINGS-problemMatcher.json"
3030
pytest --cov -v --new-first -x --show-capture=all -rA
31-
sh -c 'ls -l {env:COVERAGE_FILE}'
3231
sh -c 'if [ -n "{env:PYTEST_MD_REPORT_OUTPUT}" -a -n "{env:GITHUB_STEP_SUMMARY}" ];then \
33-
sed -i "s/tests\(.*py\)/[&](&)/" {env:PYTEST_MD_REPORT_OUTPUT}; sed "/title/,/\/style/d" \
32+
mkdir -p $(dirname "{env:GITHUB_STEP_SUMMARY:.git/sum.md}"); \
33+
sed "s/tests\(.*py\)/[&](&)/" \
3434
{env:PYTEST_MD_REPORT_OUTPUT} >{env:GITHUB_STEP_SUMMARY:.git/sum.md};fi'
3535

3636
[testenv]
@@ -202,8 +202,6 @@ max-line-length = 129
202202

203203
[pyre]
204204
commands =
205-
pyre: python3.11 --version -V # Needs py311-pyre, does not work with py310-pyre
206-
python pyre_runner.py
207205
-pyright
208206

209207
[pytype]

0 commit comments

Comments
 (0)