From 597238148e8ae8d76f0454ef39c8b8f4882ef92b Mon Sep 17 00:00:00 2001 From: jeanluc Date: Sun, 28 Apr 2024 10:25:04 +0200 Subject: [PATCH] Replace asottile/reorder-python-imports with isort black >=24 is incompatible with it since it adds a whitespace between an initial docstring and the import section, which reorder-python-imports does not like. This is something that is not likely to be fixed. For reference: https://github.com/asottile/reorder-python-imports/issues/366 https://github.com/psf/black/issues/4175 This substitution causes some reordering since isort separates first-party imports from third-party ones by default. We're still keeping the one line per import format to reduce merge conflicts. --- data/salt_python_support.yaml | 8 +- project/.pre-commit-config.yaml.j2 | 10 +-- project/.pre-commit-hooks/make-autodocs.py.j2 | 1 - project/docs/index.rst.j2 | 2 +- project/pyproject.toml.j2 | 80 ++++++++++--------- .../{{ package_name }}_mod.py.j2 | 1 + .../{{ package_name }}_mod.py.j2 | 1 + .../{{ package_name }}_mod.py.j2 | 1 + .../{{ package_name }}_mod.py.j2 | 1 + .../{{ package_name }}_mod.py.j2 | 1 + .../{{ package_name }}_mod.py.j2 | 1 + .../{{ package_name }}_mod.py.j2 | 1 + .../{{ package_name }}_mod.py.j2 | 1 + .../{{ package_name }}_mod.py.j2 | 1 + .../{{ package_name }}_mod.py.j2 | 1 + .../{{ package_name }}_mod.py.j2 | 1 + .../{{ package_name }}_mod.py.j2 | 1 + .../{{ package_name }}_mod.py.j2 | 1 + .../{{ package_name }}_mod.py.j2 | 1 + .../{{ package_name }}_mod.py.j2 | 1 + .../{{ package_name }}_mod.py.j2 | 1 + .../{{ package_name }}_mod.py.j2 | 1 + .../{{ package_name }}_mod.py.j2 | 1 + .../{{ package_name }}_mod.py.j2 | 1 + .../{{ package_name }}_mod.py.j2 | 1 + .../{{ package_name }}_mod.py.j2 | 1 + .../{{ package_name }}_mod.py.j2 | 1 + .../{{ package_name }}_mod.py.j2 | 1 + .../{{ package_name }}_mod.py.j2 | 1 + .../{{ package_name }}_mod.py.j2 | 1 + .../{{ package_name }}_mod.py.j2 | 1 + .../{{ package_name }}_mod.py.j2 | 1 + .../{{ package_name }}_mod.py.j2 | 1 + .../{{ package_name }}_mod.py.j2 | 1 + .../{{ package_name }}_mod.py.j2 | 1 + .../{{ package_name }}_mod.py.j2 | 1 + project/tests/conftest.py.j2 | 2 +- .../test_{{ package_name }}.py.j2 | 1 + .../test_{{ package_name }}.py.j2 | 1 + .../test_{{ package_name }}.py.j2 | 1 + .../test_{{ package_name }}.py.j2 | 1 + .../test_{{ package_name }}.py.j2 | 1 + .../test_{{ package_name }}.py.j2 | 1 + .../test_{{ package_name }}.py.j2 | 1 + .../test_{{ package_name }}.py.j2 | 1 + .../test_{{ package_name }}.py.j2 | 1 + .../test_{{ package_name }}.py.j2 | 1 + .../test_{{ package_name }}.py.j2 | 1 + .../test_{{ package_name }}.py.j2 | 1 + .../test_{{ package_name }}.py.j2 | 1 + .../test_{{ package_name }}.py.j2 | 1 + .../test_{{ package_name }}.py.j2 | 1 + .../test_{{ package_name }}.py.j2 | 1 + .../test_{{ package_name }}.py.j2 | 1 + .../test_{{ package_name }}.py.j2 | 1 + .../test_{{ package_name }}.py.j2 | 1 + .../test_{{ package_name }}.py.j2 | 1 + .../test_{{ package_name }}.py.j2 | 1 + .../test_{{ package_name }}.py.j2 | 1 + .../test_{{ package_name }}.py.j2 | 1 + .../test_{{ package_name }}.py.j2 | 1 + .../test_{{ package_name }}.py.j2 | 1 + .../test_{{ package_name }}.py.j2 | 1 + .../test_{{ package_name }}.py.j2 | 1 + .../test_{{ package_name }}.py.j2 | 1 + .../test_{{ package_name }}.py.j2 | 1 + .../test_{{ package_name }}.py.j2 | 1 + .../test_{{ package_name }}.py.j2 | 1 + 68 files changed, 116 insertions(+), 49 deletions(-) diff --git a/data/salt_python_support.yaml b/data/salt_python_support.yaml index 400634e..b079bf6 100644 --- a/data/salt_python_support.yaml +++ b/data/salt_python_support.yaml @@ -2,28 +2,28 @@ 3003: min: - 3 - - 7 + - 8 max: - 3 - 9 3004: min: - 3 - - 7 + - 8 max: - 3 - 10 3005: min: - 3 - - 7 + - 8 max: - 3 - 10 3006: min: - 3 - - 7 + - 8 max: - 3 - 10 diff --git a/project/.pre-commit-config.yaml.j2 b/project/.pre-commit-config.yaml.j2 index 2b81faa..65a1d44 100755 --- a/project/.pre-commit-config.yaml.j2 +++ b/project/.pre-commit-config.yaml.j2 @@ -65,14 +65,14 @@ repos: ] exclude: src/{{ package_namespace_path }}{{ package_name }}/version.py - - repo: https://github.com/asottile/reorder_python_imports - rev: v3.12.2 + - repo: https://github.com/PyCQA/isort + rev: 5.13.2 hooks: - - id: reorder-python-imports + - id: isort args: [ - --py{{ python_requires[:2] | join("") }}-plus, + --py {{ python_requires[:2] | join("") }}, ] - exclude: src/{{ package_namespace_path }}{{ package_name }}/version.py + exclude: src/{{ package_namespace_path }}{{ package_name }}/(__init__|version).py - repo: https://github.com/psf/black rev: 24.2.0 diff --git a/project/.pre-commit-hooks/make-autodocs.py.j2 b/project/.pre-commit-hooks/make-autodocs.py.j2 index c28587f..35466c3 100644 --- a/project/.pre-commit-hooks/make-autodocs.py.j2 +++ b/project/.pre-commit-hooks/make-autodocs.py.j2 @@ -3,7 +3,6 @@ import os.path import subprocess from pathlib import Path - repo_path = Path(subprocess.check_output(["git", "rev-parse", "--show-toplevel"]).decode().strip()) src_dir = repo_path / "src" / {% if package_namespace -%} "{{ package_namespace }}" / {% endif -%} "{{ package_name }}" doc_dir = repo_path / "docs" diff --git a/project/docs/index.rst.j2 b/project/docs/index.rst.j2 index 8fbd90f..155b335 100644 --- a/project/docs/index.rst.j2 +++ b/project/docs/index.rst.j2 @@ -16,7 +16,7 @@ :maxdepth: 2 :caption: Provided Modules :hidden: - {% for loader in loaders %} +{% for loader in loaders %} ref/{{ loader.rstrip("s") + ("" if loader in singular_loader_dirs else "s") }}/index {%- endfor %} diff --git a/project/pyproject.toml.j2 b/project/pyproject.toml.j2 index 5b81ce5..7c638ae 100644 --- a/project/pyproject.toml.j2 +++ b/project/pyproject.toml.j2 @@ -110,44 +110,50 @@ build_dir = "build/sphinx" [tool.black] line-length = 100 +[tool.isort] +force_single_line = true +skip = ["src/{{ package_namespace_path }}{{ package_name }}/__init__.py"] +profile = "black" +line_length = 100 + [tool.towncrier] - package = "{{ package_namespace_pkg }}{{ package_name }}" - filename = "CHANGELOG.md" - template = "changelog/.template.jinja" - directory = "changelog/" - start_string = "# Changelog\n" - underlines = ["", "", ""] - title_format = "## {version} ({project_date})" +package = "{{ package_namespace_pkg }}{{ package_name }}" +filename = "CHANGELOG.md" +template = "changelog/.template.jinja" +directory = "changelog/" +start_string = "# Changelog\n" +underlines = ["", "", ""] +title_format = "## {version} ({project_date})" {%- if tracker_url %} - issue_format = "[#{issue}]({{ tracker_url }}/{issue})" +issue_format = "[#{issue}]({{ tracker_url }}/{issue})" {%- endif %} - [[tool.towncrier.type]] - directory = "removed" - name = "Removed" - showcontent = true - - [[tool.towncrier.type]] - directory = "deprecated" - name = "Deprecated" - showcontent = true - - [[tool.towncrier.type]] - directory = "changed" - name = "Changed" - showcontent = true - - [[tool.towncrier.type]] - directory = "fixed" - name = "Fixed" - showcontent = true - - [[tool.towncrier.type]] - directory = "added" - name = "Added" - showcontent = true - - [[tool.towncrier.type]] - directory = "security" - name = "Security" - showcontent = true +[[tool.towncrier.type]] +directory = "removed" +name = "Removed" +showcontent = true + +[[tool.towncrier.type]] +directory = "deprecated" +name = "Deprecated" +showcontent = true + +[[tool.towncrier.type]] +directory = "changed" +name = "Changed" +showcontent = true + +[[tool.towncrier.type]] +directory = "fixed" +name = "Fixed" +showcontent = true + +[[tool.towncrier.type]] +directory = "added" +name = "Added" +showcontent = true + +[[tool.towncrier.type]] +directory = "security" +name = "Security" +showcontent = true diff --git a/project/src/{{ namespaced_package_path }}/{% if 'auth' in loaders %}auth{% endif %}/{{ package_name }}_mod.py.j2 b/project/src/{{ namespaced_package_path }}/{% if 'auth' in loaders %}auth{% endif %}/{{ package_name }}_mod.py.j2 index 53de50a..0d01a69 100644 --- a/project/src/{{ namespaced_package_path }}/{% if 'auth' in loaders %}auth{% endif %}/{{ package_name }}_mod.py.j2 +++ b/project/src/{{ namespaced_package_path }}/{% if 'auth' in loaders %}auth{% endif %}/{{ package_name }}_mod.py.j2 @@ -1,6 +1,7 @@ """ Salt auth module """ + import logging log = logging.getLogger(__name__) diff --git a/project/src/{{ namespaced_package_path }}/{% if 'beacon' in loaders %}beacons{% endif %}/{{ package_name }}_mod.py.j2 b/project/src/{{ namespaced_package_path }}/{% if 'beacon' in loaders %}beacons{% endif %}/{{ package_name }}_mod.py.j2 index c2d8018..15e75ce 100644 --- a/project/src/{{ namespaced_package_path }}/{% if 'beacon' in loaders %}beacons{% endif %}/{{ package_name }}_mod.py.j2 +++ b/project/src/{{ namespaced_package_path }}/{% if 'beacon' in loaders %}beacons{% endif %}/{{ package_name }}_mod.py.j2 @@ -1,6 +1,7 @@ """ Salt beacon module """ + import logging log = logging.getLogger(__name__) diff --git a/project/src/{{ namespaced_package_path }}/{% if 'cache' in loaders %}cache{% endif %}/{{ package_name }}_mod.py.j2 b/project/src/{{ namespaced_package_path }}/{% if 'cache' in loaders %}cache{% endif %}/{{ package_name }}_mod.py.j2 index 92c29d5..5118352 100644 --- a/project/src/{{ namespaced_package_path }}/{% if 'cache' in loaders %}cache{% endif %}/{{ package_name }}_mod.py.j2 +++ b/project/src/{{ namespaced_package_path }}/{% if 'cache' in loaders %}cache{% endif %}/{{ package_name }}_mod.py.j2 @@ -1,6 +1,7 @@ """ Salt cache module """ + import logging log = logging.getLogger(__name__) diff --git a/project/src/{{ namespaced_package_path }}/{% if 'cloud' in loaders %}clouds{% endif %}/{{ package_name }}_mod.py.j2 b/project/src/{{ namespaced_package_path }}/{% if 'cloud' in loaders %}clouds{% endif %}/{{ package_name }}_mod.py.j2 index bc72c46..36b7a46 100644 --- a/project/src/{{ namespaced_package_path }}/{% if 'cloud' in loaders %}clouds{% endif %}/{{ package_name }}_mod.py.j2 +++ b/project/src/{{ namespaced_package_path }}/{% if 'cloud' in loaders %}clouds{% endif %}/{{ package_name }}_mod.py.j2 @@ -1,6 +1,7 @@ """ Salt cloud module """ + import logging log = logging.getLogger(__name__) diff --git a/project/src/{{ namespaced_package_path }}/{% if 'engine' in loaders %}engines{% endif %}/{{ package_name }}_mod.py.j2 b/project/src/{{ namespaced_package_path }}/{% if 'engine' in loaders %}engines{% endif %}/{{ package_name }}_mod.py.j2 index 8ee8bf2..3ec566c 100644 --- a/project/src/{{ namespaced_package_path }}/{% if 'engine' in loaders %}engines{% endif %}/{{ package_name }}_mod.py.j2 +++ b/project/src/{{ namespaced_package_path }}/{% if 'engine' in loaders %}engines{% endif %}/{{ package_name }}_mod.py.j2 @@ -1,6 +1,7 @@ """ Salt engine module """ + import logging log = logging.getLogger(__name__) diff --git a/project/src/{{ namespaced_package_path }}/{% if 'executor' in loaders %}executors{% endif %}/{{ package_name }}_mod.py.j2 b/project/src/{{ namespaced_package_path }}/{% if 'executor' in loaders %}executors{% endif %}/{{ package_name }}_mod.py.j2 index 7680a47..25720d3 100644 --- a/project/src/{{ namespaced_package_path }}/{% if 'executor' in loaders %}executors{% endif %}/{{ package_name }}_mod.py.j2 +++ b/project/src/{{ namespaced_package_path }}/{% if 'executor' in loaders %}executors{% endif %}/{{ package_name }}_mod.py.j2 @@ -1,6 +1,7 @@ """ Salt executor module """ + import logging log = logging.getLogger(__name__) diff --git a/project/src/{{ namespaced_package_path }}/{% if 'fileserver' in loaders %}fileservers{% endif %}/{{ package_name }}_mod.py.j2 b/project/src/{{ namespaced_package_path }}/{% if 'fileserver' in loaders %}fileservers{% endif %}/{{ package_name }}_mod.py.j2 index 2614715..bcbd062 100644 --- a/project/src/{{ namespaced_package_path }}/{% if 'fileserver' in loaders %}fileservers{% endif %}/{{ package_name }}_mod.py.j2 +++ b/project/src/{{ namespaced_package_path }}/{% if 'fileserver' in loaders %}fileservers{% endif %}/{{ package_name }}_mod.py.j2 @@ -1,6 +1,7 @@ """ Salt fileserver module """ + import logging log = logging.getLogger(__name__) diff --git a/project/src/{{ namespaced_package_path }}/{% if 'grain' in loaders %}grains{% endif %}/{{ package_name }}_mod.py.j2 b/project/src/{{ namespaced_package_path }}/{% if 'grain' in loaders %}grains{% endif %}/{{ package_name }}_mod.py.j2 index 5d7307f..bbb472c 100644 --- a/project/src/{{ namespaced_package_path }}/{% if 'grain' in loaders %}grains{% endif %}/{{ package_name }}_mod.py.j2 +++ b/project/src/{{ namespaced_package_path }}/{% if 'grain' in loaders %}grains{% endif %}/{{ package_name }}_mod.py.j2 @@ -1,6 +1,7 @@ """ Salt grain module """ + import logging log = logging.getLogger(__name__) diff --git a/project/src/{{ namespaced_package_path }}/{% if 'log_handler' in loaders %}log_handlers{% endif %}/{{ package_name }}_mod.py.j2 b/project/src/{{ namespaced_package_path }}/{% if 'log_handler' in loaders %}log_handlers{% endif %}/{{ package_name }}_mod.py.j2 index d6b6296..9ab64d3 100644 --- a/project/src/{{ namespaced_package_path }}/{% if 'log_handler' in loaders %}log_handlers{% endif %}/{{ package_name }}_mod.py.j2 +++ b/project/src/{{ namespaced_package_path }}/{% if 'log_handler' in loaders %}log_handlers{% endif %}/{{ package_name }}_mod.py.j2 @@ -1,6 +1,7 @@ """ Salt log_handler module """ + import logging log = logging.getLogger(__name__) diff --git a/project/src/{{ namespaced_package_path }}/{% if 'matcher' in loaders %}matchers{% endif %}/{{ package_name }}_mod.py.j2 b/project/src/{{ namespaced_package_path }}/{% if 'matcher' in loaders %}matchers{% endif %}/{{ package_name }}_mod.py.j2 index 0cf148f..28e0efe 100644 --- a/project/src/{{ namespaced_package_path }}/{% if 'matcher' in loaders %}matchers{% endif %}/{{ package_name }}_mod.py.j2 +++ b/project/src/{{ namespaced_package_path }}/{% if 'matcher' in loaders %}matchers{% endif %}/{{ package_name }}_mod.py.j2 @@ -1,6 +1,7 @@ """ Salt matcher module """ + import logging log = logging.getLogger(__name__) diff --git a/project/src/{{ namespaced_package_path }}/{% if 'metaproxy' in loaders %}metaproxy{% endif %}/{{ package_name }}_mod.py.j2 b/project/src/{{ namespaced_package_path }}/{% if 'metaproxy' in loaders %}metaproxy{% endif %}/{{ package_name }}_mod.py.j2 index 800c259..c3886aa 100644 --- a/project/src/{{ namespaced_package_path }}/{% if 'metaproxy' in loaders %}metaproxy{% endif %}/{{ package_name }}_mod.py.j2 +++ b/project/src/{{ namespaced_package_path }}/{% if 'metaproxy' in loaders %}metaproxy{% endif %}/{{ package_name }}_mod.py.j2 @@ -1,6 +1,7 @@ """ Salt metaproxy module """ + import logging log = logging.getLogger(__name__) diff --git a/project/src/{{ namespaced_package_path }}/{% if 'module' in loaders %}modules{% endif %}/{{ package_name }}_mod.py.j2 b/project/src/{{ namespaced_package_path }}/{% if 'module' in loaders %}modules{% endif %}/{{ package_name }}_mod.py.j2 index a17bd46..3c4547e 100644 --- a/project/src/{{ namespaced_package_path }}/{% if 'module' in loaders %}modules{% endif %}/{{ package_name }}_mod.py.j2 +++ b/project/src/{{ namespaced_package_path }}/{% if 'module' in loaders %}modules{% endif %}/{{ package_name }}_mod.py.j2 @@ -1,6 +1,7 @@ """ Salt execution module """ + import logging log = logging.getLogger(__name__) diff --git a/project/src/{{ namespaced_package_path }}/{% if 'netapi' in loaders %}netapi{% endif %}/{{ package_name }}_mod.py.j2 b/project/src/{{ namespaced_package_path }}/{% if 'netapi' in loaders %}netapi{% endif %}/{{ package_name }}_mod.py.j2 index 77e455d..cbd251e 100644 --- a/project/src/{{ namespaced_package_path }}/{% if 'netapi' in loaders %}netapi{% endif %}/{{ package_name }}_mod.py.j2 +++ b/project/src/{{ namespaced_package_path }}/{% if 'netapi' in loaders %}netapi{% endif %}/{{ package_name }}_mod.py.j2 @@ -1,6 +1,7 @@ """ Salt netapi module """ + import logging log = logging.getLogger(__name__) diff --git a/project/src/{{ namespaced_package_path }}/{% if 'output' in loaders %}output{% endif %}/{{ package_name }}_mod.py.j2 b/project/src/{{ namespaced_package_path }}/{% if 'output' in loaders %}output{% endif %}/{{ package_name }}_mod.py.j2 index 89041fb..694a685 100644 --- a/project/src/{{ namespaced_package_path }}/{% if 'output' in loaders %}output{% endif %}/{{ package_name }}_mod.py.j2 +++ b/project/src/{{ namespaced_package_path }}/{% if 'output' in loaders %}output{% endif %}/{{ package_name }}_mod.py.j2 @@ -1,6 +1,7 @@ """ Salt output module """ + import logging log = logging.getLogger(__name__) diff --git a/project/src/{{ namespaced_package_path }}/{% if 'pillar' in loaders %}pillar{% endif %}/{{ package_name }}_mod.py.j2 b/project/src/{{ namespaced_package_path }}/{% if 'pillar' in loaders %}pillar{% endif %}/{{ package_name }}_mod.py.j2 index f49358f..25afc6d 100644 --- a/project/src/{{ namespaced_package_path }}/{% if 'pillar' in loaders %}pillar{% endif %}/{{ package_name }}_mod.py.j2 +++ b/project/src/{{ namespaced_package_path }}/{% if 'pillar' in loaders %}pillar{% endif %}/{{ package_name }}_mod.py.j2 @@ -1,6 +1,7 @@ """ Salt pillar module """ + import logging log = logging.getLogger(__name__) diff --git a/project/src/{{ namespaced_package_path }}/{% if 'pkgdb' in loaders %}pkgdb{% endif %}/{{ package_name }}_mod.py.j2 b/project/src/{{ namespaced_package_path }}/{% if 'pkgdb' in loaders %}pkgdb{% endif %}/{{ package_name }}_mod.py.j2 index e3457f9..c89f67f 100644 --- a/project/src/{{ namespaced_package_path }}/{% if 'pkgdb' in loaders %}pkgdb{% endif %}/{{ package_name }}_mod.py.j2 +++ b/project/src/{{ namespaced_package_path }}/{% if 'pkgdb' in loaders %}pkgdb{% endif %}/{{ package_name }}_mod.py.j2 @@ -1,6 +1,7 @@ """ Salt pkgdb module """ + import logging log = logging.getLogger(__name__) diff --git a/project/src/{{ namespaced_package_path }}/{% if 'pkgfile' in loaders %}pkgfiles{% endif %}/{{ package_name }}_mod.py.j2 b/project/src/{{ namespaced_package_path }}/{% if 'pkgfile' in loaders %}pkgfiles{% endif %}/{{ package_name }}_mod.py.j2 index be19601..808b6d8 100644 --- a/project/src/{{ namespaced_package_path }}/{% if 'pkgfile' in loaders %}pkgfiles{% endif %}/{{ package_name }}_mod.py.j2 +++ b/project/src/{{ namespaced_package_path }}/{% if 'pkgfile' in loaders %}pkgfiles{% endif %}/{{ package_name }}_mod.py.j2 @@ -1,6 +1,7 @@ """ Salt pkgfile module """ + import logging log = logging.getLogger(__name__) diff --git a/project/src/{{ namespaced_package_path }}/{% if 'proxy' in loaders %}proxy{% endif %}/{{ package_name }}_mod.py.j2 b/project/src/{{ namespaced_package_path }}/{% if 'proxy' in loaders %}proxy{% endif %}/{{ package_name }}_mod.py.j2 index 5b33ac5..8c82ecc 100644 --- a/project/src/{{ namespaced_package_path }}/{% if 'proxy' in loaders %}proxy{% endif %}/{{ package_name }}_mod.py.j2 +++ b/project/src/{{ namespaced_package_path }}/{% if 'proxy' in loaders %}proxy{% endif %}/{{ package_name }}_mod.py.j2 @@ -1,6 +1,7 @@ """ Salt proxy module """ + import logging log = logging.getLogger(__name__) diff --git a/project/src/{{ namespaced_package_path }}/{% if 'queue' in loaders %}queues{% endif %}/{{ package_name }}_mod.py.j2 b/project/src/{{ namespaced_package_path }}/{% if 'queue' in loaders %}queues{% endif %}/{{ package_name }}_mod.py.j2 index d44ac49..042dbc5 100644 --- a/project/src/{{ namespaced_package_path }}/{% if 'queue' in loaders %}queues{% endif %}/{{ package_name }}_mod.py.j2 +++ b/project/src/{{ namespaced_package_path }}/{% if 'queue' in loaders %}queues{% endif %}/{{ package_name }}_mod.py.j2 @@ -1,6 +1,7 @@ """ Salt queue module """ + import logging log = logging.getLogger(__name__) diff --git a/project/src/{{ namespaced_package_path }}/{% if 'renderer' in loaders %}renderers{% endif %}/{{ package_name }}_mod.py.j2 b/project/src/{{ namespaced_package_path }}/{% if 'renderer' in loaders %}renderers{% endif %}/{{ package_name }}_mod.py.j2 index 7554120..b7bf9bb 100644 --- a/project/src/{{ namespaced_package_path }}/{% if 'renderer' in loaders %}renderers{% endif %}/{{ package_name }}_mod.py.j2 +++ b/project/src/{{ namespaced_package_path }}/{% if 'renderer' in loaders %}renderers{% endif %}/{{ package_name }}_mod.py.j2 @@ -1,6 +1,7 @@ """ Salt renderer module """ + import logging log = logging.getLogger(__name__) diff --git a/project/src/{{ namespaced_package_path }}/{% if 'returner' in loaders %}returners{% endif %}/{{ package_name }}_mod.py.j2 b/project/src/{{ namespaced_package_path }}/{% if 'returner' in loaders %}returners{% endif %}/{{ package_name }}_mod.py.j2 index fa23422..007ee63 100644 --- a/project/src/{{ namespaced_package_path }}/{% if 'returner' in loaders %}returners{% endif %}/{{ package_name }}_mod.py.j2 +++ b/project/src/{{ namespaced_package_path }}/{% if 'returner' in loaders %}returners{% endif %}/{{ package_name }}_mod.py.j2 @@ -1,6 +1,7 @@ """ Salt returner module """ + import logging log = logging.getLogger(__name__) diff --git a/project/src/{{ namespaced_package_path }}/{% if 'roster' in loaders %}roster{% endif %}/{{ package_name }}_mod.py.j2 b/project/src/{{ namespaced_package_path }}/{% if 'roster' in loaders %}roster{% endif %}/{{ package_name }}_mod.py.j2 index 1fce870..46fb0b5 100644 --- a/project/src/{{ namespaced_package_path }}/{% if 'roster' in loaders %}roster{% endif %}/{{ package_name }}_mod.py.j2 +++ b/project/src/{{ namespaced_package_path }}/{% if 'roster' in loaders %}roster{% endif %}/{{ package_name }}_mod.py.j2 @@ -1,6 +1,7 @@ """ Salt roster module """ + import logging log = logging.getLogger(__name__) diff --git a/project/src/{{ namespaced_package_path }}/{% if 'runner' in loaders %}runners{% endif %}/{{ package_name }}_mod.py.j2 b/project/src/{{ namespaced_package_path }}/{% if 'runner' in loaders %}runners{% endif %}/{{ package_name }}_mod.py.j2 index 45d6c23..41c30b7 100644 --- a/project/src/{{ namespaced_package_path }}/{% if 'runner' in loaders %}runners{% endif %}/{{ package_name }}_mod.py.j2 +++ b/project/src/{{ namespaced_package_path }}/{% if 'runner' in loaders %}runners{% endif %}/{{ package_name }}_mod.py.j2 @@ -1,6 +1,7 @@ """ Salt runner module """ + import logging log = logging.getLogger(__name__) diff --git a/project/src/{{ namespaced_package_path }}/{% if 'sdb' in loaders %}sdb{% endif %}/{{ package_name }}_mod.py.j2 b/project/src/{{ namespaced_package_path }}/{% if 'sdb' in loaders %}sdb{% endif %}/{{ package_name }}_mod.py.j2 index 19523be..4ade8af 100644 --- a/project/src/{{ namespaced_package_path }}/{% if 'sdb' in loaders %}sdb{% endif %}/{{ package_name }}_mod.py.j2 +++ b/project/src/{{ namespaced_package_path }}/{% if 'sdb' in loaders %}sdb{% endif %}/{{ package_name }}_mod.py.j2 @@ -1,6 +1,7 @@ """ Salt SDB module """ + import logging log = logging.getLogger(__name__) diff --git a/project/src/{{ namespaced_package_path }}/{% if 'serializer' in loaders %}serializers{% endif %}/{{ package_name }}_mod.py.j2 b/project/src/{{ namespaced_package_path }}/{% if 'serializer' in loaders %}serializers{% endif %}/{{ package_name }}_mod.py.j2 index 3829c90..dac51b3 100644 --- a/project/src/{{ namespaced_package_path }}/{% if 'serializer' in loaders %}serializers{% endif %}/{{ package_name }}_mod.py.j2 +++ b/project/src/{{ namespaced_package_path }}/{% if 'serializer' in loaders %}serializers{% endif %}/{{ package_name }}_mod.py.j2 @@ -1,6 +1,7 @@ """ Salt serializer module """ + import logging log = logging.getLogger(__name__) diff --git a/project/src/{{ namespaced_package_path }}/{% if 'state' in loaders %}states{% endif %}/{{ package_name }}_mod.py.j2 b/project/src/{{ namespaced_package_path }}/{% if 'state' in loaders %}states{% endif %}/{{ package_name }}_mod.py.j2 index 89bd9f5..2d1eb17 100644 --- a/project/src/{{ namespaced_package_path }}/{% if 'state' in loaders %}states{% endif %}/{{ package_name }}_mod.py.j2 +++ b/project/src/{{ namespaced_package_path }}/{% if 'state' in loaders %}states{% endif %}/{{ package_name }}_mod.py.j2 @@ -1,6 +1,7 @@ """ Salt state module """ + import logging log = logging.getLogger(__name__) diff --git a/project/src/{{ namespaced_package_path }}/{% if 'thorium' in loaders %}thorium{% endif %}/{{ package_name }}_mod.py.j2 b/project/src/{{ namespaced_package_path }}/{% if 'thorium' in loaders %}thorium{% endif %}/{{ package_name }}_mod.py.j2 index 9fa6216..01c5f0e 100644 --- a/project/src/{{ namespaced_package_path }}/{% if 'thorium' in loaders %}thorium{% endif %}/{{ package_name }}_mod.py.j2 +++ b/project/src/{{ namespaced_package_path }}/{% if 'thorium' in loaders %}thorium{% endif %}/{{ package_name }}_mod.py.j2 @@ -1,6 +1,7 @@ """ Salt thorium module """ + import logging log = logging.getLogger(__name__) diff --git a/project/src/{{ namespaced_package_path }}/{% if 'token' in loaders %}tokens{% endif %}/{{ package_name }}_mod.py.j2 b/project/src/{{ namespaced_package_path }}/{% if 'token' in loaders %}tokens{% endif %}/{{ package_name }}_mod.py.j2 index a70cd88..5b6fc59 100644 --- a/project/src/{{ namespaced_package_path }}/{% if 'token' in loaders %}tokens{% endif %}/{{ package_name }}_mod.py.j2 +++ b/project/src/{{ namespaced_package_path }}/{% if 'token' in loaders %}tokens{% endif %}/{{ package_name }}_mod.py.j2 @@ -1,6 +1,7 @@ """ Salt token module """ + import logging log = logging.getLogger(__name__) diff --git a/project/src/{{ namespaced_package_path }}/{% if 'top' in loaders %}tops{% endif %}/{{ package_name }}_mod.py.j2 b/project/src/{{ namespaced_package_path }}/{% if 'top' in loaders %}tops{% endif %}/{{ package_name }}_mod.py.j2 index 613f990..690bd11 100644 --- a/project/src/{{ namespaced_package_path }}/{% if 'top' in loaders %}tops{% endif %}/{{ package_name }}_mod.py.j2 +++ b/project/src/{{ namespaced_package_path }}/{% if 'top' in loaders %}tops{% endif %}/{{ package_name }}_mod.py.j2 @@ -1,6 +1,7 @@ """ Salt top module """ + import logging log = logging.getLogger(__name__) diff --git a/project/src/{{ namespaced_package_path }}/{% if 'wheel' in loaders %}wheel{% endif %}/{{ package_name }}_mod.py.j2 b/project/src/{{ namespaced_package_path }}/{% if 'wheel' in loaders %}wheel{% endif %}/{{ package_name }}_mod.py.j2 index e78f4dd..b923bcf 100644 --- a/project/src/{{ namespaced_package_path }}/{% if 'wheel' in loaders %}wheel{% endif %}/{{ package_name }}_mod.py.j2 +++ b/project/src/{{ namespaced_package_path }}/{% if 'wheel' in loaders %}wheel{% endif %}/{{ package_name }}_mod.py.j2 @@ -1,6 +1,7 @@ """ Salt wheel module """ + import logging log = logging.getLogger(__name__) diff --git a/project/src/{{ namespaced_package_path }}/{% if 'wrapper' in loaders %}wrapper{% endif %}/{{ package_name }}_mod.py.j2 b/project/src/{{ namespaced_package_path }}/{% if 'wrapper' in loaders %}wrapper{% endif %}/{{ package_name }}_mod.py.j2 index 7d0a620..a85976c 100644 --- a/project/src/{{ namespaced_package_path }}/{% if 'wrapper' in loaders %}wrapper{% endif %}/{{ package_name }}_mod.py.j2 +++ b/project/src/{{ namespaced_package_path }}/{% if 'wrapper' in loaders %}wrapper{% endif %}/{{ package_name }}_mod.py.j2 @@ -1,6 +1,7 @@ """ Salt wrapper module """ + import logging log = logging.getLogger(__name__) diff --git a/project/tests/conftest.py.j2 b/project/tests/conftest.py.j2 index b0d477a..83c7214 100644 --- a/project/tests/conftest.py.j2 +++ b/project/tests/conftest.py.j2 @@ -11,9 +11,9 @@ import pytest import salt.utils.platform import salt.utils.win_functions {%- endif %} -from {{ package_namespace_pkg }}{{ package_name }} import PACKAGE_ROOT from saltfactories.utils import random_string +from {{ package_namespace_pkg }}{{ package_name }} import PACKAGE_ROOT # Reset the root logger to its default level(because salt changed it) logging.root.setLevel(logging.WARNING) diff --git a/project/tests/unit/{% if 'auth' in loaders %}auth{% endif %}/test_{{ package_name }}.py.j2 b/project/tests/unit/{% if 'auth' in loaders %}auth{% endif %}/test_{{ package_name }}.py.j2 index 67123d6..666b3ef 100644 --- a/project/tests/unit/{% if 'auth' in loaders %}auth{% endif %}/test_{{ package_name }}.py.j2 +++ b/project/tests/unit/{% if 'auth' in loaders %}auth{% endif %}/test_{{ package_name }}.py.j2 @@ -1,4 +1,5 @@ import pytest + import {{ package_namespace_pkg }}{{ package_name }}.auth.{{ package_name }}_mod as {{ package_name }}_auth diff --git a/project/tests/unit/{% if 'beacon' in loaders %}beacons{% endif %}/test_{{ package_name }}.py.j2 b/project/tests/unit/{% if 'beacon' in loaders %}beacons{% endif %}/test_{{ package_name }}.py.j2 index d4009ae..fe566a0 100644 --- a/project/tests/unit/{% if 'beacon' in loaders %}beacons{% endif %}/test_{{ package_name }}.py.j2 +++ b/project/tests/unit/{% if 'beacon' in loaders %}beacons{% endif %}/test_{{ package_name }}.py.j2 @@ -1,4 +1,5 @@ import pytest + import {{ package_namespace_pkg }}{{ package_name }}.beacons.{{ package_name }}_mod as {{ package_name }}_beacon diff --git a/project/tests/unit/{% if 'cache' in loaders %}cache{% endif %}/test_{{ package_name }}.py.j2 b/project/tests/unit/{% if 'cache' in loaders %}cache{% endif %}/test_{{ package_name }}.py.j2 index c94875b..20dac3e 100644 --- a/project/tests/unit/{% if 'cache' in loaders %}cache{% endif %}/test_{{ package_name }}.py.j2 +++ b/project/tests/unit/{% if 'cache' in loaders %}cache{% endif %}/test_{{ package_name }}.py.j2 @@ -1,4 +1,5 @@ import pytest + import {{ package_namespace_pkg }}{{ package_name }}.cache.{{ package_name }}_mod as {{ package_name }}_cache diff --git a/project/tests/unit/{% if 'cloud' in loaders %}clouds{% endif %}/test_{{ package_name }}.py.j2 b/project/tests/unit/{% if 'cloud' in loaders %}clouds{% endif %}/test_{{ package_name }}.py.j2 index e88c5df..111c854 100644 --- a/project/tests/unit/{% if 'cloud' in loaders %}clouds{% endif %}/test_{{ package_name }}.py.j2 +++ b/project/tests/unit/{% if 'cloud' in loaders %}clouds{% endif %}/test_{{ package_name }}.py.j2 @@ -1,4 +1,5 @@ import pytest + import {{ package_namespace_pkg }}{{ package_name }}.clouds.{{ package_name }}_mod as {{ package_name }}_cloud diff --git a/project/tests/unit/{% if 'engine' in loaders %}engines{% endif %}/test_{{ package_name }}.py.j2 b/project/tests/unit/{% if 'engine' in loaders %}engines{% endif %}/test_{{ package_name }}.py.j2 index 2dbf63f..b95bad7 100644 --- a/project/tests/unit/{% if 'engine' in loaders %}engines{% endif %}/test_{{ package_name }}.py.j2 +++ b/project/tests/unit/{% if 'engine' in loaders %}engines{% endif %}/test_{{ package_name }}.py.j2 @@ -1,4 +1,5 @@ import pytest + import {{ package_namespace_pkg }}{{ package_name }}.engines.{{ package_name }}_mod as {{ package_name }}_engine diff --git a/project/tests/unit/{% if 'executor' in loaders %}executors{% endif %}/test_{{ package_name }}.py.j2 b/project/tests/unit/{% if 'executor' in loaders %}executors{% endif %}/test_{{ package_name }}.py.j2 index e92cf80..2cb8f14 100644 --- a/project/tests/unit/{% if 'executor' in loaders %}executors{% endif %}/test_{{ package_name }}.py.j2 +++ b/project/tests/unit/{% if 'executor' in loaders %}executors{% endif %}/test_{{ package_name }}.py.j2 @@ -1,4 +1,5 @@ import pytest + import {{ package_namespace_pkg }}{{ package_name }}.executors.{{ package_name }}_mod as {{ package_name }}_executor diff --git a/project/tests/unit/{% if 'fileserver' in loaders %}fileserver{% endif %}/test_{{ package_name }}.py.j2 b/project/tests/unit/{% if 'fileserver' in loaders %}fileserver{% endif %}/test_{{ package_name }}.py.j2 index 9b2fa03..1b78d78 100644 --- a/project/tests/unit/{% if 'fileserver' in loaders %}fileserver{% endif %}/test_{{ package_name }}.py.j2 +++ b/project/tests/unit/{% if 'fileserver' in loaders %}fileserver{% endif %}/test_{{ package_name }}.py.j2 @@ -1,4 +1,5 @@ import pytest + import {{ package_namespace_pkg }}{{ package_name }}.fileserver.{{ package_name }}_mod as {{ package_name }}_fileserver diff --git a/project/tests/unit/{% if 'grain' in loaders %}grains{% endif %}/test_{{ package_name }}.py.j2 b/project/tests/unit/{% if 'grain' in loaders %}grains{% endif %}/test_{{ package_name }}.py.j2 index 56fe1d4..3d7cb26 100644 --- a/project/tests/unit/{% if 'grain' in loaders %}grains{% endif %}/test_{{ package_name }}.py.j2 +++ b/project/tests/unit/{% if 'grain' in loaders %}grains{% endif %}/test_{{ package_name }}.py.j2 @@ -1,4 +1,5 @@ import pytest + import {{ package_namespace_pkg }}{{ package_name }}.grains.{{ package_name }}_mod as {{ package_name }}_grain diff --git a/project/tests/unit/{% if 'log_handler' in loaders %}log_handlers{% endif %}/test_{{ package_name }}.py.j2 b/project/tests/unit/{% if 'log_handler' in loaders %}log_handlers{% endif %}/test_{{ package_name }}.py.j2 index 2175b95..24eb530 100644 --- a/project/tests/unit/{% if 'log_handler' in loaders %}log_handlers{% endif %}/test_{{ package_name }}.py.j2 +++ b/project/tests/unit/{% if 'log_handler' in loaders %}log_handlers{% endif %}/test_{{ package_name }}.py.j2 @@ -1,4 +1,5 @@ import pytest + import {{ package_namespace_pkg }}{{ package_name }}.log_handlers.{{ package_name }}_mod as {{ package_name }}_log_handler diff --git a/project/tests/unit/{% if 'matcher' in loaders %}matchers{% endif %}/test_{{ package_name }}.py.j2 b/project/tests/unit/{% if 'matcher' in loaders %}matchers{% endif %}/test_{{ package_name }}.py.j2 index 3d7f297..7796601 100644 --- a/project/tests/unit/{% if 'matcher' in loaders %}matchers{% endif %}/test_{{ package_name }}.py.j2 +++ b/project/tests/unit/{% if 'matcher' in loaders %}matchers{% endif %}/test_{{ package_name }}.py.j2 @@ -1,4 +1,5 @@ import pytest + import {{ package_namespace_pkg }}{{ package_name }}.matchers.{{ package_name }}_mod as {{ package_name }}_matcher diff --git a/project/tests/unit/{% if 'metaproxy' in loaders %}metaproxy{% endif %}/test_{{ package_name }}.py.j2 b/project/tests/unit/{% if 'metaproxy' in loaders %}metaproxy{% endif %}/test_{{ package_name }}.py.j2 index 719af25..bbad70d 100644 --- a/project/tests/unit/{% if 'metaproxy' in loaders %}metaproxy{% endif %}/test_{{ package_name }}.py.j2 +++ b/project/tests/unit/{% if 'metaproxy' in loaders %}metaproxy{% endif %}/test_{{ package_name }}.py.j2 @@ -1,4 +1,5 @@ import pytest + import {{ package_namespace_pkg }}{{ package_name }}.metaproxy.{{ package_name }}_mod as {{ package_name }}_metaproxy diff --git a/project/tests/unit/{% if 'module' in loaders %}modules{% endif %}/test_{{ package_name }}.py.j2 b/project/tests/unit/{% if 'module' in loaders %}modules{% endif %}/test_{{ package_name }}.py.j2 index b43cdaf..e884233 100644 --- a/project/tests/unit/{% if 'module' in loaders %}modules{% endif %}/test_{{ package_name }}.py.j2 +++ b/project/tests/unit/{% if 'module' in loaders %}modules{% endif %}/test_{{ package_name }}.py.j2 @@ -1,5 +1,6 @@ import pytest import salt.modules.test as testmod + import {{ package_namespace_pkg }}{{ package_name }}.modules.{{ package_name }}_mod as {{ package_name }}_module diff --git a/project/tests/unit/{% if 'netapi' in loaders %}netapi{% endif %}/test_{{ package_name }}.py.j2 b/project/tests/unit/{% if 'netapi' in loaders %}netapi{% endif %}/test_{{ package_name }}.py.j2 index d6b5d55..94233c9 100644 --- a/project/tests/unit/{% if 'netapi' in loaders %}netapi{% endif %}/test_{{ package_name }}.py.j2 +++ b/project/tests/unit/{% if 'netapi' in loaders %}netapi{% endif %}/test_{{ package_name }}.py.j2 @@ -1,4 +1,5 @@ import pytest + import {{ package_namespace_pkg }}{{ package_name }}.netapi.{{ package_name }}_mod as {{ package_name }}_netapi diff --git a/project/tests/unit/{% if 'output' in loaders %}output{% endif %}/test_{{ package_name }}.py.j2 b/project/tests/unit/{% if 'output' in loaders %}output{% endif %}/test_{{ package_name }}.py.j2 index 0dac657..ac05535 100644 --- a/project/tests/unit/{% if 'output' in loaders %}output{% endif %}/test_{{ package_name }}.py.j2 +++ b/project/tests/unit/{% if 'output' in loaders %}output{% endif %}/test_{{ package_name }}.py.j2 @@ -1,4 +1,5 @@ import pytest + import {{ package_namespace_pkg }}{{ package_name }}.output.{{ package_name }}_mod as {{ package_name }}_output diff --git a/project/tests/unit/{% if 'pillar' in loaders %}pillar{% endif %}/test_{{ package_name }}.py.j2 b/project/tests/unit/{% if 'pillar' in loaders %}pillar{% endif %}/test_{{ package_name }}.py.j2 index 5da9c23..f7cdb3f 100644 --- a/project/tests/unit/{% if 'pillar' in loaders %}pillar{% endif %}/test_{{ package_name }}.py.j2 +++ b/project/tests/unit/{% if 'pillar' in loaders %}pillar{% endif %}/test_{{ package_name }}.py.j2 @@ -1,4 +1,5 @@ import pytest + import {{ package_namespace_pkg }}{{ package_name }}.pillar.{{ package_name }}_mod as {{ package_name }}_pillar diff --git a/project/tests/unit/{% if 'pkgdb' in loaders %}pkgdb{% endif %}/test_{{ package_name }}.py.j2 b/project/tests/unit/{% if 'pkgdb' in loaders %}pkgdb{% endif %}/test_{{ package_name }}.py.j2 index 86f05b8..04bed86 100644 --- a/project/tests/unit/{% if 'pkgdb' in loaders %}pkgdb{% endif %}/test_{{ package_name }}.py.j2 +++ b/project/tests/unit/{% if 'pkgdb' in loaders %}pkgdb{% endif %}/test_{{ package_name }}.py.j2 @@ -1,4 +1,5 @@ import pytest + import {{ package_namespace_pkg }}{{ package_name }}.pkgdb.{{ package_name }}_mod as {{ package_name }}_pkgdb diff --git a/project/tests/unit/{% if 'pkgfile' in loaders %}pkgfiles{% endif %}/test_{{ package_name }}.py.j2 b/project/tests/unit/{% if 'pkgfile' in loaders %}pkgfiles{% endif %}/test_{{ package_name }}.py.j2 index 8d12ad5..ef2c3c9 100644 --- a/project/tests/unit/{% if 'pkgfile' in loaders %}pkgfiles{% endif %}/test_{{ package_name }}.py.j2 +++ b/project/tests/unit/{% if 'pkgfile' in loaders %}pkgfiles{% endif %}/test_{{ package_name }}.py.j2 @@ -1,4 +1,5 @@ import pytest + import {{ package_namespace_pkg }}{{ package_name }}.pkgfiles.{{ package_name }}_mod as {{ package_name }}_pkgfile diff --git a/project/tests/unit/{% if 'proxy' in loaders %}proxy{% endif %}/test_{{ package_name }}.py.j2 b/project/tests/unit/{% if 'proxy' in loaders %}proxy{% endif %}/test_{{ package_name }}.py.j2 index bc4ab7e..38f9122 100644 --- a/project/tests/unit/{% if 'proxy' in loaders %}proxy{% endif %}/test_{{ package_name }}.py.j2 +++ b/project/tests/unit/{% if 'proxy' in loaders %}proxy{% endif %}/test_{{ package_name }}.py.j2 @@ -1,4 +1,5 @@ import pytest + import {{ package_namespace_pkg }}{{ package_name }}.proxy.{{ package_name }}_mod as {{ package_name }}_proxy diff --git a/project/tests/unit/{% if 'queue' in loaders %}queues{% endif %}/test_{{ package_name }}.py.j2 b/project/tests/unit/{% if 'queue' in loaders %}queues{% endif %}/test_{{ package_name }}.py.j2 index 82078c7..3a95ddd 100644 --- a/project/tests/unit/{% if 'queue' in loaders %}queues{% endif %}/test_{{ package_name }}.py.j2 +++ b/project/tests/unit/{% if 'queue' in loaders %}queues{% endif %}/test_{{ package_name }}.py.j2 @@ -1,4 +1,5 @@ import pytest + import {{ package_namespace_pkg }}{{ package_name }}.queues.{{ package_name }}_mod as {{ package_name }}_queue diff --git a/project/tests/unit/{% if 'renderer' in loaders %}renderers{% endif %}/test_{{ package_name }}.py.j2 b/project/tests/unit/{% if 'renderer' in loaders %}renderers{% endif %}/test_{{ package_name }}.py.j2 index 6bfb0bd..af15ebb 100644 --- a/project/tests/unit/{% if 'renderer' in loaders %}renderers{% endif %}/test_{{ package_name }}.py.j2 +++ b/project/tests/unit/{% if 'renderer' in loaders %}renderers{% endif %}/test_{{ package_name }}.py.j2 @@ -1,4 +1,5 @@ import pytest + import {{ package_namespace_pkg }}{{ package_name }}.renderers.{{ package_name }}_mod as {{ package_name }}_renderer diff --git a/project/tests/unit/{% if 'returner' in loaders %}returners{% endif %}/test_{{ package_name }}.py.j2 b/project/tests/unit/{% if 'returner' in loaders %}returners{% endif %}/test_{{ package_name }}.py.j2 index 5152ecb..bce3599 100644 --- a/project/tests/unit/{% if 'returner' in loaders %}returners{% endif %}/test_{{ package_name }}.py.j2 +++ b/project/tests/unit/{% if 'returner' in loaders %}returners{% endif %}/test_{{ package_name }}.py.j2 @@ -1,4 +1,5 @@ import pytest + import {{ package_namespace_pkg }}{{ package_name }}.returners.{{ package_name }}_mod as {{ package_name }}_returner diff --git a/project/tests/unit/{% if 'roster' in loaders %}roster{% endif %}/test_{{ package_name }}.py.j2 b/project/tests/unit/{% if 'roster' in loaders %}roster{% endif %}/test_{{ package_name }}.py.j2 index 46d5cc1..1ca3609 100644 --- a/project/tests/unit/{% if 'roster' in loaders %}roster{% endif %}/test_{{ package_name }}.py.j2 +++ b/project/tests/unit/{% if 'roster' in loaders %}roster{% endif %}/test_{{ package_name }}.py.j2 @@ -1,4 +1,5 @@ import pytest + import {{ package_namespace_pkg }}{{ package_name }}.roster.{{ package_name }}_mod as {{ package_name }}_roster diff --git a/project/tests/unit/{% if 'runner' in loaders %}runners{% endif %}/test_{{ package_name }}.py.j2 b/project/tests/unit/{% if 'runner' in loaders %}runners{% endif %}/test_{{ package_name }}.py.j2 index 54780af..3f32c6e 100644 --- a/project/tests/unit/{% if 'runner' in loaders %}runners{% endif %}/test_{{ package_name }}.py.j2 +++ b/project/tests/unit/{% if 'runner' in loaders %}runners{% endif %}/test_{{ package_name }}.py.j2 @@ -1,4 +1,5 @@ import pytest + import {{ package_namespace_pkg }}{{ package_name }}.runners.{{ package_name }}_mod as {{ package_name }}_runner diff --git a/project/tests/unit/{% if 'sdb' in loaders %}sdb{% endif %}/test_{{ package_name }}.py.j2 b/project/tests/unit/{% if 'sdb' in loaders %}sdb{% endif %}/test_{{ package_name }}.py.j2 index f9a10cf..b10a3c9 100644 --- a/project/tests/unit/{% if 'sdb' in loaders %}sdb{% endif %}/test_{{ package_name }}.py.j2 +++ b/project/tests/unit/{% if 'sdb' in loaders %}sdb{% endif %}/test_{{ package_name }}.py.j2 @@ -1,4 +1,5 @@ import pytest + import {{ package_namespace_pkg }}{{ package_name }}.sdb.{{ package_name }}_mod as {{ package_name }}_sdb diff --git a/project/tests/unit/{% if 'serializer' in loaders %}serializers{% endif %}/test_{{ package_name }}.py.j2 b/project/tests/unit/{% if 'serializer' in loaders %}serializers{% endif %}/test_{{ package_name }}.py.j2 index 86ecfa7..202ee71 100644 --- a/project/tests/unit/{% if 'serializer' in loaders %}serializers{% endif %}/test_{{ package_name }}.py.j2 +++ b/project/tests/unit/{% if 'serializer' in loaders %}serializers{% endif %}/test_{{ package_name }}.py.j2 @@ -1,4 +1,5 @@ import pytest + import {{ package_namespace_pkg }}{{ package_name }}.serializers.{{ package_name }}_mod as {{ package_name }}_serializer diff --git a/project/tests/unit/{% if 'state' in loaders %}states{% endif %}/test_{{ package_name }}.py.j2 b/project/tests/unit/{% if 'state' in loaders %}states{% endif %}/test_{{ package_name }}.py.j2 index 392ef56..e464e6e 100644 --- a/project/tests/unit/{% if 'state' in loaders %}states{% endif %}/test_{{ package_name }}.py.j2 +++ b/project/tests/unit/{% if 'state' in loaders %}states{% endif %}/test_{{ package_name }}.py.j2 @@ -1,5 +1,6 @@ import pytest import salt.modules.test as testmod + import {{ package_namespace_pkg }}{{ package_name }}.modules.{{ package_name }}_mod as {{ package_name }}_module import {{ package_namespace_pkg }}{{ package_name }}.states.{{ package_name }}_mod as {{ package_name }}_state diff --git a/project/tests/unit/{% if 'thorium' in loaders %}thorium{% endif %}/test_{{ package_name }}.py.j2 b/project/tests/unit/{% if 'thorium' in loaders %}thorium{% endif %}/test_{{ package_name }}.py.j2 index 2d32945..c2b7510 100644 --- a/project/tests/unit/{% if 'thorium' in loaders %}thorium{% endif %}/test_{{ package_name }}.py.j2 +++ b/project/tests/unit/{% if 'thorium' in loaders %}thorium{% endif %}/test_{{ package_name }}.py.j2 @@ -1,4 +1,5 @@ import pytest + import {{ package_namespace_pkg }}{{ package_name }}.thorium.{{ package_name }}_mod as {{ package_name }}_thorium diff --git a/project/tests/unit/{% if 'token' in loaders %}tokens{% endif %}/test_{{ package_name }}.py.j2 b/project/tests/unit/{% if 'token' in loaders %}tokens{% endif %}/test_{{ package_name }}.py.j2 index 638ed78..2ea1c2e 100644 --- a/project/tests/unit/{% if 'token' in loaders %}tokens{% endif %}/test_{{ package_name }}.py.j2 +++ b/project/tests/unit/{% if 'token' in loaders %}tokens{% endif %}/test_{{ package_name }}.py.j2 @@ -1,4 +1,5 @@ import pytest + import {{ package_namespace_pkg }}{{ package_name }}.tokens.{{ package_name }}_mod as {{ package_name }}_token diff --git a/project/tests/unit/{% if 'top' in loaders %}tops{% endif %}/test_{{ package_name }}.py.j2 b/project/tests/unit/{% if 'top' in loaders %}tops{% endif %}/test_{{ package_name }}.py.j2 index 8cc842d..b108654 100644 --- a/project/tests/unit/{% if 'top' in loaders %}tops{% endif %}/test_{{ package_name }}.py.j2 +++ b/project/tests/unit/{% if 'top' in loaders %}tops{% endif %}/test_{{ package_name }}.py.j2 @@ -1,4 +1,5 @@ import pytest + import {{ package_namespace_pkg }}{{ package_name }}.tops.{{ package_name }}_mod as {{ package_name }}_top diff --git a/project/tests/unit/{% if 'wheel' in loaders %}wheel{% endif %}/test_{{ package_name }}.py.j2 b/project/tests/unit/{% if 'wheel' in loaders %}wheel{% endif %}/test_{{ package_name }}.py.j2 index b67201e..779f770 100644 --- a/project/tests/unit/{% if 'wheel' in loaders %}wheel{% endif %}/test_{{ package_name }}.py.j2 +++ b/project/tests/unit/{% if 'wheel' in loaders %}wheel{% endif %}/test_{{ package_name }}.py.j2 @@ -1,4 +1,5 @@ import pytest + import {{ package_namespace_pkg }}{{ package_name }}.wheel.{{ package_name }}_mod as {{ package_name }}_wheel diff --git a/project/tests/unit/{% if 'wrapper' in loaders %}wrapper{% endif %}/test_{{ package_name }}.py.j2 b/project/tests/unit/{% if 'wrapper' in loaders %}wrapper{% endif %}/test_{{ package_name }}.py.j2 index d93be6f..a02a53b 100644 --- a/project/tests/unit/{% if 'wrapper' in loaders %}wrapper{% endif %}/test_{{ package_name }}.py.j2 +++ b/project/tests/unit/{% if 'wrapper' in loaders %}wrapper{% endif %}/test_{{ package_name }}.py.j2 @@ -1,4 +1,5 @@ import pytest + import {{ package_namespace_pkg }}{{ package_name }}.wrapper.{{ package_name }}_mod as {{ package_name }}_wrapper