-
Notifications
You must be signed in to change notification settings - Fork 59
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
ci: tox-lsr 3.4.0 - fix py27 tests; move other checks to py310
The latest version of virtualenv does not support creating python 2.7 virtualenvs. Change our CI tests to restrict the version of virtualenv<20.22.0 and tox<4.15 for py27 environments Move pylint, flake8, and black checks to the py310 environment which is currently supported by ansible-core 2.17 and its related checkers such as ansible-lint and ansible-test pylint now uses ansible-core 2.17 and restricts the version of pylint to 3.1.0 which is the version used by ansible-test 2.17 Remove `extends: default` for .yamllint.yml. The latest version of ansible-lint will automatically incorporate local yamllint settings unless there is an `extends:`. The above changes require some fixes to the role code. For more information, see linux-system-roles/tox-lsr#168 and linux-system-roles/tox-lsr#170 Signed-off-by: Rich Megginson <[email protected]>
- Loading branch information
Showing
6 changed files
with
15 additions
and
10 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -58,7 +58,16 @@ jobs: | |
run: | | ||
set -euxo pipefail | ||
python -m pip install --upgrade pip | ||
pip install "git+https://github.com/linux-system-roles/[email protected]" | ||
if [ "${{ matrix.pyver_os.ver }}" = 2.7 ]; then | ||
# newer virtualenv cannot create python2 venvs | ||
# newer tox requires newer virtualenv | ||
tox='tox<4.15' | ||
virtualenv='virtualenv<20.22.0' | ||
else | ||
tox=tox | ||
virtualenv=virtualenv | ||
fi | ||
pip install "$tox" "$virtualenv" "git+https://github.com/linux-system-roles/[email protected]" | ||
# If you have additional OS dependency packages e.g. libcairo2-dev | ||
# then put them in .github/config/ubuntu-requirements.txt, one | ||
# package per line. | ||
|
@@ -73,11 +82,8 @@ jobs: | |
toxenvs="py${toxpyver}" | ||
# NOTE: The use of flake8, pylint, black with specific | ||
# python envs is arbitrary and must be changed in tox-lsr | ||
# We really should either do those checks using the latest | ||
# version of python, or in every version of python | ||
case "$toxpyver" in | ||
27) toxenvs="${toxenvs},coveralls,flake8,pylint" ;; | ||
36) toxenvs="${toxenvs},coveralls,black" ;; | ||
310) toxenvs="${toxenvs},coveralls,flake8,pylint,black" ;; | ||
*) toxenvs="${toxenvs},coveralls" ;; | ||
esac | ||
TOXENV="$toxenvs" lsr_ci_runtox | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,5 +1,4 @@ | ||
# SPDX-License-Identifier: MIT | ||
--- | ||
extends: default | ||
ignore: | | ||
/.tox/ |