From 267c6d05a7c36028b562eb378e3ea2ccaa5aa941 Mon Sep 17 00:00:00 2001 From: "Bradley A. Thornton" Date: Mon, 14 Aug 2023 14:21:37 -0700 Subject: [PATCH] Improve smoke test --- .vscode/extensions.json | 9 +++++++++ .vscode/settings.json | 17 +++++++++++++++++ pyproject.toml | 30 ++++++++++++++++-------------- src/ansible_cdk/__main__.py | 12 ++++++++++++ tests/integration/test_basic.py | 19 +++++++++++++++++-- 5 files changed, 71 insertions(+), 16 deletions(-) create mode 100644 .vscode/extensions.json create mode 100644 .vscode/settings.json create mode 100644 src/ansible_cdk/__main__.py diff --git a/.vscode/extensions.json b/.vscode/extensions.json new file mode 100644 index 0000000..4bab9ac --- /dev/null +++ b/.vscode/extensions.json @@ -0,0 +1,9 @@ +{ + "recommendations": [ + "ms-python.black-formatter", + "ms-python.pylint", + "charliermarsh.ruff", + "matangover.mypy", + "esbenp.prettier-vscode" + ] +} \ No newline at end of file diff --git a/.vscode/settings.json b/.vscode/settings.json new file mode 100644 index 0000000..433fae7 --- /dev/null +++ b/.vscode/settings.json @@ -0,0 +1,17 @@ +{ + "python.testing.unittestEnabled": false, + "python.testing.pytestEnabled": true, + // Override the pyproject.toml and disable xdist to enable test debugging + "python.testing.pytestArgs": ["-n0", "--dist", "no"], + "[python]": { + "editor.formatOnSave": true, + "editor.codeActionsOnSave": { + "source.fixAll": true + } + }, + "mypy.runUsingActiveInterpreter": true, + "mypy.targets": ["src", "tests"], + "[jsonc]": { + "editor.defaultFormatter": "esbenp.prettier-vscode" +} +} diff --git a/pyproject.toml b/pyproject.toml index bd151a1..edf1650 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -39,6 +39,8 @@ repository = "https://github.com/ansible-community/ansible-cdk" [tool.mypy] strict = true +files = ["src", "tests"] + [tool.pydoclint] allow-init-docstring = true @@ -73,8 +75,8 @@ disable = [ "C0123", # unidiomatic-typecheck / ruff E721 "C0131", # typevar-double-variance / ruff PLC0131 "C0132", # typevar-name-mismatch / ruff PLC0132 - "C0198", # bad-docstring-quotes / ruff Q002 - "C0199", # docstring-first-line-empty / ruff D210 + # "C0198", # bad-docstring-quotes / ruff Q002 + # "C0199", # docstring-first-line-empty / ruff D210 "C0201", # consider-iterating-dictionary / ruff SIM118 "C0202", # bad-classmethod-argument / ruff PLC0202 "C0205", # single-string-used-for-slots / ruff PLC0205 @@ -88,9 +90,9 @@ disable = [ "C0412", # ungrouped-imports / ruff I001 "C0413", # wrong-import-position / ruff E402 "C0414", # useless-import-alias / ruff PLC0414 - "C0501", # consider-using-any-or-all / ruff PLC0501 - "C1901", # compare-to-empty-string / ruff PLC1901 - "C2201", # misplaced-comparison-constant / ruff SIM300 + # "C0501", # consider-using-any-or-all / ruff PLC0501 + # "C1901", # compare-to-empty-string / ruff PLC1901 + # "C2201", # misplaced-comparison-constant / ruff SIM300 "C3001", # unnecessary-lambda-assignment / ruff PLC3001 "C3002", # unnecessary-direct-lambda-call / ruff PLC3002 "E0001", # syntax-error / ruff E999 @@ -140,7 +142,7 @@ disable = [ "R0912", # too-many-branches / ruff PLR0912 "R0913", # too-many-arguments / ruff PLR0913 "R0915", # too-many-statements / ruff PLR0915 - "R1260", # too-complex / ruff C901 + # "R1260", # too-complex / ruff C901 "R1701", # consider-merging-isinstance / ruff PLR1701 "R1705", # no-else-return / ruff RET505 "R1706", # consider-using-ternary / ruff SIM108 @@ -161,10 +163,10 @@ disable = [ "R1729", # use-a-generator / ruff C417 "R1734", # use-list-literal / ruff C405 "R1735", # use-dict-literal / ruff C406 - "R2004", # magic-value-comparison / ruff PLR2004 - "R5501", # else-if-used / ruff PLR5501 - "R6002", # consider-using-alias / ruff UP006 - "R6003", # consider-alternative-union-syntax / ruff UP007 + # "R2004", # magic-value-comparison / ruff PLR2004 + # "R5501", # else-if-used / ruff PLR5501 + # "R6002", # consider-using-alias / ruff UP006 + # "R6003", # consider-alternative-union-syntax / ruff UP007 "W0102", # dangerous-default-value / ruff B006 "W0104", # pointless-statement / ruff B018 "W0106", # expression-not-assigned / ruff B018 @@ -178,7 +180,7 @@ disable = [ "W0130", # duplicate-value / ruff PLW0130 "W0131", # named-expr-without-context / ruff PLW0131 "W0150", # lost-exception / ruff B012 - "W0160", # consider-ternary-expression / ruff SIM108 + # "W0160", # consider-ternary-expression / ruff SIM108 "W0199", # assert-on-tuple / ruff F631 "W0301", # unnecessary-semicolon / ruff E703 "W0401", # wildcard-import / ruff F403 @@ -218,9 +220,9 @@ disable = [ "W1509", # subprocess-popen-preexec-fn / ruff PLW1509 "W1510", # subprocess-run-check / ruff PLW1510 "W1515", # forgotten-debug-statement / ruff T100 - "W1641", # eq-without-hash / ruff PLW1641 - "W2901", # redefined-loop-name / ruff PLW2901 - "W3201", # bad-dunder-name / ruff PLW3201 + # "W1641", # eq-without-hash / ruff PLW1641 + # "W2901", # redefined-loop-name / ruff PLW2901 + # "W3201", # bad-dunder-name / ruff PLW3201 "W3301", # nested-min-max / ruff PLW3301 "duplicate-code", "fixme", diff --git a/src/ansible_cdk/__main__.py b/src/ansible_cdk/__main__.py new file mode 100644 index 0000000..742299d --- /dev/null +++ b/src/ansible_cdk/__main__.py @@ -0,0 +1,12 @@ + +"""A runpy entry point for ansible-cdk. + +This makes it possible to invoke CLI +via :command:`python -m ansible_cdk`. +""" + +from .cli import main + + +if __name__ == "__main__": + main() \ No newline at end of file diff --git a/tests/integration/test_basic.py b/tests/integration/test_basic.py index 98b8c00..2d568ab 100644 --- a/tests/integration/test_basic.py +++ b/tests/integration/test_basic.py @@ -1,6 +1,21 @@ """Basic smoke tests.""" +from ansible_cdk.version_builder import PKGS +import pytest +import subprocess +import sys -def test_run() -> None: + +@pytest.mark.parametrize("package", PKGS) +def test_version(package: str) -> None: """Placeholder.""" - assert True + command = f"{sys.executable} -m ansible_cdk --version" + proc = subprocess.run( + args=command, + shell=True, + text=True, + check=True, + capture_output=True, + ) + assert proc.returncode == 0 + assert package in proc.stdout