diff --git a/.github/workflows/tox.yml b/.github/workflows/tox.yml index 3961360..327d9e4 100644 --- a/.github/workflows/tox.yml +++ b/.github/workflows/tox.yml @@ -93,6 +93,7 @@ jobs: uses: actions/upload-artifact@v4 with: name: logs-${{ matrix.name }}.zip + include-hidden-files: true path: | .tox/**/log/ .tox/**/.coverage* diff --git a/samples/integration/ansible-lint.txt b/samples/integration/ansible-lint.txt index 6571abe..7fefd82 100644 --- a/samples/integration/ansible-lint.txt +++ b/samples/integration/ansible-lint.txt @@ -1,5 +1,7 @@ +alerts build docs +drafts eco generate_docs get-version @@ -11,6 +13,7 @@ lint2 lower pkg pre +prs py py-devel schemas diff --git a/samples/integration/cookiecutter.txt b/samples/integration/cookiecutter.txt index dc68493..dcf8794 100644 --- a/samples/integration/cookiecutter.txt +++ b/samples/integration/cookiecutter.txt @@ -1,3 +1,4 @@ +alerts build clean-build clean-coverage @@ -8,14 +9,15 @@ clean-tox coverage docs docs2 +drafts install lint lint2 lint23 +prs py310 py311 py312 -py37 py38 py39 release diff --git a/samples/integration/flask-babel.txt b/samples/integration/flask-babel.txt index 4cf682e..6b30137 100644 --- a/samples/integration/flask-babel.txt +++ b/samples/integration/flask-babel.txt @@ -1,3 +1,6 @@ +alerts build +drafts install +prs uninstall diff --git a/samples/integration/nox.txt b/samples/integration/nox.txt index 139235f..7a2f23b 100644 --- a/samples/integration/nox.txt +++ b/samples/integration/nox.txt @@ -1,10 +1,13 @@ +alerts build conda_tests cover docs +drafts install lint lint2 +prs test tests(python='3.10', tox_version='<4') tests(python='3.10', tox_version='latest') diff --git a/samples/integration/podman.txt b/samples/integration/podman.txt index 4bdfc9b..cb82cfa 100644 --- a/samples/integration/podman.txt +++ b/samples/integration/podman.txt @@ -1,14 +1,17 @@ +alerts binaries binaries2 binaries23 clean clean-binaries docs +drafts help install lint local-cross podman-mac-helper +prs rpm rpm-install test diff --git a/samples/integration/typeshed.txt b/samples/integration/typeshed.txt index 2025a08..bfea9b4 100644 --- a/samples/integration/typeshed.txt +++ b/samples/integration/typeshed.txt @@ -1,4 +1,7 @@ +alerts create_baseline_stubs +drafts generate_proto_stubs lint +prs sync_tensorflow_protobuf_stubs diff --git a/src/mk/pre.py b/src/mk/pre.py index 7fda9c0..6bc8b5f 100644 --- a/src/mk/pre.py +++ b/src/mk/pre.py @@ -14,7 +14,7 @@ from rich.panel import Panel from typer_config.decorators import use_yaml_config -CFG_FILE = "~/.config/mk/mk.yml" +CFG_FILE = os.environ.get("MK_CONFIG_FILE", "~/.config/mk/mk.yml") class TyperApp(typer.Typer): diff --git a/src/mk/tools/taskfile.py b/src/mk/tools/taskfile.py index 3ec9725..09be0e3 100644 --- a/src/mk/tools/taskfile.py +++ b/src/mk/tools/taskfile.py @@ -21,13 +21,13 @@ def __init__(self, path=".") -> None: def is_present(self, path: Path) -> bool: valid_taskfiles = [ - "Taskfile.yml" - "taskfile.yml" - "Taskfile.yaml" - "taskfile.yaml" - "Taskfile.dist.yml" - "taskfile.dist.yml" - "Taskfile.dist.yaml" + "Taskfile.yml", + "taskfile.yml", + "Taskfile.yaml", + "taskfile.yaml", + "Taskfile.dist.yml", + "taskfile.dist.yml", + "Taskfile.dist.yaml", "taskfile.dist.yaml", ] diff --git a/tox.ini b/tox.ini index af8e0ea..5b2eec2 100644 --- a/tox.ini +++ b/tox.ini @@ -56,6 +56,8 @@ setenv = COVERAGE_FILE = {env:COVERAGE_FILE:{envdir}/.coverage.{envname}} COVERAGE_PROCESS_START={toxinidir}/pyproject.toml FORCE_COLOR = 1 + # To ensure test execution is not affected by user config. + MK_CONFIG_FILE = /dev/null PIP_CONSTRAINT = {toxinidir}/.config/constraints.txt PIP_DISABLE_PIP_VERSION_CHECK = 1 PRE_COMMIT_COLOR = always @@ -125,8 +127,9 @@ commands = [testenv:integration] description = Run integrations tests setenv = - ANSIBLE_NOCOWS=1 - ANSIBLE_FORCE_COLOR=1 + ANSIBLE_FORCE_COLOR = 1 + ANSIBLE_NOCOWS = 1 + MK_CONFIG_FILE = /dev/null extras = test deps =