From ecad0893e4a96c8de55a44f28637956fbe02b4ea Mon Sep 17 00:00:00 2001 From: mrjk Date: Sun, 19 Jun 2022 23:50:51 -0400 Subject: [PATCH] Wip: Add all modifed files --- docs/api/kheops.plugin.backend.rst | 20 +--- docs/api/kheops.plugin.engine.rst | 18 ---- docs/api/kheops.plugin.rst | 2 +- docs/api/kheops.plugin.strategy.rst | 6 +- docs/api/kheops.rst | 14 +-- docs/api/modules.rst | 2 +- kheops/app.py | 2 +- poetry.lock | 139 +++++++++++++++++++++++++++- 8 files changed, 147 insertions(+), 56 deletions(-) delete mode 100644 docs/api/kheops.plugin.engine.rst diff --git a/docs/api/kheops.plugin.backend.rst b/docs/api/kheops.plugin.backend.rst index 4d48fe6..77d53bb 100644 --- a/docs/api/kheops.plugin.backend.rst +++ b/docs/api/kheops.plugin.backend.rst @@ -9,26 +9,10 @@ kheops.plugin.backend package Submodules ---------- -kheops.plugin.backend.hier module +kheops.plugin.backend.file module --------------------------------- -.. automodule:: kheops.plugin.backend.hier - :members: - :undoc-members: - :show-inheritance: - -kheops.plugin.backend.init module ---------------------------------- - -.. automodule:: kheops.plugin.backend.init - :members: - :undoc-members: - :show-inheritance: - -kheops.plugin.backend.loop module ---------------------------------- - -.. automodule:: kheops.plugin.backend.loop +.. automodule:: kheops.plugin.backend.file :members: :undoc-members: :show-inheritance: diff --git a/docs/api/kheops.plugin.engine.rst b/docs/api/kheops.plugin.engine.rst deleted file mode 100644 index 5dd1510..0000000 --- a/docs/api/kheops.plugin.engine.rst +++ /dev/null @@ -1,18 +0,0 @@ -kheops.plugin.engine package -============================ - -.. automodule:: kheops.plugin.engine - :members: - :undoc-members: - :show-inheritance: - -Submodules ----------- - -kheops.plugin.engine.jerakia module ------------------------------------ - -.. automodule:: kheops.plugin.engine.jerakia - :members: - :undoc-members: - :show-inheritance: diff --git a/docs/api/kheops.plugin.rst b/docs/api/kheops.plugin.rst index c8edaa1..444a3bc 100644 --- a/docs/api/kheops.plugin.rst +++ b/docs/api/kheops.plugin.rst @@ -13,7 +13,7 @@ Subpackages :maxdepth: 4 kheops.plugin.backend - kheops.plugin.engine + kheops.plugin.scope kheops.plugin.strategy Submodules diff --git a/docs/api/kheops.plugin.strategy.rst b/docs/api/kheops.plugin.strategy.rst index 8bc7b0d..5497258 100644 --- a/docs/api/kheops.plugin.strategy.rst +++ b/docs/api/kheops.plugin.strategy.rst @@ -17,10 +17,10 @@ kheops.plugin.strategy.last module :undoc-members: :show-inheritance: -kheops.plugin.strategy.schema module ------------------------------------- +kheops.plugin.strategy.merge\_deep module +----------------------------------------- -.. automodule:: kheops.plugin.strategy.schema +.. automodule:: kheops.plugin.strategy.merge_deep :members: :undoc-members: :show-inheritance: diff --git a/docs/api/kheops.rst b/docs/api/kheops.rst index b8b3e0f..4af2e99 100644 --- a/docs/api/kheops.rst +++ b/docs/api/kheops.rst @@ -33,18 +33,10 @@ kheops.cli module :undoc-members: :show-inheritance: -kheops.managers module ----------------------- +kheops.controllers module +------------------------- -.. automodule:: kheops.managers - :members: - :undoc-members: - :show-inheritance: - -kheops.query module -------------------- - -.. automodule:: kheops.query +.. automodule:: kheops.controllers :members: :undoc-members: :show-inheritance: diff --git a/docs/api/modules.rst b/docs/api/modules.rst index bf8b209..3a299b5 100644 --- a/docs/api/modules.rst +++ b/docs/api/modules.rst @@ -2,6 +2,6 @@ kheops ====== .. toctree:: - :maxdepth: 8 + :maxdepth: 4 kheops diff --git a/kheops/app.py b/kheops/app.py index 2d0fa69..2dd5a67 100644 --- a/kheops/app.py +++ b/kheops/app.py @@ -301,7 +301,7 @@ class Kheops(GenericInstance): except KeyError as err: raise Exception(f"Unknown kheops namespace: {ns_name}") - print ("CREATE", ns_name, ns_config) + # print ("CREATE", ns_name, ns_config) ns = KheopsNamespace(self, ns_name, ns_config) # Get result diff --git a/poetry.lock b/poetry.lock index 097167c..f6effcd 100644 --- a/poetry.lock +++ b/poetry.lock @@ -88,6 +88,14 @@ six = "*" [package.extras] test = ["astroid", "pytest"] +[[package]] +name = "atomicwrites" +version = "1.4.0" +description = "Atomic file writes." +category = "dev" +optional = false +python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*" + [[package]] name = "attrs" version = "21.4.0" @@ -205,7 +213,7 @@ unicode_backport = ["unicodedata2"] name = "click" version = "8.0.3" description = "Composable command line interface toolkit" -category = "dev" +category = "main" optional = false python-versions = ">=3.6" @@ -216,7 +224,7 @@ colorama = {version = "*", markers = "platform_system == \"Windows\""} name = "colorama" version = "0.4.4" description = "Cross-platform colored terminal text." -category = "dev" +category = "main" optional = false python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*" @@ -369,6 +377,14 @@ zipp = {version = ">=3.1.0", markers = "python_version < \"3.10\""} docs = ["sphinx", "jaraco.packaging (>=8.2)", "rst.linker (>=1.9)"] testing = ["pytest (>=6)", "pytest-checkdocs (>=2.4)", "pytest-flake8", "pytest-cov", "pytest-enabler (>=1.0.1)", "pytest-black (>=0.3.7)", "pytest-mypy"] +[[package]] +name = "iniconfig" +version = "1.1.1" +description = "iniconfig: brain-dead simple config-ini parsing" +category = "dev" +optional = false +python-versions = "*" + [[package]] name = "ipykernel" version = "6.7.0" @@ -948,6 +964,18 @@ python-versions = ">=3.6" [package.dependencies] pyparsing = ">=2.0.2,<3.0.5 || >3.0.5" +[[package]] +name = "pandoc" +version = "2.0.1" +description = "Pandoc Documents for Python" +category = "dev" +optional = false +python-versions = "*" + +[package.dependencies] +plumbum = "*" +ply = "*" + [[package]] name = "pandocfilters" version = "1.5.0" @@ -1007,6 +1035,42 @@ python-versions = ">=3.7" docs = ["Sphinx (>=4)", "furo (>=2021.7.5b38)", "proselint (>=0.10.2)", "sphinx-autodoc-typehints (>=1.12)"] test = ["appdirs (==1.4.4)", "pytest (>=6)", "pytest-cov (>=2.7)", "pytest-mock (>=3.6)"] +[[package]] +name = "pluggy" +version = "1.0.0" +description = "plugin and hook calling mechanisms for python" +category = "dev" +optional = false +python-versions = ">=3.6" + +[package.extras] +dev = ["pre-commit", "tox"] +testing = ["pytest", "pytest-benchmark"] + +[[package]] +name = "plumbum" +version = "1.7.2" +description = "Plumbum: shell combinators library" +category = "dev" +optional = false +python-versions = "!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,!=3.4.*,>=2.7" + +[package.dependencies] +pywin32 = {version = "*", markers = "platform_system == \"Windows\" and platform_python_implementation != \"PyPy\""} + +[package.extras] +dev = ["paramiko", "psutil", "pytest", "pytest-cov", "pytest-mock", "pytest-timeout"] +docs = ["Sphinx (>=3.0.0)", "sphinx-rtd-theme (>=0.5.0)"] +ssh = ["paramiko"] + +[[package]] +name = "ply" +version = "3.11" +description = "Python Lex & Yacc" +category = "dev" +optional = false +python-versions = "*" + [[package]] name = "prettytable" version = "3.0.0" @@ -1122,6 +1186,27 @@ category = "main" optional = false python-versions = ">=3.6" +[[package]] +name = "pytest" +version = "6.2.5" +description = "pytest: simple powerful testing with Python" +category = "dev" +optional = false +python-versions = ">=3.6" + +[package.dependencies] +atomicwrites = {version = ">=1.0", markers = "sys_platform == \"win32\""} +attrs = ">=19.2.0" +colorama = {version = "*", markers = "sys_platform == \"win32\""} +iniconfig = "*" +packaging = "*" +pluggy = ">=0.12,<2.0" +py = ">=1.8.2" +toml = "*" + +[package.extras] +testing = ["argcomplete", "hypothesis (>=3.56)", "mock", "nose", "requests", "xmlschema"] + [[package]] name = "python-box" version = "5.4.1" @@ -1468,6 +1553,23 @@ python-versions = ">=3.7" [package.extras] test = ["pytest"] +[[package]] +name = "typer" +version = "0.4.0" +description = "Typer, build great CLIs. Easy to code. Based on Python type hints." +category = "main" +optional = false +python-versions = ">=3.6" + +[package.dependencies] +click = ">=7.1.1,<9.0.0" + +[package.extras] +all = ["colorama (>=0.4.3,<0.5.0)", "shellingham (>=1.3.0,<2.0.0)"] +dev = ["autoflake (>=1.3.1,<2.0.0)", "flake8 (>=3.8.3,<4.0.0)"] +doc = ["mkdocs (>=1.1.2,<2.0.0)", "mkdocs-material (>=5.4.0,<6.0.0)", "markdown-include (>=0.5.1,<0.6.0)"] +test = ["shellingham (>=1.3.0,<2.0.0)", "pytest (>=4.4.0,<5.4.0)", "pytest-cov (>=2.10.0,<3.0.0)", "coverage (>=5.2,<6.0)", "pytest-xdist (>=1.32.0,<2.0.0)", "pytest-sugar (>=0.9.4,<0.10.0)", "mypy (==0.910)", "black (>=19.10b0,<20.0b0)", "isort (>=5.0.6,<6.0.0)"] + [[package]] name = "typing-extensions" version = "4.0.1" @@ -1562,7 +1664,7 @@ testing = ["pytest (>=6)", "pytest-checkdocs (>=2.4)", "pytest-flake8", "pytest- [metadata] lock-version = "1.1" python-versions = "^3.8" -content-hash = "6314fb5969e62101001d4b36d2d87256bcf338982235d43789515cacc63d1f57" +content-hash = "e05b63157ef831a815c83516c49365be942101a5f0d953bb2673850f909c8001" [metadata.files] alabaster = [ @@ -1612,6 +1714,10 @@ asttokens = [ {file = "asttokens-2.0.5-py2.py3-none-any.whl", hash = "sha256:0844691e88552595a6f4a4281a9f7f79b8dd45ca4ccea82e5e05b4bbdb76705c"}, {file = "asttokens-2.0.5.tar.gz", hash = "sha256:9a54c114f02c7a9480d56550932546a3f1fe71d8a02f1bc7ccd0ee3ee35cf4d5"}, ] +atomicwrites = [ + {file = "atomicwrites-1.4.0-py2.py3-none-any.whl", hash = "sha256:6d1784dea7c0c8d4a5172b6c620f40b6e4cbfdf96d783691f2e1302a7b88e197"}, + {file = "atomicwrites-1.4.0.tar.gz", hash = "sha256:ae70396ad1a434f9c7046fd2dd196fc04b12f9e91ffb859164193be8b6168a7a"}, +] attrs = [ {file = "attrs-21.4.0-py2.py3-none-any.whl", hash = "sha256:2d27e3784d7a565d36ab851fe94887c5eccd6a463168875832a1be79c82828b4"}, {file = "attrs-21.4.0.tar.gz", hash = "sha256:626ba8234211db98e869df76230a137c4c40a12d72445c45d5f5b716f076e2fd"}, @@ -1782,6 +1888,10 @@ importlib-resources = [ {file = "importlib_resources-5.4.0-py3-none-any.whl", hash = "sha256:33a95faed5fc19b4bc16b29a6eeae248a3fe69dd55d4d229d2b480e23eeaad45"}, {file = "importlib_resources-5.4.0.tar.gz", hash = "sha256:d756e2f85dd4de2ba89be0b21dba2a3bbec2e871a42a3a16719258a11f87506b"}, ] +iniconfig = [ + {file = "iniconfig-1.1.1-py2.py3-none-any.whl", hash = "sha256:011e24c64b7f47f6ebd835bb12a743f2fbe9a26d4cecaa7f53bc4f35ee9da8b3"}, + {file = "iniconfig-1.1.1.tar.gz", hash = "sha256:bc3af051d7d14b2ee5ef9969666def0cd1a000e121eaea580d4a313df4b37f32"}, +] ipykernel = [ {file = "ipykernel-6.7.0-py3-none-any.whl", hash = "sha256:6203ccd5510ff148e9433fd4a2707c5ce8d688f026427f46e13d7ebf9b3e9787"}, {file = "ipykernel-6.7.0.tar.gz", hash = "sha256:d82b904fdc2fd8c7b1fbe0fa481c68a11b4cd4c8ef07e6517da1f10cc3114d24"}, @@ -2040,6 +2150,9 @@ packaging = [ {file = "packaging-21.3-py3-none-any.whl", hash = "sha256:ef103e05f519cdc783ae24ea4e2e0f508a9c99b2d4969652eed6a2e1ea5bd522"}, {file = "packaging-21.3.tar.gz", hash = "sha256:dd47c42927d89ab911e606518907cc2d3a1f38bbd026385970643f9c5b8ecfeb"}, ] +pandoc = [ + {file = "pandoc-2.0.1.tar.gz", hash = "sha256:4d3850314fa56cb6164101ad8af561db0c0d5fd19d047e2ca8a9119bf47dac23"}, +] pandocfilters = [ {file = "pandocfilters-1.5.0-py2.py3-none-any.whl", hash = "sha256:33aae3f25fd1a026079f5d27bdd52496f0e0803b3469282162bafdcbdf6ef14f"}, {file = "pandocfilters-1.5.0.tar.gz", hash = "sha256:0b679503337d233b4339a817bfc8c50064e2eff681314376a47cb582305a7a38"}, @@ -2064,6 +2177,18 @@ platformdirs = [ {file = "platformdirs-2.4.1-py3-none-any.whl", hash = "sha256:1d7385c7db91728b83efd0ca99a5afb296cab9d0ed8313a45ed8ba17967ecfca"}, {file = "platformdirs-2.4.1.tar.gz", hash = "sha256:440633ddfebcc36264232365d7840a970e75e1018d15b4327d11f91909045fda"}, ] +pluggy = [ + {file = "pluggy-1.0.0-py2.py3-none-any.whl", hash = "sha256:74134bbf457f031a36d68416e1509f34bd5ccc019f0bcc952c7b909d06b37bd3"}, + {file = "pluggy-1.0.0.tar.gz", hash = "sha256:4224373bacce55f955a878bf9cfa763c1e360858e330072059e10bad68531159"}, +] +plumbum = [ + {file = "plumbum-1.7.2-py2.py3-none-any.whl", hash = "sha256:0bbf431e31da988405de2fb36c3226f09c0c9cdf69c8480f8997f4b94b7370a1"}, + {file = "plumbum-1.7.2.tar.gz", hash = "sha256:0d1bf908076bbd0484d16412479cb97d6843069ee19f99e267e11dd980040523"}, +] +ply = [ + {file = "ply-3.11-py2.py3-none-any.whl", hash = "sha256:096f9b8350b65ebd2fd1346b12452efe5b9607f7482813ffca50c22722a807ce"}, + {file = "ply-3.11.tar.gz", hash = "sha256:00c7c1aaa88358b9c765b6d3000c6eec0ba42abca5351b095321aef446081da3"}, +] prettytable = [ {file = "prettytable-3.0.0-py3-none-any.whl", hash = "sha256:d55bc2547611bd8c40f1c69bbb8daf1b6b2c326214a265d211ec9c57fc252093"}, {file = "prettytable-3.0.0.tar.gz", hash = "sha256:69fe75d78ac8651e16dd61265b9e19626df5d630ae294fc31687aa6037b97a58"}, @@ -2127,6 +2252,10 @@ pyrsistent = [ {file = "pyrsistent-0.18.0-cp39-cp39-win_amd64.whl", hash = "sha256:404e1f1d254d314d55adb8d87f4f465c8693d6f902f67eb6ef5b4526dc58e6ea"}, {file = "pyrsistent-0.18.0.tar.gz", hash = "sha256:773c781216f8c2900b42a7b638d5b517bb134ae1acbebe4d1e8f1f41ea60eb4b"}, ] +pytest = [ + {file = "pytest-6.2.5-py3-none-any.whl", hash = "sha256:7310f8d27bc79ced999e760ca304d69f6ba6c6649c0b60fb0e04a4a77cacc134"}, + {file = "pytest-6.2.5.tar.gz", hash = "sha256:131b36680866a76e6781d13f101efb86cf674ebb9762eb70d3082b6f29889e89"}, +] python-box = [ {file = "python-box-5.4.1.tar.gz", hash = "sha256:b68e0f8abc86f3deda751b3390f64df64a0989459de51ba4db949662a7b4d8ac"}, {file = "python_box-5.4.1-py3-none-any.whl", hash = "sha256:60ae9156de34cf92b899bd099580950df70a5b0813e67a3310a1cdd1976457fa"}, @@ -2367,6 +2496,10 @@ traitlets = [ {file = "traitlets-5.1.1-py3-none-any.whl", hash = "sha256:2d313cc50a42cd6c277e7d7dc8d4d7fedd06a2c215f78766ae7b1a66277e0033"}, {file = "traitlets-5.1.1.tar.gz", hash = "sha256:059f456c5a7c1c82b98c2e8c799f39c9b8128f6d0d46941ee118daace9eb70c7"}, ] +typer = [ + {file = "typer-0.4.0-py3-none-any.whl", hash = "sha256:d81169725140423d072df464cad1ff25ee154ef381aaf5b8225352ea187ca338"}, + {file = "typer-0.4.0.tar.gz", hash = "sha256:63c3aeab0549750ffe40da79a1b524f60e08a2cbc3126c520ebf2eeaf507f5dd"}, +] typing-extensions = [ {file = "typing_extensions-4.0.1-py3-none-any.whl", hash = "sha256:7f001e5ac290a0c0401508864c7ec868be4e701886d5b573a9528ed3973d9d3b"}, {file = "typing_extensions-4.0.1.tar.gz", hash = "sha256:4ca091dea149f945ec56afb48dae714f21e8692ef22a395223bcd328961b6a0e"},