From 78b537b32f6f0587f7d5b7f3f618878a4b1123d4 Mon Sep 17 00:00:00 2001 From: Cristiano Nicolai <570894+cristianonicolai@users.noreply.github.com> Date: Thu, 25 Jan 2024 23:22:31 +1000 Subject: [PATCH] Include ansible-dev-environment (#106) --- .config/constraints.txt | 86 +++++++++++++++++------------------ .config/requirements-lock.txt | 55 +++++++++------------- .config/requirements.in | 2 +- .github/release-drafter.yml | 4 +- .pre-commit-config.yaml | 6 +-- pyproject.toml | 16 +++++-- 6 files changed, 82 insertions(+), 87 deletions(-) diff --git a/.config/constraints.txt b/.config/constraints.txt index 232dfff..253ad41 100644 --- a/.config/constraints.txt +++ b/.config/constraints.txt @@ -4,23 +4,20 @@ # # pip-compile --all-extras --no-annotate --output-file=.config/constraints.txt --strip-extras pyproject.toml # -aiohttp==3.9.1 -aiosignal==1.3.1 ansible-builder==3.0.0 -ansible-compat==4.1.10 +ansible-compat==4.1.11 ansible-core==2.16.2 -ansible-creator==0.0.1a4 -ansible-development-environment==0.3.0 -ansible-lint==6.22.1 -ansible-navigator==3.5.0 +ansible-creator==24.1.0 +ansible-dev-environment==24.1.0 +ansible-lint==6.22.2 +ansible-navigator==3.6.0 ansible-runner==2.3.4 ansible-sign==0.1.1 -async-timeout==4.0.3 -attrs==23.1.0 +attrs==23.2.0 babel==2.14.0 -beautifulsoup4==4.12.2 +beautifulsoup4==4.12.3 bindep==2.11.0 -black==23.12.0 +black==23.12.1 bracex==2.4 build==1.0.3 cachetools==5.3.2 @@ -34,52 +31,52 @@ charset-normalizer==3.3.2 click==8.1.7 click-help-colors==0.9.4 colorama==0.4.6 -coverage==7.3.2 -cryptography==41.0.7 +coverage==7.4.0 +cryptography==42.0.1 csscompressor==0.9.5 cssselect2==0.7.0 defusedxml==0.7.1 distlib==0.3.8 -distro==1.8.0 +distro==1.9.0 +dnspython==2.5.0 docstring-parser-fork==0.0.5 docutils==0.20.1 enrich==1.2.7 exceptiongroup==1.2.0 execnet==2.0.2 filelock==3.13.1 -frozenlist==1.4.0 ghp-import==2.1.0 -griffe==0.38.1 +griffe==0.39.1 htmlmin2==0.1.13 identify==2.5.33 idna==3.6 iniconfig==2.0.0 jinja2==3.1.2 jsmin==3.0.1 -jsonschema==4.20.0 -jsonschema-specifications==2023.11.2 +jsonschema==4.21.1 +jsonschema-specifications==2023.12.1 +linkchecker==10.4.0 lockfile==0.12.2 -markdown==3.5.1 -markdown-exec==1.7.0 +markdown==3.5.2 +markdown-exec==1.8.0 markdown-include==0.8.1 markdown-it-py==3.0.0 -markupsafe==2.1.3 +markupsafe==2.1.4 mdurl==0.1.2 mergedeep==1.3.4 mkdocs==1.5.3 -mkdocs-ansible==0.2.0 +mkdocs-ansible==0.2.1 mkdocs-autorefs==0.5.0 mkdocs-gen-files==0.5.0 mkdocs-htmlproofer-plugin==1.0.0 -mkdocs-material==9.5.2 +mkdocs-material==9.5.5 mkdocs-material-extensions==1.3.1 -mkdocs-minify-plugin==0.7.1 -mkdocs-monorepo-plugin==1.0.5 +mkdocs-minify-plugin==0.7.2 +mkdocs-monorepo-plugin==1.1.0 mkdocstrings==0.24.0 -mkdocstrings-python==1.7.5 -molecule==6.0.2 -multidict==6.0.4 -mypy==1.7.1 +mkdocstrings-python==1.8.0 +molecule==6.0.3 +mypy==1.8.0 mypy-extensions==1.0.0 nodeenv==1.8.0 onigurumacffi==1.3.0 @@ -89,21 +86,21 @@ parsley==1.3 pathspec==0.12.1 pbr==6.0.0 pexpect==4.9.0 -pillow==10.1.0 +pillow==10.2.0 pip-tools==7.3.0 -pipdeptree==2.13.1 +pipdeptree==2.13.2 platformdirs==4.1.0 -pluggy==1.3.0 +pluggy==1.4.0 pre-commit==3.6.0 ptyprocess==0.7.0 pycparser==2.21 -pydoclint==0.3.8 +pydoclint==0.3.9 pygments==2.17.2 -pymdown-extensions==10.5 +pymdown-extensions==10.7 pyproject-api==1.6.1 pyproject-hooks==1.0.0 -pytest==7.4.3 -pytest-ansible==4.1.1 +pytest==7.4.4 +pytest-ansible==24.1.2 pytest-xdist==3.5.0 python-daemon==3.0.1 python-dateutil==2.8.2 @@ -111,16 +108,16 @@ python-gnupg==0.5.2 python-slugify==8.0.1 pyyaml==6.0.1 pyyaml-env-tag==0.1 -referencing==0.32.0 -regex==2023.10.3 +referencing==0.32.1 +regex==2023.12.25 requests==2.31.0 requirements-parser==0.5.0 resolvelib==1.0.1 rich==13.7.0 -rpds-py==0.13.2 +rpds-py==0.17.1 ruamel-yaml==0.18.5 ruamel-yaml-clib==0.2.8 -ruff==0.1.7 +ruff==0.1.14 six==1.16.0 soupsieve==2.5 subprocess-tee==0.4.1 @@ -129,11 +126,11 @@ tinycss2==1.2.1 toml-sort==0.23.1 tomli==2.0.1 tomlkit==0.12.3 -tox==4.11.4 -tox-ansible==2.0.14 -types-setuptools==69.0.0.0 +tox==4.12.1 +tox-ansible==2.1.0 +types-setuptools==69.0.0.20240125 typing-extensions==4.9.0 -tzdata==2023.3 +tzdata==2023.4 urllib3==2.1.0 virtualenv==20.25.0 watchdog==3.0.0 @@ -141,7 +138,6 @@ wcmatch==8.5 webencodings==0.5.1 wheel==0.42.0 yamllint==1.33.0 -yarl==1.9.4 # The following packages are considered to be unsafe in a requirements file: # pip diff --git a/.config/requirements-lock.txt b/.config/requirements-lock.txt index 5fcee48..3f8a6d5 100644 --- a/.config/requirements-lock.txt +++ b/.config/requirements-lock.txt @@ -4,50 +4,42 @@ # # pip-compile --no-annotate --output-file=.config/requirements-lock.txt --strip-extras pyproject.toml # -aiohttp==3.9.1 -aiosignal==1.3.1 ansible-builder==3.0.0 -ansible-compat==4.1.10 +ansible-compat==4.1.11 ansible-core==2.16.2 -ansible-creator==0.0.1a4 -ansible-development-environment==0.3.0 -ansible-lint==6.22.1 -ansible-navigator==3.5.0 +ansible-creator==24.1.0 +ansible-dev-environment==24.1.0 +ansible-lint==6.22.2 +ansible-navigator==3.6.0 ansible-runner==2.3.4 ansible-sign==0.1.1 -async-timeout==4.0.3 -attrs==23.1.0 +attrs==23.2.0 bindep==2.11.0 -black==23.12.0 +black==23.12.1 bracex==2.4 cachetools==5.3.2 -certifi==2023.11.17 cffi==1.16.0 chardet==5.2.0 -charset-normalizer==3.3.2 click==8.1.7 click-help-colors==0.9.4 colorama==0.4.6 -cryptography==41.0.7 +cryptography==42.0.1 distlib==0.3.8 -distro==1.8.0 +distro==1.9.0 docutils==0.20.1 enrich==1.2.7 exceptiongroup==1.2.0 execnet==2.0.2 filelock==3.13.1 -frozenlist==1.4.0 -idna==3.6 iniconfig==2.0.0 jinja2==3.1.2 -jsonschema==4.20.0 -jsonschema-specifications==2023.11.2 +jsonschema==4.21.1 +jsonschema-specifications==2023.12.1 lockfile==0.12.2 markdown-it-py==3.0.0 -markupsafe==2.1.3 +markupsafe==2.1.4 mdurl==0.1.2 -molecule==6.0.2 -multidict==6.0.4 +molecule==6.0.3 mypy-extensions==1.0.0 onigurumacffi==1.3.0 packaging==23.2 @@ -56,38 +48,35 @@ pathspec==0.12.1 pbr==6.0.0 pexpect==4.9.0 platformdirs==4.1.0 -pluggy==1.3.0 +pluggy==1.4.0 ptyprocess==0.7.0 pycparser==2.21 pygments==2.17.2 pyproject-api==1.6.1 -pytest==7.4.3 -pytest-ansible==4.1.1 +pytest==7.4.4 +pytest-ansible==24.1.2 pytest-xdist==3.5.0 python-daemon==3.0.1 python-gnupg==0.5.2 pyyaml==6.0.1 -referencing==0.32.0 -requests==2.31.0 +referencing==0.32.1 requirements-parser==0.5.0 resolvelib==1.0.1 rich==13.7.0 -rpds-py==0.13.2 +rpds-py==0.17.1 ruamel-yaml==0.18.5 ruamel-yaml-clib==0.2.8 six==1.16.0 subprocess-tee==0.4.1 tomli==2.0.1 -tox==4.11.4 -tox-ansible==2.0.14 -types-setuptools==69.0.0.0 +tox==4.12.1 +tox-ansible==2.1.0 +types-setuptools==69.0.0.20240125 typing-extensions==4.9.0 -tzdata==2023.3 -urllib3==2.1.0 +tzdata==2023.4 virtualenv==20.25.0 wcmatch==8.5 yamllint==1.33.0 -yarl==1.9.4 # The following packages are considered to be unsafe in a requirements file: # setuptools diff --git a/.config/requirements.in b/.config/requirements.in index e452547..d42cd4a 100644 --- a/.config/requirements.in +++ b/.config/requirements.in @@ -1,6 +1,6 @@ ansible-builder ansible-creator -ansible-development-environment>=0.3.0 +ansible-dev-environment ansible-lint ansible-navigator ansible-sign diff --git a/.github/release-drafter.yml b/.github/release-drafter.yml index 114b5fc..dd5152e 100644 --- a/.github/release-drafter.yml +++ b/.github/release-drafter.yml @@ -1,2 +1,2 @@ -# see https://github.com/ansible-community/devtools -_extends: ansible-community/devtools +# see https://github.com/ansible/team-devtools +_extends: ansible/team-devtools diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index ab9b7a6..befcfdd 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -64,19 +64,19 @@ repos: - id: tox-ini-fmt - repo: https://github.com/astral-sh/ruff-pre-commit - rev: v0.1.9 + rev: v0.1.14 hooks: - id: ruff args: [--fix, --exit-non-zero-on-fix] - repo: https://github.com/streetsidesoftware/cspell-cli - rev: v8.2.1 + rev: v8.3.0 hooks: - id: cspell name: Spell check with cspell - repo: https://github.com/jsh9/pydoclint - rev: 0.3.8 + rev: 0.3.9 hooks: - id: pydoclint args: diff --git a/pyproject.toml b/pyproject.toml index e121541..77e7f0b 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,7 +1,7 @@ [build-system] build-backend = "setuptools.build_meta" requires = [ - "setuptools >= 63.0.0", # required by pyproject+setuptools_scm integration + "setuptools >= 65.3.0", # required by pyproject+setuptools_scm integration and editable installs "setuptools_scm[toml] >= 7.0.5" # required for "no-local-version" scheme ] @@ -237,7 +237,7 @@ builtins = ["__"] fix = true line-length = 100 select = ["ALL"] -target-version = "py39" +target-version = "py310" [tool.ruff.flake8-pytest-style] parametrize-values-type = "tuple" @@ -261,9 +261,19 @@ optional-dependencies.docs = {file = [".config/requirements-docs.in"]} optional-dependencies.test = {file = [".config/requirements-test.in"]} [tool.setuptools_scm] +# To prevent accidental pick of mobile version tags such 'v6' +git_describe_command = [ + "git", + "describe", + "--dirty", + "--long", + "--tags", + "--match", + "v*.*" +] local_scheme = "no-local-version" +tag_regex = '^(?Pv)?(?P[^\+]+)(?P.*)?$' write_to = "src/ansible_dev_tools/_version.py" [tool.tomlsort] -all = true in_place = true