Merge branch 'main' into feature_isolate_env

Author: cidrblock

.config/constraints.txt

@@ -8,9 +8,9 @@ ansible-builder==3.1.0
 astroid==3.3.9
 attrs==25.3.0
 babel==2.17.0
+backrefs==5.8
 beautifulsoup4==4.13.3
 bindep==2.13.0
-black==25.1.0
 build==1.2.2.post1
 cachetools==5.5.2
 cairocffi==1.7.1
@@ -22,7 +22,7 @@ chardet==5.2.0
 charset-normalizer==3.4.1
 click==8.1.8
 colorama==0.4.6
-coverage==7.7.1
+coverage==7.8.0
 csscompressor==0.9.5
 cssselect2==0.8.0
 defusedxml==0.7.1
@@ -35,7 +35,7 @@ exceptiongroup==1.2.2
 execnet==2.1.1
 filelock==3.18.0
 ghp-import==2.1.0
-griffe==1.7.1
+griffe==1.7.2
 hjson==3.1.0
 htmlmin2==0.1.13
 identify==2.6.9
@@ -60,12 +60,12 @@ mkdocs-gen-files==0.5.0
 mkdocs-get-deps==0.2.0
 mkdocs-htmlproofer-plugin==1.3.0
 mkdocs-macros-plugin==1.3.7
-mkdocs-material==9.6.9
+mkdocs-material==9.6.11
 mkdocs-material-extensions==1.3.1
 mkdocs-minify-plugin==0.8.0
 mkdocs-monorepo-plugin==1.1.0
-mkdocstrings==0.29.0
-mkdocstrings-python==1.16.8
+mkdocstrings==0.29.1
+mkdocstrings-python==1.16.10
 mypy==1.15.0
 mypy-extensions==1.0.0
 nodeenv==1.9.1
@@ -80,7 +80,7 @@ platformdirs==4.3.7
 pluggy==1.5.0
 pre-commit==4.2.0
 pycparser==2.22
-pydoclint==0.6.2
+pydoclint==0.6.5
 pygments==2.19.1
 pylint==3.3.6
 pymdown-extensions==10.14.3
@@ -94,25 +94,25 @@ python-slugify==8.0.4
 pyyaml==6.0.2
 pyyaml-env-tag==0.1
 referencing==0.36.2
-regex==2024.11.6
 requests==2.32.3
 rpds-py==0.24.0
-ruff==0.11.2
+ruff==0.11.4
 six==1.17.0
 soupsieve==2.6
 subprocess-tee==0.4.2
 super-collections==0.5.3
-termcolor==2.5.0
+termcolor==3.0.1
 text-unidecode==1.3
 tinycss2==1.4.0
 toml-sort==0.24.2
 tomli==2.2.1
 tomlkit==0.13.2
 tox==4.25.0
-types-pyyaml==6.0.12.20250326
-typing-extensions==4.12.2
+types-pyyaml==6.0.12.20250402
+typing-extensions==4.13.1
 urllib3==2.3.0
-virtualenv==20.29.3
+uv==0.6.13
+virtualenv==20.30.0
 watchdog==6.0.0
 webencodings==0.5.1
 wheel==0.45.1

.config/requirements-test.in

@@ -1,4 +1,3 @@
-black
 coverage[toml]
 mypy
 pip-tools

.pre-commit-config.yaml

@@ -45,6 +45,7 @@ repos:
     rev: v0.24.2
     hooks:
       - id: toml-sort-fix
+        alias: toml
 
   - repo: https://github.com/tox-dev/tox-ini-fmt
     rev: 1.5.0
@@ -55,18 +56,9 @@ repos:
     rev: v0.11.4
     hooks:
       - id: ruff
-        args:
-          - --fix
-          - --exit-non-zero-on-fix
-        types_or: [python, pyi]
-      - id: ruff-format # must be after ruff
+        entry: sh -c 'ruff check --fix --force-exclude && ruff format --force-exclude'
         types_or: [python, pyi]
 
-  - repo: https://github.com/psf/black # must be after ruff
-    rev: 25.1.0
-    hooks:
-      - id: black
-
   - repo: https://github.com/streetsidesoftware/cspell-cli
     rev: v8.17.3
     hooks:

.prettierrc.yaml

@@ -0,0 +1,18 @@
+---
+proseWrap: always
+jsonRecursiveSort: true # prettier-plugin-sort-json
+tabWidth: 2
+useTabs: false
+overrides:
+  - files:
+      - "*.md"
+    options:
+      # compatibility with markdownlint
+      proseWrap: always
+      printWidth: 80
+  - files:
+      - "*.yaml"
+      - "*.yml"
+    options:
+      # compatibility with yamllint
+      proseWrap: preserve

.taplo.toml

@@ -0,0 +1,10 @@
+[formatting]
+# cspell: disable-next-line
+# compatibility between toml-sort-fix pre-commit hook and panekj.even-betterer-toml extension
+align_comments = false
+array_trailing_comma = false
+compact_arrays = true
+compact_entries = false
+compact_inline_tables = true
+inline_table_expand = false
+reorder_keys = true

.vscode/extensions.json

@@ -4,12 +4,12 @@
     "esbenp.prettier-vscode",
     "gruntfuggly.triggertaskonsave",
     "markis.code-coverage",
-    "ms-python.black-formatter",
     "ms-python.debugpy",
     "ms-python.mypy-type-checker",
     "ms-python.pylint",
     "ms-python.python",
     "sonarsource.sonarlint-vscode",
     "streetsidesoftware.code-spell-checker"
-  ]
+  ],
+  "unwantedRecommendations": ["ms-python.black-formatter"]
 }

.vscode/settings.json

@@ -7,7 +7,7 @@
       "source.fixAll": "explicit",
       "source.organizeImports": "explicit"
     },
-    "editor.defaultFormatter": "ms-python.black-formatter",
+    "editor.defaultFormatter": "charliermarsh.ruff",
     "editor.formatOnSave": true
   },
   "flake8.importStrategy": "fromEnvironment",

README.md

@@ -9,21 +9,29 @@ A pip-like install for ansible collections.
 - Install all collection python requirements
 - Install all collection test requirements
 - Checks for missing system packages
-- Symlinks the current collection into the current python interpreter's site-packages
-- Install all collection collection dependencies into the current python interpreter's site-packages
+- Symlinks the current collection into the current python interpreter's
+  site-packages
+- Install all collection collection dependencies into the current python
+  interpreter's site-packages
 
-By placing collections into the python site-packages directory they are discoverable by ansible as well as python and pytest.
+By placing collections into the python site-packages directory they are
+discoverable by ansible as well as python and pytest.
 
 ## Communication
 
 - Join the Ansible forum:
 
-  - [Get Help](https://forum.ansible.com/c/help/6): get help or help others. Please add appropriate tags if you start new discussions.
-  - [Social Spaces](https://forum.ansible.com/c/chat/4): gather and interact with fellow enthusiasts.
-  - [News & Announcements](https://forum.ansible.com/c/news/5): track project-wide announcements including social events.
-  - [Bullhorn newsletter](https://docs.ansible.com/ansible/devel/community/communication.html#the-bullhorn): used to announce releases and important changes.
-
-For more information about communication, see the [Ansible communication guide](https://docs.ansible.com/ansible/devel/community/communication.html).
+  - [Get Help](https://forum.ansible.com/c/help/6): get help or help others.
+    Please add appropriate tags if you start new discussions.
+  - [Social Spaces](https://forum.ansible.com/c/chat/4): gather and interact
+    with fellow enthusiasts.
+  - [News & Announcements](https://forum.ansible.com/c/news/5): track
+    project-wide announcements including social events.
+  - [Bullhorn newsletter](https://docs.ansible.com/ansible/devel/community/communication.html#the-bullhorn):
+    used to announce releases and important changes.
+
+For more information about communication, see the
+[Ansible communication guide](https://docs.ansible.com/ansible/devel/community/communication.html).
 
 ## Usage
 

docs/index.md

@@ -6,12 +6,17 @@ A pip-like install for Ansible collections.
 
 - Join the Ansible forum:
 
-  - [Get Help](https://forum.ansible.com/c/help/6): get help or help others. Please add appropriate tags if you start new discussions.
-  - [Social Spaces](https://forum.ansible.com/c/chat/4): gather and interact with fellow enthusiasts.
-  - [News & Announcements](https://forum.ansible.com/c/news/5): track project-wide announcements including social events.
-  - [Bullhorn newsletter](https://docs.ansible.com/ansible/devel/community/communication.html#the-bullhorn): used to announce releases and important changes.
-
-For more information about communication, see the [Ansible communication guide](https://docs.ansible.com/ansible/devel/community/communication.html).
+  - [Get Help](https://forum.ansible.com/c/help/6): get help or help others.
+    Please add appropriate tags if you start new discussions.
+  - [Social Spaces](https://forum.ansible.com/c/chat/4): gather and interact
+    with fellow enthusiasts.
+  - [News & Announcements](https://forum.ansible.com/c/news/5): track
+    project-wide announcements including social events.
+  - [Bullhorn newsletter](https://docs.ansible.com/ansible/devel/community/communication.html#the-bullhorn):
+    used to announce releases and important changes.
+
+For more information about communication, see the
+[Ansible communication guide](https://docs.ansible.com/ansible/devel/community/communication.html).
 
 ## Features
 
@@ -20,11 +25,15 @@ For more information about communication, see the [Ansible communication guide](
 - Install all collection python requirements
 - Install all collection test requirements
 - Checks for missing system packages
-- Symlinks the current collection into the current python interpreter's site-packages
-- Install all collection collection dependencies into the current python interpreter's site-packages
-- Uses `uv env` instead of python's venv when available to boost performance. Can be disabled with `SKIP_UV=1`
-
-By placing collections into the python site-packages directory they are discoverable by ansible as well as python and pytest.
+- Symlinks the current collection into the current python interpreter's
+  site-packages
+- Install all collection collection dependencies into the current python
+  interpreter's site-packages
+- Uses `uv env` instead of python's venv when available to boost performance.
+  Can be disabled with `SKIP_UV=1`
+
+By placing collections into the python site-packages directory they are
+discoverable by ansible as well as python and pytest.
 
 ## Usage
 

pyproject.toml

@@ -41,9 +41,6 @@ documentation = "https://ansible.readthedocs.io/projects/dev-environment/"
 homepage = "https://github.com/ansible/ansible-dev-environment"
 repository = "https://github.com/ansible/ansible-dev-environment"
 
-[tool.black]
-line-length = 100
-
 [tool.coverage.report]
 exclude_also = ["if TYPE_CHECKING:", "pragma: no cover"]
 fail_under = 85