-
Notifications
You must be signed in to change notification settings - Fork 24
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
fix CI builds and rework testing harness (#419)
* lock transitive python dependencies with pip-tools After yet another breaking package update (docker/docker-py#3257), its high time we permanently pin all development packages *and their dependencies* to a known.-good version. pip-tools lets us do that without losing the simple requirements.txt file that allows easy installation, so lets use that. * rework testing harness for py12, remove pytest-virtualenv dep a little while ago, we were starting to get "imp" import errors in CI builds, which I initially were assumed to be from pytest. In fact, it was the pytest-virtualenv package that we used to generate a virtualenv with a specific ansible version for tests. As there is no easy replacement for this package, and the package itself is stale (no release in 5 years), the testing harness now just installs the desired version of ansible-core straight into the main devel virtualenv. This is a bit ugly as it could interfere with other user tasks, but it leaves the interface the same and helps simplify the test fixture code. Said code also now reliably isolates tes environments from another and the user-wide collections. Combined with package pinning introduced in the previous commit, we should no longer have CI failures due to packages or their deps updating and breaking things.
- Loading branch information
Showing
20 changed files
with
538 additions
and
233 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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,5 +1,14 @@ | ||
{ | ||
"extends": [ | ||
"github>maxhoesel-ansible/.github:renovate-config" | ||
] | ||
], | ||
"pip-compile": { | ||
"fileMatch": ["^requirements\\.txt$"] | ||
}, | ||
"pip_requirements": { | ||
"enabled": false | ||
}, | ||
"pip_setup": { | ||
"enabled": false | ||
} | ||
} |
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 |
---|---|---|
@@ -1,27 +1,26 @@ | ||
authors: | ||
- Max Hösel <[email protected]> | ||
- Max Hösel <[email protected]> | ||
build_ignore: | ||
- .circleci | ||
- .github | ||
- .config | ||
- .vscode | ||
- dist | ||
- CODE_OF_CONDUCT.md | ||
- CONTRIBUTING.md | ||
- .yamllint | ||
- '*.tar.gz' | ||
- .venv | ||
- .pytest_cache | ||
- scripts | ||
- .pre-commit-config.yaml | ||
- .readthedocs.yaml | ||
- pyproject.toml | ||
- requirements.txt | ||
- '**/requirements.txt' | ||
- docs/tmp | ||
- docs/build | ||
- .circleci | ||
- .github | ||
- .vscode | ||
- dist | ||
- CODE_OF_CONDUCT.md | ||
- CONTRIBUTING.md | ||
- .yamllint | ||
- "*.tar.gz" | ||
- .venv | ||
- .pytest_cache | ||
- scripts | ||
- .pre-commit-config.yaml | ||
- .readthedocs.yaml | ||
- pyproject.toml | ||
- requirements.txt | ||
- "**/requirements.txt" | ||
- docs/tmp | ||
- docs/build | ||
dependencies: | ||
community.general: '>=1.0.0' | ||
community.general: ">=1.0.0" | ||
description: Install, configure and use the Smallstep CA server and CLI tool | ||
issues: https://github.com/maxhoesel-ansible/ansible-collection-smallstep/issues | ||
license_file: LICENSE | ||
|
@@ -30,8 +29,8 @@ namespace: maxhoesel | |
readme: README.md | ||
repository: https://github.com/maxhoesel-ansible/ansible-collection-smallstep | ||
tags: | ||
- smallstep | ||
- ca | ||
- application | ||
- certificates | ||
- smallstep | ||
- ca | ||
- application | ||
- certificates | ||
version: 0.24.5 |
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 |
---|---|---|
@@ -0,0 +1,37 @@ | ||
# This file is only a template! | ||
# Use requirements.txt generated by pip-compile to install dependencies | ||
|
||
# Requirements for developing this collection | ||
# Includes utilities, CLI helpers and so on | ||
|
||
# Include a version of ansible-core for IDE hints and the default pytest version | ||
# It is also needed for docs generation. | ||
# | ||
# This installed version can be overriden by running pytest with the --ansible-version command. | ||
# Ideally pytest would install another venv just for the test, but the pytest-virtualenv package | ||
# is ancient and incompatible with python 3.12. | ||
ansible-core==2.16.6 | ||
|
||
# Linting & Formatting | ||
ansible-lint==24.5.0 | ||
pylint==3.2.1 | ||
autopep8==2.1.0 | ||
pre-commit==3.7.1 | ||
|
||
# Utility packages used in test fixtures and scripts | ||
pytest==8.2.0 | ||
pyyaml==6.0.1 | ||
packaging==24.0 | ||
docker==7.1.0 | ||
# Dependencies for executing the role scenarios. | ||
molecule==6.0.2 | ||
molecule-plugins[docker]==23.4.1 | ||
|
||
# Generating requirements and syncing venv | ||
pip-tools==7.4.1 | ||
|
||
# Docs | ||
antsibull-docs==2.11.0 | ||
ansible-pygments==0.1.1 | ||
sphinx==7.3.7 | ||
sphinx-ansible-theme==0.10.3 |
Oops, something went wrong.