From 2f8ba3ad779c4b4ce217a957c17359ed246ccb11 Mon Sep 17 00:00:00 2001 From: Sorin Sbarnea Date: Thu, 11 Jan 2024 15:22:04 +0000 Subject: [PATCH 1/3] Remove obsolete RTD config option (#172) --- .readthedocs.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.readthedocs.yml b/.readthedocs.yml index 8262c4e..78a84d9 100644 --- a/.readthedocs.yml +++ b/.readthedocs.yml @@ -13,7 +13,6 @@ build: - pip install --user tox - python3 -m tox -e docs -- --strict --site-dir=_readthedocs/html/ python: - system_packages: false install: - method: pip path: tox From 5657805b1026299acdee157fcc30e7b32588c80c Mon Sep 17 00:00:00 2001 From: Sorin Sbarnea Date: Thu, 11 Jan 2024 15:51:43 +0000 Subject: [PATCH 2/3] Fix integration pipeline (#173) --- .config/requirements.in | 1 + playbooks/test-integration.yml | 1 - samples/integration/ansible-lint.txt | 3 +++ samples/integration/cookiecutter.txt | 5 ++++- samples/integration/podman.txt | 6 +++--- samples/integration/typeshed.txt | 1 + 6 files changed, 12 insertions(+), 5 deletions(-) diff --git a/.config/requirements.in b/.config/requirements.in index 452beac..35bed9a 100644 --- a/.config/requirements.in +++ b/.config/requirements.in @@ -10,6 +10,7 @@ pluggy pygments pyyaml rich >= 9.0 +setuptools # py_package due to running setup.py shellingham subprocess-tee >= 0.3.1 tomli >= 1.1.0 ; python_version < "3.11" diff --git a/playbooks/test-integration.yml b/playbooks/test-integration.yml index 7c47a48..0b3c2c2 100644 --- a/playbooks/test-integration.yml +++ b/playbooks/test-integration.yml @@ -11,7 +11,6 @@ repos: - name: podman url: https://github.com/containers/podman - branch: my-branch - name: ansible-lint url: https://github.com/ansible/ansible-lint - name: cookiecutter diff --git a/samples/integration/ansible-lint.txt b/samples/integration/ansible-lint.txt index b563311..b108ba7 100644 --- a/samples/integration/ansible-lint.txt +++ b/samples/integration/ansible-lint.txt @@ -1,6 +1,7 @@ build docs eco +generate_docs get-version hook install @@ -8,10 +9,12 @@ install-reqs lint lint2 pkg +pre py py-devel schemas test +test-eco test-hook test-setup uninstall diff --git a/samples/integration/cookiecutter.txt b/samples/integration/cookiecutter.txt index b58deaf..d7901f0 100644 --- a/samples/integration/cookiecutter.txt +++ b/samples/integration/cookiecutter.txt @@ -2,21 +2,24 @@ build clean-build clean-coverage clean-docs-build -clean-nox clean-pyc clean-pytest clean-tox coverage docs +docs2 install lint lint2 lint23 py310 +py311 +py312 py37 py38 py39 release +safety sdist servedocs submodules diff --git a/samples/integration/podman.txt b/samples/integration/podman.txt index cd51b41..729a43b 100644 --- a/samples/integration/podman.txt +++ b/samples/integration/podman.txt @@ -1,5 +1,6 @@ binaries binaries2 +binaries23 clean clean-binaries docker @@ -8,8 +9,7 @@ help install lint local-cross -package -package-install podman-mac-helper +rpm +rpm-install test -up diff --git a/samples/integration/typeshed.txt b/samples/integration/typeshed.txt index 2025a08..76dd572 100644 --- a/samples/integration/typeshed.txt +++ b/samples/integration/typeshed.txt @@ -1,4 +1,5 @@ create_baseline_stubs generate_proto_stubs lint +runtests sync_tensorflow_protobuf_stubs From 86f6fe7f91118b8ec7ca0d5d6083a46460c9b727 Mon Sep 17 00:00:00 2001 From: Haseeb Majid Date: Thu, 11 Jan 2024 16:18:47 +0000 Subject: [PATCH 3/3] Recognize more possible taskfile config filenames (#169) Co-authored-by: Haseeb Majid Co-authored-by: Sorin Sbarnea --- src/mk/tools/taskfile.py | 33 +++++++++++++++++++++++---------- 1 file changed, 23 insertions(+), 10 deletions(-) diff --git a/src/mk/tools/taskfile.py b/src/mk/tools/taskfile.py index 8b915be..3ec9725 100644 --- a/src/mk/tools/taskfile.py +++ b/src/mk/tools/taskfile.py @@ -20,16 +20,29 @@ def __init__(self, path=".") -> None: self.executable = "" def is_present(self, path: Path) -> bool: - if os.path.isfile(os.path.join(path, "taskfile.yml")): - # On some Linux distros might be exposed as taskfile in order to - # avoid clashing with the other Task Warrior executable https://taskwarrior.org/ - self.executable = shutil.which("taskfile") or shutil.which("task") or "" - if not self.executable: - logging.error( - "taskfile.yml config found but the tool is not installed. See https://taskfile.dev/installation/", - ) - sys.exit(1) - return True + valid_taskfiles = [ + "Taskfile.yml" + "taskfile.yml" + "Taskfile.yaml" + "taskfile.yaml" + "Taskfile.dist.yml" + "taskfile.dist.yml" + "Taskfile.dist.yaml" + "taskfile.dist.yaml", + ] + + for taskfile in valid_taskfiles: + if os.path.isfile(os.path.join(path, taskfile)): + # On some Linux distros might be exposed as taskfile in order to + # avoid clashing with the other Task Warrior executable https://taskwarrior.org/ + self.executable = shutil.which(taskfile) or shutil.which("task") or "" + if not self.executable: + logging.error( + "%s config found but the tool is not installed. See https://taskfile.dev/installation/", + taskfile, + ) + sys.exit(1) + return True return False def actions(self) -> list[Action]: