From 180da4740a4b4a8a6ae5550b1b95578f89a3918a Mon Sep 17 00:00:00 2001 From: L3D Date: Sat, 3 Aug 2024 16:23:01 +0200 Subject: [PATCH 1/2] Cleanup ansible requirements since they are already in galaxy.yml --- README.md | 8 +------- galaxy.yml | 2 +- requirements.yml | 4 ---- 3 files changed, 2 insertions(+), 12 deletions(-) delete mode 100644 requirements.yml diff --git a/README.md b/README.md index 7949275..8f276b7 100644 --- a/README.md +++ b/README.md @@ -34,9 +34,6 @@ cd collections/ansible_collections/l3d/git/ # optionally init git submodules git submodule update --init --recursive - -# optionally install all requirements -ansible-galaxy collection install -r requirements.yml --upgrade ``` You can also list a collection in ``requirements.yml``: @@ -69,11 +66,8 @@ Example Playbook using the l3d.git.gitea role: ## Requirements The roles in this collection using the ``ansible.builtin`` and ``community.general`` ansible Collections. To download the latest forgejo/gitea release we use json_query. This requires ``jmespath`` to be available. -### Example Requirements Installation: +### Example Python Requirements Installation: ```bash -# galaxy requirements -ansible-galaxy collection install -r requirements.yml --upgrade - # pip requirements pip install -r requirements.txt ``` diff --git a/galaxy.yml b/galaxy.yml index cfb29bb..ed1d88f 100644 --- a/galaxy.yml +++ b/galaxy.yml @@ -48,7 +48,7 @@ tags: # L(specifiers,https://python-semanticversion.readthedocs.io/en/latest/#requirement-specification). Multiple version # range specifiers can be set and are separated by ',' dependencies: - "community.general": ">=8.3.0" + "community.general": ">=9.2.0" # The URL of the originating SCM repository repository: https://github.com/roles-ansible/ansible_collection_git.git diff --git a/requirements.yml b/requirements.yml deleted file mode 100644 index 4f58294..0000000 --- a/requirements.yml +++ /dev/null @@ -1,4 +0,0 @@ ---- -collections: - - name: community.general - version: ">=8.3.0" From 8b2f746e919a32c443bd0107d7ab82363dfd5902 Mon Sep 17 00:00:00 2001 From: L3D Date: Sat, 3 Aug 2024 16:26:16 +0200 Subject: [PATCH 2/2] Add requiement for lint --- .github/workflows/ansible-linting-check.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ansible-linting-check.yml b/.github/workflows/ansible-linting-check.yml index 973d554..6c162d9 100644 --- a/.github/workflows/ansible-linting-check.yml +++ b/.github/workflows/ansible-linting-check.yml @@ -22,4 +22,4 @@ jobs: with: target: "./" python_dependency: "jmespath" - collections_yml: "requirements.yml" + required_collections: 'community.general'