Test maintenance (#355)

- ensure uv uses same constraints as pip - update deps - fixed linting issues - remove black
ansible · Jan 29, 2025 · 349efe6 · 349efe6
1 parent 0377e05
commit 349efe6
Show file tree

Hide file tree

Showing 14 changed files with 220 additions and 182 deletions.
diff --git a/.config/constraints.txt b/.config/constraints.txt
@@ -1,112 +1,120 @@
-#
-# This file is autogenerated by pip-compile with Python 3.10
-# by the following command:
-#
-#    pip-compile --all-extras --no-annotate --output-file=.config/constraints.txt --strip-extras .config/requirements.in pyproject.toml
-#
-astroid==3.3.8
-babel==2.16.0
-beautifulsoup4==4.12.3
-black==24.10.0
-build==1.2.2.post1
-cachetools==5.5.1
-cairocffi==1.7.1
-cairosvg==2.7.1
-certifi==2024.12.14
-cffi==1.17.1
-cfgv==3.4.0
-chardet==5.2.0
-charset-normalizer==3.4.1
-click==8.1.8
-colorama==0.4.6
-coverage==7.6.10
-csscompressor==0.9.5
-cssselect2==0.7.0
-defusedxml==0.7.1
-dill==0.3.9
-distlib==0.3.9
-dnspython==2.7.0
-docstring-parser-fork==0.0.12
-exceptiongroup==1.2.2
-execnet==2.1.1
-filelock==3.17.0
-flake8==7.1.1
-ghp-import==2.1.0
-griffe==1.5.5
-htmlmin2==0.1.13
-identify==2.6.6
-idna==3.10
-iniconfig==2.0.0
-isort==5.13.2
-jinja2==3.1.5
-jsmin==3.0.1
-linkchecker==10.5.0
-markdown==3.7
-markdown-exec==1.10.0
-markdown-include==0.8.1
-markupsafe==3.0.2
-mccabe==0.7.0
-mergedeep==1.3.4
-mkdocs==1.6.1
-mkdocs-ansible==24.12.0
-mkdocs-autorefs==1.3.0
-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.5.50
-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.13.0
-mypy==1.14.1
-mypy-extensions==1.0.0
-nodeenv==1.9.1
-packaging==24.2
-paginate==0.5.7
-pathspec==0.12.1
-pillow==11.1.0
-pip-tools==7.4.1
-pipdeptree==2.24.0
-platformdirs==4.3.6
-pluggy==1.5.0
-pre-commit==4.1.0
-pycodestyle==2.12.1
-pycparser==2.22
-pydoclint==0.6.0
-pyflakes==3.2.0
-pygments==2.19.1
-pylint==3.3.3
-pymdown-extensions==10.14.1
-pyproject-api==1.9.0
-pyproject-hooks==1.2.0
-pytest==8.3.4
-pytest-xdist==3.6.1
-python-dateutil==2.9.0.post0
-python-slugify==8.0.4
-pyyaml==6.0.2
-pyyaml-env-tag==0.1
-regex==2024.11.6
-requests==2.32.3
-ruff==0.9.3
-six==1.17.0
-soupsieve==2.6
-termcolor==2.5.0
-text-unidecode==1.3
-tinycss2==1.4.0
-toml-sort==0.24.2
-tomli==2.2.1
-tomlkit==0.13.2
-tox==4.24.1
-types-pyyaml==6.0.12.20241230
-typing-extensions==4.12.2
-urllib3==2.3.0
-virtualenv==20.29.1
-watchdog==6.0.0
-webencodings==0.5.1
-wheel==0.45.1
+# This file was autogenerated by uv via the following command:
+#    tox run -e deps
+ansible-compat==25.1.1    # via ansible-lint
+ansible-lint==25.1.1      # via ansible-creator (pyproject.toml)
+argcomplete==3.5.3        # via ansible-creator (pyproject.toml)
+astroid==3.3.8            # via pylint
+attrs==25.1.0             # via jsonschema, referencing
+babel==2.16.0             # via mkdocs-material
+beautifulsoup4==4.12.3    # via linkchecker, mkdocs-htmlproofer-plugin
+black==25.1.0             # via ansible-lint
+bracex==2.5.post1         # via wcmatch
+cachetools==5.5.1         # via tox
+cairocffi==1.7.1          # via cairosvg
+cairosvg==2.7.1           # via mkdocs-ansible
+certifi==2024.12.14       # via requests
+cffi==1.17.1              # via cairocffi, cryptography
+cfgv==3.4.0               # via pre-commit
+chardet==5.2.0            # via tox
+charset-normalizer==3.4.1  # via requests
+click==8.1.8              # via black, mkdocs, mkdocstrings, pydoclint
+colorama==0.4.6           # via click, griffe, mkdocs, mkdocs-material, pylint, pytest, tox
+coverage==7.6.10          # via ansible-creator (pyproject.toml)
+cryptography==44.0.0      # via ansible-core
+csscompressor==0.9.5      # via mkdocs-minify-plugin
+cssselect2==0.7.0         # via cairosvg
+defusedxml==0.7.1         # via cairosvg
+dill==0.3.9               # via pylint
+distlib==0.3.9            # via virtualenv
+dnspython==2.7.0          # via linkchecker
+docstring-parser-fork==0.0.12  # via pydoclint
+execnet==2.1.1            # via pytest-xdist
+filelock==3.17.0          # via ansible-lint, tox, virtualenv
+ghp-import==2.1.0         # via mkdocs
+griffe==1.5.5             # via mkdocstrings-python
+hjson==3.1.0              # via mkdocs-macros-plugin, super-collections
+htmlmin2==0.1.13          # via mkdocs-minify-plugin
+identify==2.6.6           # via pre-commit
+idna==3.10                # via requests
+importlib-metadata==8.6.1  # via ansible-lint
+iniconfig==2.0.0          # via pytest
+isort==6.0.0              # via pylint
+jinja2==3.1.5             # via ansible-core, mkdocs, mkdocs-macros-plugin, mkdocs-material, mkdocstrings, ansible-creator (pyproject.toml)
+jsmin==3.0.1              # via mkdocs-minify-plugin
+jsonschema==4.23.0        # via ansible-compat, ansible-lint
+jsonschema-specifications==2024.10.1  # via jsonschema
+linkchecker==10.5.0       # via mkdocs-ansible
+markdown==3.7             # via markdown-include, mkdocs, mkdocs-autorefs, mkdocs-htmlproofer-plugin, mkdocs-material, mkdocstrings, pymdown-extensions
+markdown-exec==1.10.0     # via mkdocs-ansible
+markdown-include==0.8.1   # via mkdocs-ansible
+markupsafe==3.0.2         # via jinja2, mkdocs, mkdocs-autorefs, mkdocstrings
+mccabe==0.7.0             # via pylint
+mergedeep==1.3.4          # via mkdocs, mkdocs-get-deps
+mkdocs==1.6.1             # via mkdocs-ansible, mkdocs-autorefs, mkdocs-gen-files, mkdocs-htmlproofer-plugin, mkdocs-macros-plugin, mkdocs-material, mkdocs-minify-plugin, mkdocs-monorepo-plugin, mkdocstrings
+mkdocs-ansible==24.12.0   # via ansible-creator (pyproject.toml)
+mkdocs-autorefs==1.3.0    # via mkdocstrings, mkdocstrings-python
+mkdocs-gen-files==0.5.0   # via mkdocs-ansible
+mkdocs-get-deps==0.2.0    # via mkdocs
+mkdocs-htmlproofer-plugin==1.3.0  # via mkdocs-ansible
+mkdocs-macros-plugin==1.3.7  # via mkdocs-ansible
+mkdocs-material==9.5.50   # via mkdocs-ansible
+mkdocs-material-extensions==1.3.1  # via mkdocs-ansible, mkdocs-material
+mkdocs-minify-plugin==0.8.0  # via mkdocs-ansible
+mkdocs-monorepo-plugin==1.1.0  # via mkdocs-ansible
+mkdocstrings==0.27.0      # via mkdocs-ansible, mkdocstrings-python
+mkdocstrings-python==1.13.0  # via mkdocs-ansible
+mypy==1.14.1              # via ansible-creator (pyproject.toml)
+mypy-extensions==1.0.0    # via black, mypy
+nodeenv==1.9.1            # via pre-commit
+packaging==24.2           # via ansible-compat, ansible-core, ansible-lint, black, mkdocs, mkdocs-macros-plugin, pyproject-api, pytest, tox
+paginate==0.5.7           # via mkdocs-material
+pathspec==0.12.1          # via ansible-lint, black, mkdocs, mkdocs-macros-plugin, yamllint
+pillow==11.1.0            # via cairosvg, mkdocs-ansible
+platformdirs==4.3.6       # via black, mkdocs-get-deps, mkdocstrings, pylint, tox, virtualenv
+pluggy==1.5.0             # via pytest, tox
+pre-commit==4.1.0         # via ansible-creator (pyproject.toml)
+pycparser==2.22           # via cffi
+pydoclint==0.6.0          # via ansible-creator (pyproject.toml)
+pygments==2.19.1          # via mkdocs-material
+pylint==3.3.4             # via ansible-creator (pyproject.toml)
+pymdown-extensions==10.14.2  # via markdown-exec, mkdocs-ansible, mkdocs-material, mkdocstrings
+pyproject-api==1.9.0      # via tox
+pytest==8.3.4             # via pytest-xdist, ansible-creator (pyproject.toml)
+pytest-xdist==3.6.1       # via ansible-creator (pyproject.toml)
+python-dateutil==2.9.0.post0  # via ghp-import, mkdocs-macros-plugin
+python-slugify==8.0.4     # via mkdocs-monorepo-plugin
+pyyaml==6.0.2             # via ansible-compat, ansible-core, ansible-lint, mkdocs, mkdocs-get-deps, mkdocs-macros-plugin, pre-commit, pymdown-extensions, pyyaml-env-tag, yamllint, ansible-creator (pyproject.toml)
+pyyaml-env-tag==0.1       # via mkdocs
+referencing==0.36.2       # via jsonschema, jsonschema-specifications
+regex==2024.11.6          # via mkdocs-material
+requests==2.32.3          # via linkchecker, mkdocs-htmlproofer-plugin, mkdocs-material
+rpds-py==0.22.3           # via jsonschema, referencing
+ruamel-yaml==0.18.10      # via ansible-lint
+ruff==0.9.3               # via ansible-creator (pyproject.toml)
+six==1.17.0               # via python-dateutil
+soupsieve==2.6            # via beautifulsoup4
+subprocess-tee==0.4.2     # via ansible-compat, ansible-lint
+super-collections==0.5.3  # via mkdocs-macros-plugin
+termcolor==2.5.0          # via mkdocs-macros-plugin
+text-unidecode==1.3       # via python-slugify
+tinycss2==1.4.0           # via cairosvg, cssselect2
+toml-sort==0.24.2         # via ansible-creator (pyproject.toml)
+tomlkit==0.13.2           # via pylint, toml-sort
+tox==4.24.1               # via ansible-creator (pyproject.toml)
+types-pyyaml==6.0.12.20241230  # via ansible-creator (pyproject.toml)
+urllib3==2.3.0            # via requests
+virtualenv==20.29.1       # via pre-commit, tox
+watchdog==6.0.0           # via mkdocs
+wcmatch==10.0             # via ansible-lint
+webencodings==0.5.1       # via cssselect2, tinycss2
+yamllint==1.35.1          # via ansible-lint
+zipp==3.21.0              # via importlib-metadata
 
-# The following packages are considered to be unsafe in a requirements file:
-# pip
-# setuptools
+# The following packages were excluded from the output:
+# ansible-core
+# exceptiongroup
+# resolvelib
+# ruamel-yaml-clib
+# tomli
+# typing-extensions
+# uv
diff --git a/.config/requirements-docs.in b/.config/requirements-docs.in
@@ -1,2 +1 @@
 mkdocs-ansible>=24.3.0
-pipdeptree>=2.7.1
diff --git a/.config/requirements-test.in b/.config/requirements-test.in
@@ -1,9 +1,7 @@
-argcomplete
 ansible-lint
-black
+argcomplete
 coverage[toml]
 mypy
-pip-tools
 pre-commit
 pydoclint
 pylint
@@ -13,3 +11,4 @@ ruff
 toml-sort
 tox
 types-PyYAML
+uv
diff --git a/.gitignore b/.gitignore
@@ -170,3 +170,4 @@ cython_debug/
 
 .DS_Store
 node_modules
+_readthedocs
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -4,6 +4,11 @@ ci:
   autoupdate_commit_msg: "chore: pre-commit autoupdate"
   autoupdate_schedule: monthly
   autofix_commit_msg: "chore: auto fixes from pre-commit.com hooks"
+  skip:
+    # https://github.com/pre-commit-ci/issues/issues/55
+    - ccv
+    - lock
+    # No docker on pre-commit.ci
 
 repos:
   - repo: https://github.com/pre-commit/pre-commit-hooks
@@ -17,13 +22,6 @@ repos:
       - id: end-of-file-fixer
       - id: trailing-whitespace
 
-  - repo: https://github.com/asottile/add-trailing-comma.git
-    rev: v3.1.0
-    hooks:
-      - id: add-trailing-comma
-        args:
-          - --py36-plus
-
   - repo: https://github.com/Lucas-C/pre-commit-hooks.git
     rev: v1.5.5
     hooks:
@@ -33,7 +31,7 @@ repos:
             .config/pydoclint-baseline.txt
           )$
 
-  - repo: https://github.com/pycontribs/mirrors-prettier
+  - repo: https://github.com/rbubley/mirrors-prettier
     rev: v3.4.2
     hooks:
       - id: prettier
@@ -49,12 +47,12 @@ repos:
       - id: toml-sort-fix
 
   - repo: https://github.com/tox-dev/tox-ini-fmt
-    rev: 1.4.1
+    rev: 1.5.0
     hooks:
       - id: tox-ini-fmt
 
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.8.6
+    rev: v0.9.3
     hooks:
       - id: ruff
         args:
@@ -64,27 +62,22 @@ repos:
       - id: ruff-format # must be after ruff
         types_or: [python, pyi]
 
-  - repo: https://github.com/psf/black # must be after ruff
-    rev: 24.10.0
-    hooks:
-      - id: black
-
   - repo: https://github.com/streetsidesoftware/cspell-cli
-    rev: v8.17.0
+    rev: v8.17.1
     hooks:
       - id: cspell
         name: Spell check with cspell
 
   - repo: https://github.com/jsh9/pydoclint
-    rev: "0.5.14"
+    rev: "0.6.0"
     hooks:
       - id: pydoclint
         # This allows automatic reduction of the baseline file when needed.
         entry: sh -ec "pydoclint . && pydoclint --generate-baseline=1 ."
         pass_filenames: false
 
   - repo: https://github.com/pycqa/pylint.git
-    rev: v3.3.3
+    rev: v3.3.4
     hooks:
       - id: pylint
         args:
@@ -106,19 +99,33 @@ repos:
         # Override default pre-commit '--ignore-missing-imports'
         args: [--strict]
 
-  - repo: https://github.com/jazzband/pip-tools
-    rev: 7.4.1
+  # Keep last due to being considerably slower than the others:
+  - repo: local
+    hooks:
+      - id: deps
+        # To run it execute: `pre-commit run pip-compile-upgrade --hook-stage manual`
+        name: Upgrade constraints files and requirements
+        files: ^(pyproject\.toml|\.config/.*)$
+        always_run: true
+        language: python
+        language_version: "3.10" # minimal we support officially https://github.com/astral-sh/uv/issues/3883
+        entry: python3 -m uv pip compile -q --all-extras --universal --output-file=.config/constraints.txt pyproject.toml --upgrade
+        pass_filenames: false
+        stages:
+          - manual
+        additional_dependencies:
+          - uv>=0.5.25
+      - id: lock
+        name: Check constraints files and requirements
+        files: ^(pyproject\.toml|\.config/.*)$
+        language: python
+        language_version: "3.10" # minimal we support officially https://github.com/astral-sh/uv/issues/3883
+        entry: python3 -m uv pip compile -q --all-extras --universal --output-file=.config/constraints.txt pyproject.toml
+        pass_filenames: false
+        additional_dependencies:
+          - uv>=0.5.25
+  - repo: https://github.com/mashi/codecov-validator
+    rev: "1.0.1"
     hooks:
-      - id: pip-compile
-        name: deps
-        alias: deps
-        stages: [manual]
-        entry: >-
-          pip-compile .config/requirements.in
-          --upgrade
-          --all-extras
-          --no-annotate
-          --strip-extras
-          --output-file=.config/constraints.txt pyproject.toml
-        files: ^.config\/.*requirements.*$
-        language_version: "3.10" # minimal we support officially
+      - id: ccv
+        name: codecov
diff --git a/.readthedocs.yml b/.readthedocs.yml
@@ -11,7 +11,7 @@ build:
     python: "3.11"
   commands:
     - pip install --user tox
-    - python3 -m tox -e docs -- --strict --site-dir=_readthedocs/html/
+    - python3 -m tox -e docs
 python:
   install:
     - method: pip
Original file line number	Diff line number	Diff line change
Expand Up		@@ -170,3 +170,4 @@ cython_debug/

		.DS_Store
		node_modules
		_readthedocs