From 72176f835d353e354ed0fc18d48b62338f192c53 Mon Sep 17 00:00:00 2001 From: Sorin Sbarnea Date: Wed, 10 Jan 2024 12:40:30 +0000 Subject: [PATCH 1/2] Update test dependencies Fixes: #340 --- .github/release-drafter.yml | 5 ++- pyproject.toml | 22 +++++----- requirements.txt | 80 +++++++++++++++++++++---------------- 3 files changed, 59 insertions(+), 48 deletions(-) diff --git a/.github/release-drafter.yml b/.github/release-drafter.yml index 1893b9fa..b2c18a90 100644 --- a/.github/release-drafter.yml +++ b/.github/release-drafter.yml @@ -1,2 +1,3 @@ -# see https://github.com/ansible/devtools -_extends: ansible/devtools +--- +# see https://github.com/ansible/team-devtools +_extends: ansible/team-devtools diff --git a/pyproject.toml b/pyproject.toml index d7602b7a..dcd9ee19 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,7 +1,7 @@ [build-system] requires = [ "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 + "setuptools_scm[toml] >= 7.0.5", # required for "no-local-version" scheme ] build-backend = "setuptools.build_meta" @@ -12,9 +12,9 @@ dynamic = ["version"] name = "ansible-compat" description = "Ansible compatibility goodies" readme = "README.md" -authors = [{"name" = "Sorin Sbarnea", "email" = "ssbarnea@redhat.com"}] -maintainers = [{"name" = "Sorin Sbarnea", "email" = "ssbarnea@redhat.com"}] -license = {text = "MIT"} +authors = [{ "name" = "Sorin Sbarnea", "email" = "ssbarnea@redhat.com" }] +maintainers = [{ "name" = "Sorin Sbarnea", "email" = "ssbarnea@redhat.com" }] +license = { text = "MIT" } classifiers = [ "Development Status :: 5 - Production/Stable", "Environment :: Console", @@ -33,7 +33,7 @@ classifiers = [ "Topic :: Software Development :: Bug Tracking", "Topic :: Software Development :: Quality Assurance", "Topic :: Software Development :: Testing", - "Topic :: Utilities" + "Topic :: Utilities", ] keywords = ["ansible"] dependencies = [ @@ -43,12 +43,12 @@ dependencies = [ "PyYAML", "subprocess-tee>=0.4.1", "jsonschema>=4.6.0", - "typing-extensions>=4.5.0;python_version<'3.10'" + "typing-extensions>=4.5.0;python_version<'3.10'", ] [project.optional-dependencies] docs = ["argparse-manpage", "black", "mkdocs-ansible[lock]>=0.1.2"] -test = ["coverage", "pip-tools", "pytest>=7.2.0", "pytest-mock", "pytest-plus"] +test = ["coverage", "pip-tools", "pytest>=7.2.0", "pytest-mock", "pytest-plus>=0.6.1"] [project.urls] homepage = "https://github.com/ansible/ansible-compat" @@ -99,7 +99,7 @@ good-names = [ "ns", # namespace "ex", "Run", - "_" + "_", ] [tool.pylint.IMPORTS] @@ -115,7 +115,7 @@ disable = [ "too-many-arguments", # PLR0913 "raise-missing-from", # Temporary disable duplicate detection we remove old code from prerun - "duplicate-code" + "duplicate-code", ] [tool.pytest.ini_options] @@ -124,7 +124,7 @@ filterwarnings = [ "error", # py312 ansible-core # https://github.com/ansible/ansible/issues/81906 - "ignore:'importlib.abc.TraversableResources' is deprecated and slated for removal in Python 3.14:DeprecationWarning" + "ignore:'importlib.abc.TraversableResources' is deprecated and slated for removal in Python 3.14:DeprecationWarning", ] testpaths = ["test"] @@ -143,7 +143,7 @@ ignore = [ "PLR0912", # Bug https://github.com/charliermarsh/ruff/issues/4244 "PLR0913", # Bug https://github.com/charliermarsh/ruff/issues/4244 "RUF012", - "PERF203" + "PERF203", ] target-version = "py39" diff --git a/requirements.txt b/requirements.txt index 6610cc5f..1d4ed20f 100644 --- a/requirements.txt +++ b/requirements.txt @@ -6,19 +6,20 @@ # argparse-manpage==4.5 # via ansible-compat (pyproject.toml) -attrs==23.1.0 +attrs==23.2.0 # via # jsonschema # referencing -babel==2.12.1 +babel==2.13.1 # via # mkdocs-ansible # mkdocs-material beautifulsoup4==4.12.2 # via + # linkchecker # mkdocs-ansible # mkdocs-htmlproofer-plugin -black==23.9.1 +black==23.12.1 # via ansible-compat (pyproject.toml) build==1.0.3 # via pip-tools @@ -28,7 +29,7 @@ cairocffi==1.6.1 # mkdocs-ansible cairosvg==2.7.1 # via mkdocs-ansible -certifi==2023.7.22 +certifi==2023.11.17 # via # mkdocs-ansible # requests @@ -37,7 +38,7 @@ cffi==1.16.0 # cairocffi # cryptography # mkdocs-ansible -charset-normalizer==3.2.0 +charset-normalizer==3.3.2 # via # mkdocs-ansible # requests @@ -46,15 +47,16 @@ click==8.1.7 # black # mkdocs # mkdocs-ansible + # mkdocstrings # pip-tools colorama==0.4.6 # via # griffe # mkdocs-ansible # mkdocs-material -coverage==7.3.2 +coverage==7.4.0 # via ansible-compat (pyproject.toml) -cryptography==41.0.4 +cryptography==41.0.7 # via ansible-core csscompressor==0.9.5 # via @@ -68,13 +70,17 @@ defusedxml==0.7.1 # via # cairosvg # mkdocs-ansible +dnspython==2.4.2 + # via + # linkchecker + # mkdocs-ansible exceptiongroup==1.2.0 # via pytest ghp-import==2.1.0 # via # mkdocs # mkdocs-ansible -griffe==0.36.4 +griffe==0.38.0 # via # mkdocs-ansible # mkdocstrings-python @@ -101,11 +107,13 @@ jsmin==3.0.1 # via # mkdocs-ansible # mkdocs-minify-plugin -jsonschema==4.19.1 +jsonschema==4.20.0 # via ansible-compat (pyproject.toml) -jsonschema-specifications==2023.7.1 +jsonschema-specifications==2023.12.1 # via jsonschema -markdown==3.4.4 +linkchecker==10.3.0 + # via mkdocs-ansible +markdown==3.5.1 # via # markdown-include # mkdocs @@ -115,7 +123,7 @@ markdown==3.4.4 # mkdocs-material # mkdocstrings # pymdown-extensions -markdown-exec==1.6.0 +markdown-exec==1.8.0 # via mkdocs-ansible markdown-include==0.8.1 # via mkdocs-ansible @@ -139,7 +147,7 @@ mkdocs==1.5.3 # mkdocs-minify-plugin # mkdocs-monorepo-plugin # mkdocstrings -mkdocs-ansible==0.2.0 +mkdocs-ansible==0.2.1 # via # ansible-compat (pyproject.toml) # mkdocs-ansible @@ -151,25 +159,25 @@ mkdocs-gen-files==0.5.0 # via mkdocs-ansible mkdocs-htmlproofer-plugin==1.0.0 # via mkdocs-ansible -mkdocs-material==9.4.2 +mkdocs-material==9.5.3 # via mkdocs-ansible -mkdocs-material-extensions==1.2 +mkdocs-material-extensions==1.3.1 # via # mkdocs-ansible # mkdocs-material -mkdocs-minify-plugin==0.7.1 +mkdocs-minify-plugin==0.7.2 # via mkdocs-ansible -mkdocs-monorepo-plugin==1.0.5 +mkdocs-monorepo-plugin==1.1.0 # via mkdocs-ansible -mkdocstrings==0.23.0 +mkdocstrings==0.24.0 # via # mkdocs-ansible # mkdocstrings-python -mkdocstrings-python==1.7.1 +mkdocstrings-python==1.7.5 # via mkdocs-ansible mypy-extensions==1.0.0 # via black -packaging==23.1 +packaging==23.2 # via # ansible-compat (pyproject.toml) # ansible-core @@ -187,32 +195,33 @@ pathspec==0.11.2 # black # mkdocs # mkdocs-ansible -pillow==10.0.1 +pillow==10.2.0 # via # cairosvg # mkdocs-ansible -pip==23.2.1 +pip==23.3.2 # via pip-tools pip-tools==7.3.0 # via ansible-compat (pyproject.toml) -pipdeptree==2.13.0 +pipdeptree==2.13.1 # via mkdocs-ansible -platformdirs==3.10.0 +platformdirs==4.0.0 # via # black # mkdocs # mkdocs-ansible + # mkdocstrings pluggy==1.3.0 # via pytest pycparser==2.21 # via # cffi # mkdocs-ansible -pygments==2.16.1 +pygments==2.17.1 # via # mkdocs-ansible # mkdocs-material -pymdown-extensions==10.3 +pymdown-extensions==10.7 # via # markdown-exec # mkdocs-ansible @@ -220,14 +229,14 @@ pymdown-extensions==10.3 # mkdocstrings pyproject-hooks==1.0.0 # via build -pytest==7.4.2 +pytest==7.4.4 # via # ansible-compat (pyproject.toml) # pytest-mock # pytest-plus -pytest-mock==3.11.1 +pytest-mock==3.12.0 # via ansible-compat (pyproject.toml) -pytest-plus==0.4.0 +pytest-plus==0.6.1 # via ansible-compat (pyproject.toml) python-dateutil==2.8.2 # via @@ -249,24 +258,25 @@ pyyaml-env-tag==0.1 # via # mkdocs # mkdocs-ansible -referencing==0.30.2 +referencing==0.32.1 # via # jsonschema # jsonschema-specifications -regex==2023.8.8 +regex==2023.10.3 # via # mkdocs-ansible # mkdocs-material requests==2.31.0 # via + # linkchecker # mkdocs-ansible # mkdocs-htmlproofer-plugin # mkdocs-material -rpds-py==0.10.4 +rpds-py==0.16.2 # via # jsonschema # referencing -setuptools==68.2.2 +setuptools==69.0.3 # via pip-tools six==1.16.0 # via @@ -299,7 +309,7 @@ typing-extensions==4.8.0 # via # black # mkdocs-ansible -urllib3==2.0.5 +urllib3==2.1.0 # via # mkdocs-ansible # requests @@ -312,7 +322,7 @@ webencodings==0.5.1 # cssselect2 # mkdocs-ansible # tinycss2 -wheel==0.41.2 +wheel==0.42.0 # via pip-tools zipp==3.17.0 # via From c6b839983b3ffb9dd36df0f952e0a057bbfc8aeb Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Wed, 10 Jan 2024 12:41:08 +0000 Subject: [PATCH 2/2] chore: auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- pyproject.toml | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index dcd9ee19..0e7d8432 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,7 +1,7 @@ [build-system] requires = [ "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 + "setuptools_scm[toml] >= 7.0.5" # required for "no-local-version" scheme ] build-backend = "setuptools.build_meta" @@ -12,9 +12,9 @@ dynamic = ["version"] name = "ansible-compat" description = "Ansible compatibility goodies" readme = "README.md" -authors = [{ "name" = "Sorin Sbarnea", "email" = "ssbarnea@redhat.com" }] -maintainers = [{ "name" = "Sorin Sbarnea", "email" = "ssbarnea@redhat.com" }] -license = { text = "MIT" } +authors = [{"name" = "Sorin Sbarnea", "email" = "ssbarnea@redhat.com"}] +maintainers = [{"name" = "Sorin Sbarnea", "email" = "ssbarnea@redhat.com"}] +license = {text = "MIT"} classifiers = [ "Development Status :: 5 - Production/Stable", "Environment :: Console", @@ -33,7 +33,7 @@ classifiers = [ "Topic :: Software Development :: Bug Tracking", "Topic :: Software Development :: Quality Assurance", "Topic :: Software Development :: Testing", - "Topic :: Utilities", + "Topic :: Utilities" ] keywords = ["ansible"] dependencies = [ @@ -43,7 +43,7 @@ dependencies = [ "PyYAML", "subprocess-tee>=0.4.1", "jsonschema>=4.6.0", - "typing-extensions>=4.5.0;python_version<'3.10'", + "typing-extensions>=4.5.0;python_version<'3.10'" ] [project.optional-dependencies] @@ -99,7 +99,7 @@ good-names = [ "ns", # namespace "ex", "Run", - "_", + "_" ] [tool.pylint.IMPORTS] @@ -115,7 +115,7 @@ disable = [ "too-many-arguments", # PLR0913 "raise-missing-from", # Temporary disable duplicate detection we remove old code from prerun - "duplicate-code", + "duplicate-code" ] [tool.pytest.ini_options] @@ -124,7 +124,7 @@ filterwarnings = [ "error", # py312 ansible-core # https://github.com/ansible/ansible/issues/81906 - "ignore:'importlib.abc.TraversableResources' is deprecated and slated for removal in Python 3.14:DeprecationWarning", + "ignore:'importlib.abc.TraversableResources' is deprecated and slated for removal in Python 3.14:DeprecationWarning" ] testpaths = ["test"] @@ -143,7 +143,7 @@ ignore = [ "PLR0912", # Bug https://github.com/charliermarsh/ruff/issues/4244 "PLR0913", # Bug https://github.com/charliermarsh/ruff/issues/4244 "RUF012", - "PERF203", + "PERF203" ] target-version = "py39"