From 4bf5e6e2151ff3d6a331a3b99771192a0d054e07 Mon Sep 17 00:00:00 2001 From: Mohammed Naser Date: Sat, 20 Jan 2024 13:55:30 -0500 Subject: [PATCH] chore: update to latest molecule --- molecule/default/molecule.yml | 2 +- poetry.lock | 183 ++++++++++------------------------ pyproject.toml | 3 +- 3 files changed, 55 insertions(+), 133 deletions(-) diff --git a/molecule/default/molecule.yml b/molecule/default/molecule.yml index 6696579f5..2d581b436 100644 --- a/molecule/default/molecule.yml +++ b/molecule/default/molecule.yml @@ -15,7 +15,7 @@ dependency: name: galaxy driver: - name: delegated + name: default ssh_connection_options: - -o ControlMaster=auto - -o ControlPersist=270s diff --git a/poetry.lock b/poetry.lock index 67ca09aa8..9311a8730 100644 --- a/poetry.lock +++ b/poetry.lock @@ -1,14 +1,14 @@ -# This file is automatically @generated by Poetry 1.7.1 and should not be changed by hand. +# This file is automatically @generated by Poetry 1.6.1 and should not be changed by hand. [[package]] name = "ansible-compat" -version = "3.0.1" +version = "4.1.11" description = "Ansible compatibility goodies" optional = false -python-versions = ">=3.8" +python-versions = ">=3.9" files = [ - {file = "ansible-compat-3.0.1.tar.gz", hash = "sha256:d7dc5e4b7fade9b7375c568a24475b7be81024cac2a20caef3260ef0b51287b4"}, - {file = "ansible_compat-3.0.1-py3-none-any.whl", hash = "sha256:a2a53975e6ea72221d33f82b75332a6416d00a381cb8a84db92fc29935f74bcb"}, + {file = "ansible-compat-4.1.11.tar.gz", hash = "sha256:b3e9f9d7c3a1ce6222de444e9dc6fece7eba70ac64f2a0befdc4e2d542018b4a"}, + {file = "ansible_compat-4.1.11-py3-none-any.whl", hash = "sha256:74a91807808a39af48ab6595811b9340d1458db26b138362f48bf39292190705"}, ] [package.dependencies] @@ -19,8 +19,8 @@ PyYAML = "*" subprocess-tee = ">=0.4.1" [package.extras] -docs = ["argparse-manpage", "black", "cairosvg", "markdown-include", "mkdocs", "mkdocs-exclude", "mkdocs-material", "mkdocs-material-extensions", "mkdocstrings", "mkdocstrings-python", "pillow", "pymdown-extensions", "slugify"] -test = ["coverage", "pip-tools", "pytest (>=7.2.0)", "pytest-mock", "pytest-plus"] +docs = ["argparse-manpage", "black", "mkdocs-ansible[lock] (>=0.1.2)"] +test = ["coverage", "pip-tools", "pytest (>=7.2.0)", "pytest-mock", "pytest-plus (>=0.6.1)"] [[package]] name = "ansible-core" @@ -51,20 +51,6 @@ files = [ {file = "appdirs-1.4.4.tar.gz", hash = "sha256:7d5d0167b2b1ba821647616af46a749d1c653740dd0d2415100fe26e27afdf41"}, ] -[[package]] -name = "arrow" -version = "1.2.3" -description = "Better dates & times for Python" -optional = false -python-versions = ">=3.6" -files = [ - {file = "arrow-1.2.3-py3-none-any.whl", hash = "sha256:5a49ab92e3b7b71d96cd6bfcc4df14efefc9dfa96ea19045815914a6ab6b1fe2"}, - {file = "arrow-1.2.3.tar.gz", hash = "sha256:3934b30ca1b9f292376d9db15b19446088d12ec58629bc3f0da28fd55fb633a1"}, -] - -[package.dependencies] -python-dateutil = ">=2.7.0" - [[package]] name = "attrs" version = "22.2.0" @@ -84,19 +70,16 @@ tests = ["attrs[tests-no-zope]", "zope.interface"] tests-no-zope = ["cloudpickle", "cloudpickle", "hypothesis", "hypothesis", "mypy (>=0.971,<0.990)", "mypy (>=0.971,<0.990)", "pympler", "pympler", "pytest (>=4.3.0)", "pytest (>=4.3.0)", "pytest-mypy-plugins", "pytest-mypy-plugins", "pytest-xdist[psutil]", "pytest-xdist[psutil]"] [[package]] -name = "binaryornot" -version = "0.4.4" -description = "Ultra-lightweight pure Python package to check if a file is binary or text." +name = "bracex" +version = "2.4" +description = "Bash style brace expander." optional = false -python-versions = "*" +python-versions = ">=3.8" files = [ - {file = "binaryornot-0.4.4-py2.py3-none-any.whl", hash = "sha256:b8b71173c917bddcd2c16070412e369c3ed7f0528926f70cac18a6c97fd563e4"}, - {file = "binaryornot-0.4.4.tar.gz", hash = "sha256:359501dfc9d40632edc9fac890e19542db1a287bbcfa58175b66658392018061"}, + {file = "bracex-2.4-py3-none-any.whl", hash = "sha256:efdc71eff95eaff5e0f8cfebe7d01adf2c8637c8c92edaf63ef348c241a82418"}, + {file = "bracex-2.4.tar.gz", hash = "sha256:a27eaf1df42cf561fed58b7a8f3fdf129d1ea16a81e1fadd1d17989bc6384beb"}, ] -[package.dependencies] -chardet = ">=3.0.2" - [[package]] name = "certifi" version = "2023.7.22" @@ -184,17 +167,6 @@ files = [ [package.dependencies] pycparser = "*" -[[package]] -name = "chardet" -version = "5.1.0" -description = "Universal encoding detector for Python 3" -optional = false -python-versions = ">=3.7" -files = [ - {file = "chardet-5.1.0-py3-none-any.whl", hash = "sha256:362777fb014af596ad31334fde1e8c327dfdb076e1960d1694662d46a6917ab9"}, - {file = "chardet-5.1.0.tar.gz", hash = "sha256:0d62712b956bc154f85fb0a266e2a3c5913c2967e00348701b32411d6def31e5"}, -] - [[package]] name = "charset-normalizer" version = "3.0.1" @@ -334,26 +306,6 @@ files = [ {file = "colorama-0.4.6.tar.gz", hash = "sha256:08695f5cb7ed6e0531a20572697297273c47b8cae5a63ffc6d6ed5c201be6e44"}, ] -[[package]] -name = "cookiecutter" -version = "2.1.1" -description = "A command-line utility that creates projects from project templates, e.g. creating a Python package project from a Python package project template." -optional = false -python-versions = ">=3.7" -files = [ - {file = "cookiecutter-2.1.1-py2.py3-none-any.whl", hash = "sha256:9f3ab027cec4f70916e28f03470bdb41e637a3ad354b4d65c765d93aad160022"}, - {file = "cookiecutter-2.1.1.tar.gz", hash = "sha256:f3982be8d9c53dac1261864013fdec7f83afd2e42ede6f6dd069c5e149c540d5"}, -] - -[package.dependencies] -binaryornot = ">=0.4.4" -click = ">=7.0,<9.0.0" -Jinja2 = ">=2.7,<4.0.0" -jinja2-time = ">=0.2.0" -python-slugify = ">=4.0.0" -pyyaml = ">=5.3.1" -requests = ">=2.23.0" - [[package]] name = "coverage" version = "7.1.0" @@ -714,21 +666,6 @@ MarkupSafe = ">=2.0" [package.extras] i18n = ["Babel (>=2.7)"] -[[package]] -name = "jinja2-time" -version = "0.2.0" -description = "Jinja2 Extension for Dates and Times" -optional = false -python-versions = "*" -files = [ - {file = "jinja2-time-0.2.0.tar.gz", hash = "sha256:d14eaa4d315e7688daa4969f616f226614350c48730bfa1692d2caebd8c90d40"}, - {file = "jinja2_time-0.2.0-py2.py3-none-any.whl", hash = "sha256:d3eab6605e3ec8b7a0863df09cc1d23714908fa61aa6986a845c20ba488b4efa"}, -] - -[package.dependencies] -arrow = "*" -jinja2 = "*" - [[package]] name = "jmespath" version = "1.0.1" @@ -1000,58 +937,56 @@ files = [ [[package]] name = "molecule" -version = "4.0.4" +version = "6.0.3" description = "Molecule aids in the development and testing of Ansible roles" optional = false -python-versions = ">=3.8" +python-versions = ">=3.9" files = [ - {file = "molecule-4.0.4-py3-none-any.whl", hash = "sha256:437a0829c3273f542e0db09516ae743607e6a2eda4d8cbdfb407edda3e0facb2"}, - {file = "molecule-4.0.4.tar.gz", hash = "sha256:aab00c1ba62a42d77edd1a51528dfbb46abca70df7c7147fda0925ee4fe7deda"}, + {file = "molecule-6.0.3-py3-none-any.whl", hash = "sha256:8e5d7a7841f9ed5dd26878d24951ec030b86f780aca17ffc509db8076f42de3d"}, + {file = "molecule-6.0.3.tar.gz", hash = "sha256:d2a881062fcc5ef1e08c1e5127c04354d2c95171955e270bd82b3fbfef72d3b0"}, ] [package.dependencies] -ansible-compat = ">=2.2.0" +ansible-compat = ">=4.1.8" +ansible-core = ">=2.12.10" click = ">=8.0,<9" click-help-colors = ">=0.9" -cookiecutter = ">=1.7.3" enrich = ">=1.2.7" Jinja2 = ">=2.11.3" jsonschema = ">=4.9.1" -molecule-docker = {version = ">=1.0.0", optional = true, markers = "extra == \"docker\""} packaging = "*" pluggy = ">=0.7.1,<2.0" PyYAML = ">=5.1" rich = ">=9.5.1" +wcmatch = ">=8.1.2" [package.extras] -docker = ["molecule-docker (>=1.0.0)"] -docs = ["Sphinx (>=5.0.0,<6.0.0)", "ansible-core (>=2.12.0)", "jinja2 (<3.2.0)", "simplejson (>=3.17.2)", "sphinx-ansible-theme (>=0.8.0,<0.10.0)", "sphinx-notfound-page (>=0.7.1)"] -lint = ["check-jsonschema (>=0.18.3)", "flake8 (>=3.8.4)", "jsonschema (>=4.16.0)", "pre-commit (>=2.10.1)", "yamllint"] -podman = ["molecule-podman (>=1.0.1)"] -test = ["ansi2html (>=1.6.0)", "coverage (>=6.2)", "filelock", "pexpect (>=4.8.0,<5)", "pytest (>=6.1.2)", "pytest-cov (>=2.10.1)", "pytest-html (>=3.0.0)", "pytest-mock (>=3.3.1)", "pytest-plus (>=0.2)", "pytest-testinfra (>=6.1.0)", "pytest-xdist (>=2.1.0)"] -windows = ["pywinrm"] +docs = ["linkchecker (==10.2.1)", "mkdocs-ansible[lock] (>=0.2.0)", "pipdeptree (>=2.4.0)"] +test = ["ansi2html (>=1.8.0)", "ansible-lint (>=6.12.1)", "check-jsonschema", "coverage (>=7.0.3)", "filelock (>=3.9.0)", "pexpect (>=4.8.0,<5)", "pytest (>=7.2.0)", "pytest-mock (>=3.10.0)", "pytest-plus (>=0.4.0)", "pytest-xdist (>=3.1.0)"] +testinfra = ["pytest-testinfra (>=8.1.0)"] [[package]] -name = "molecule-docker" -version = "2.1.0" -description = "Molecule aids in the development and testing of Ansible roles" +name = "molecule-plugins" +version = "23.5.0" +description = "Molecule Plugins" optional = false -python-versions = ">=3.8" +python-versions = ">=3.9" files = [ - {file = "molecule-docker-2.1.0.tar.gz", hash = "sha256:195b97673cbc2335cfa6810816de5cbf807507bf350a9d16ca98b224b1647145"}, - {file = "molecule_docker-2.1.0-py3-none-any.whl", hash = "sha256:d439b075789be700b6594ed73f3254e2a25ed61dcf312d80ab6e718d13bf150e"}, + {file = "molecule-plugins-23.5.0.tar.gz", hash = "sha256:f13ea047b8650c892604b81b76382bc80bb4ae25ea50b23f30e81fd9d5802aff"}, + {file = "molecule_plugins-23.5.0-py3-none-any.whl", hash = "sha256:893dba8d077adb30fcd50a5d082300404ced3bb745451bc0927d4a1ada131d31"}, ] [package.dependencies] -docker = ">=4.3.1" -molecule = ">=4.0.0" -requests = "*" -selinux = {version = "*", markers = "sys_platform == \"linux\" or sys_platform == \"linux2\""} +docker = {version = ">=4.3.1", optional = true, markers = "extra == \"docker\""} +molecule = ">=5.0" +requests = {version = "*", optional = true, markers = "extra == \"docker\""} +selinux = {version = "*", optional = true, markers = "(sys_platform == \"linux\" or sys_platform == \"linux2\") and extra == \"docker\""} [package.extras] -docs = ["Sphinx", "simplejson", "sphinx-ansible-theme (>=0.2.2)"] -lint = ["pre-commit (>=1.21.0)"] -test = ["molecule[test]"] +docker = ["docker (>=4.3.1)", "requests", "selinux", "selinux"] +selinux = ["selinux", "selinux"] +test = ["molecule[test]", "pytest-helpers-namespace (>=2019.1.8)"] +vagrant = ["python-vagrant"] [[package]] name = "msgpack" @@ -1628,23 +1563,6 @@ files = [ [package.dependencies] six = ">=1.5" -[[package]] -name = "python-slugify" -version = "8.0.0" -description = "A Python slugify application that also handles Unicode" -optional = false -python-versions = ">=3.7" -files = [ - {file = "python-slugify-8.0.0.tar.gz", hash = "sha256:f1da83f3c7ab839b3f84543470cd95bdb5a81f1a0b80fed502f78b7dca256062"}, - {file = "python_slugify-8.0.0-py2.py3-none-any.whl", hash = "sha256:51f217508df20a6c166c7821683384b998560adcf8f19a6c2ca8b460528ccd9c"}, -] - -[package.dependencies] -text-unidecode = ">=1.3" - -[package.extras] -unidecode = ["Unidecode (>=1.1.1)"] - [[package]] name = "pytz" version = "2023.3" @@ -2031,17 +1949,6 @@ files = [ [package.extras] test = ["enrich (>=1.2.6)", "molecule (>=3.4.0)", "pytest (>=6.2.5)", "pytest-cov (>=2.12.1)", "pytest-plus (>=0.2)", "pytest-xdist (>=2.3.0)"] -[[package]] -name = "text-unidecode" -version = "1.3" -description = "The most basic Text::Unidecode port" -optional = false -python-versions = "*" -files = [ - {file = "text-unidecode-1.3.tar.gz", hash = "sha256:bad6603bb14d279193107714b288be206cac565dfa49aa5b105294dd5c4aab93"}, - {file = "text_unidecode-1.3-py2.py3-none-any.whl", hash = "sha256:1311f10e8b895935241623731c2ba64f4c455287888b18189350b67134a822e8"}, -] - [[package]] name = "tomli" version = "2.0.1" @@ -2109,6 +2016,20 @@ files = [ [package.extras] watchmedo = ["PyYAML (>=3.10)"] +[[package]] +name = "wcmatch" +version = "8.5" +description = "Wildcard/glob file name matcher." +optional = false +python-versions = ">=3.8" +files = [ + {file = "wcmatch-8.5-py3-none-any.whl", hash = "sha256:14554e409b142edeefab901dc68ad570b30a72a8ab9a79106c5d5e9a6d241bd5"}, + {file = "wcmatch-8.5.tar.gz", hash = "sha256:86c17572d0f75cbf3bcb1a18f3bf2f9e72b39a9c08c9b4a74e991e1882a8efb3"}, +] + +[package.dependencies] +bracex = ">=2.1.1" + [[package]] name = "websocket-client" version = "1.5.1" @@ -2212,4 +2133,4 @@ files = [ [metadata] lock-version = "2.0" python-versions = "^3.10" -content-hash = "421dde1591397e5ebe0aa21cbedb673f8d87e389c95e7d0e80727382e9eab76a" +content-hash = "47713d3daf671ca77ea86dba13bc4c50cc27fb9822340f05bbe0dbd326e33428" diff --git a/pyproject.toml b/pyproject.toml index 77317702b..0f44db07a 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -20,7 +20,8 @@ netaddr = "^0.8.0" [tool.poetry.group.dev.dependencies] flake8 = "^5.0.4" flake8-isort = "^4.2.0" -molecule = {version = "^4.0.4", extras = ["docker"]} +molecule = "^6.0.3" +molecule-plugins = {extras = ["docker"], version = "^23.5.0"} oslo-log = "^5.2.0" pytest = "^7.1.3" pytest-cov = "^3.0.0"