From 2abb6b935059ff40b17af440006a5d6dfc73e2c1 Mon Sep 17 00:00:00 2001 From: Sorin Sbarnea Date: Fri, 27 Dec 2024 12:07:58 +0000 Subject: [PATCH 1/2] Adds devel testing pipeline --- .config/constraints.txt | 30 +++++++++++++----------------- .config/requirements-test.in | 2 +- .github/workflows/tox.yml | 1 + .pre-commit-config.yaml | 10 +++++----- tox.ini | 16 +++++++++++++++- 5 files changed, 35 insertions(+), 24 deletions(-) diff --git a/.config/constraints.txt b/.config/constraints.txt index a6f6e2a0..3e66ba0b 100644 --- a/.config/constraints.txt +++ b/.config/constraints.txt @@ -10,14 +10,13 @@ ansible-navigator==24.12.0 ansible-runner==2.4.0 ansible-sign==0.1.1 asgiref==3.8.1 -astroid==3.3.6 +astroid==3.3.8 attrs==24.2.0 babel==2.16.0 beautifulsoup4==4.12.3 bindep==2.11.0 black==24.10.0 bracex==2.5.post1 -build==1.2.2.post1 cachetools==5.5.0 cairocffi==1.7.1 cairosvg==2.7.1 @@ -25,11 +24,11 @@ certifi==2024.12.14 cffi==1.17.1 cfgv==3.4.0 chardet==5.2.0 -charset-normalizer==3.4.0 +charset-normalizer==3.4.1 click==8.1.7 click-help-colors==0.9.4 colorama==0.4.6 -coverage==7.6.9 +coverage==7.6.10 cryptography==44.0.0 csscompressor==0.9.5 cssselect2==0.7.0 @@ -46,7 +45,7 @@ enrich==1.2.7 execnet==2.1.1 filelock==3.16.1 ghp-import==2.1.0 -griffe==1.5.1 +griffe==1.5.4 gunicorn==23.0.0 hjson==3.1.0 htmlmin2==0.1.13 @@ -62,7 +61,7 @@ jsonschema==4.23.0 jsonschema-path==0.3.3 jsonschema-specifications==2023.12.1 lazy-object-proxy==1.10.0 -libtmux==0.39.0 +libtmux==0.40.1 linkchecker==10.5.0 lockfile==0.12.2 markdown==3.7 @@ -85,10 +84,10 @@ mkdocs-material-extensions==1.3.1 mkdocs-minify-plugin==0.8.0 mkdocs-monorepo-plugin==1.1.0 mkdocstrings==0.27.0 -mkdocstrings-python==1.12.2 +mkdocstrings-python==1.13.0 molecule==24.12.0 more-itertools==10.5.0 -mypy==1.13.0 +mypy==1.14.0 mypy-extensions==1.0.0 nodeenv==1.9.1 onigurumacffi==1.3.0 @@ -104,18 +103,16 @@ pathspec==0.12.1 pbr==6.1.0 pexpect==4.9.0 pillow==11.0.0 -pip-tools==7.4.1 platformdirs==4.3.6 pluggy==1.5.0 pre-commit==4.0.1 ptyprocess==0.7.0 pycparser==2.22 -pydoclint==0.5.12 +pydoclint==0.5.14 pygments==2.18.0 -pylint==3.3.2 -pymdown-extensions==10.12 +pylint==3.3.3 +pymdown-extensions==10.13 pyproject-api==1.8.0 -pyproject-hooks==1.2.0 pytest==8.3.4 pytest-ansible==24.12.0 pytest-instafail==0.5.0 @@ -134,7 +131,7 @@ rich==13.9.4 rpds-py==0.22.3 ruamel-yaml==0.18.6 ruamel-yaml-clib==0.2.12 -ruff==0.8.3 +ruff==0.8.4 six==1.17.0 soupsieve==2.6 sqlparse==0.5.3 @@ -147,16 +144,15 @@ toml-sort==0.24.2 tomlkit==0.13.2 tox==4.23.2 tox-ansible==24.12.0 -types-pyyaml==6.0.12.20240917 +types-pyyaml==6.0.12.20241221 types-requests==2.32.0.20241016 tzdata==2024.2 -urllib3==2.2.3 +urllib3==2.3.0 virtualenv==20.28.0 watchdog==6.0.0 wcmatch==10.0 webencodings==0.5.1 werkzeug==3.1.3 -wheel==0.45.1 yamllint==1.35.1 zipp==3.21.0 diff --git a/.config/requirements-test.in b/.config/requirements-test.in index 5cd7f253..12411b65 100644 --- a/.config/requirements-test.in +++ b/.config/requirements-test.in @@ -3,7 +3,7 @@ black coverage[toml] libtmux mypy -pip-tools +pip pre-commit pydoclint pylint diff --git a/.github/workflows/tox.yml b/.github/workflows/tox.yml index 66ef45b0..968305a7 100644 --- a/.github/workflows/tox.yml +++ b/.github/workflows/tox.yml @@ -36,6 +36,7 @@ jobs: jobs_producing_coverage: 8 other_names_also: | devspaces + devel ee-amd64:tox -e ee:runner=devtools-multiarch-builder ee-arm64:tox -e ee:runner=ubuntu-24.04-arm64-2core secrets: inherit # needed for logging to the ghcr.io registry diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index f3ad691b..bec6cc93 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -67,7 +67,7 @@ repos: - id: tox-ini-fmt - repo: https://github.com/astral-sh/ruff-pre-commit - rev: v0.8.3 + rev: v0.8.4 hooks: - id: ruff args: @@ -83,13 +83,13 @@ repos: - id: black - repo: https://github.com/streetsidesoftware/cspell-cli - rev: v8.16.1 + rev: v8.17.0 hooks: - id: cspell name: Spell check with cspell - repo: https://github.com/jsh9/pydoclint - rev: "0.5.12" + rev: "0.5.14" hooks: - id: pydoclint # This allows automatic reduction of the baseline file when needed. @@ -97,7 +97,7 @@ repos: pass_filenames: false - repo: https://github.com/pycqa/pylint.git - rev: v3.3.2 + rev: v3.3.3 hooks: - id: pylint args: @@ -113,7 +113,7 @@ repos: - pyyaml - repo: https://github.com/pre-commit/mirrors-mypy.git - rev: v1.13.0 + rev: v1.14.0 hooks: - id: mypy additional_dependencies: diff --git a/tox.ini b/tox.ini index 6f3079e3..ba5fb243 100644 --- a/tox.ini +++ b/tox.ini @@ -11,11 +11,24 @@ env_list = pkg ee devspaces + devel skip_missing_interpreters = true [testenv] -description = Run pytest under {basepython} +description = + Run tests + devel: using unreleased direct dependencies package = editable +deps = + devel: ansible-compat@ git+https://github.com/ansible/ansible-compat.git + devel: ansible-core@ git+https://github.com/ansible/ansible.git + devel: ansible-creator@ git+https://github.com/ansible/ansible-creator.git + devel: ansible-dev-environment@ git+https://github.com/ansible/ansible-dev-environment.git + devel: ansible-lint@ git+https://github.com/ansible/ansible-lint.git + devel: ansible-navigator@ git+https://github.com/ansible/ansible-navigator.git + devel: molecule@ git+https://github.com/ansible/molecule.git + devel: pytest-ansible@ git+https://github.com/ansible/pytest-ansible.git + devel: tox-ansible@ git+https://github.com/ansible/tox-ansible.git extras = test pass_env = @@ -40,6 +53,7 @@ set_env = commands_pre = sh -c "rm -f {envdir}/.coverage* 2>/dev/null || true" commands = + devel: sh -c "pip freeze | grep '@'" python -c 'import pathlib; pathlib.Path("{env_site_packages_dir}/cov.pth").write_text("import coverage; coverage.process_startup()")' coverage run -m pytest {posargs:-n auto} coverage combine -q --data-file={env:COVERAGE_COMBINED} From 9be83e5f21569358c6f30242754f80bf5e467417 Mon Sep 17 00:00:00 2001 From: Abhinav Anand Date: Sun, 29 Dec 2024 14:56:32 +0530 Subject: [PATCH 2/2] Update jobs producing coverage --- .github/workflows/tox.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/tox.yml b/.github/workflows/tox.yml index 968305a7..ccd86570 100644 --- a/.github/workflows/tox.yml +++ b/.github/workflows/tox.yml @@ -33,7 +33,7 @@ jobs: run_pre: ./tools/test-setup.sh max_python: "3.13" default_python: "3.11" # min version, for 'lint' in particular - jobs_producing_coverage: 8 + jobs_producing_coverage: 9 other_names_also: | devspaces devel