diff --git a/.gitignore b/.gitignore index 1d17dae..3a91180 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ .venv +.vendor diff --git a/Makefile b/Makefile index a3ac079..44872b5 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,5 @@ VENV_DIR := .venv +VENDOR_DIR := .vendor SHELL := /usr/bin/env bash .DEFAULT_GOAL := help @@ -10,9 +11,9 @@ venv: ## Create python3 venv if it does not exists [[ -d $(VENV_DIR) ]] || $(shell command -v python3) -m venv $(VENV_DIR) install: ## Install all necessary tools - $(MAKE) \ - venv \ - install-pip-packages + $(MAKE) venv + $(MAKE) install-pip-packages + $(MAKE) install-galaxy @echo -e "\n--> You should now activate the python3 venv with:" @echo -e "source $(VENV_DIR)/bin/activate" @@ -20,9 +21,14 @@ install-pip-packages: ## Install python3 requirements $(info --> Install requirements via `pip3`) @( \ source $(VENV_DIR)/bin/activate; \ + pip3 install -U pip; \ pip3 install -r requirements.txt; \ ) +install-galaxy: ## Install galaxy requirements + $(info --> Install galaxy requirements) + ansible-galaxy collection install -r requirements.yml --force -p $(VENDOR_DIR)/collections + upgrade-pip-packages: ## Upgrade python3 requirements $(shell command -v pip3) install -U -r requirements.txt @@ -40,3 +46,4 @@ pre-commit-run-all: ## Run pre-commit on the whole repository clean: ## Clean venv [[ ! -d $(VENV_DIR) ]] || rm -rf $(VENV_DIR) + [[ ! -d $(VENDOR_DIR) ]] || rm -rf $(VENDOR_DIR) diff --git a/requirements.txt b/requirements.txt index 5b06de5..aa95847 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,3 +1,3 @@ -ansible -molecule==4.0.* -molecule-podman +ansible-core +molecule +molecule-plugins diff --git a/requirements.yml b/requirements.yml new file mode 100644 index 0000000..802aa21 --- /dev/null +++ b/requirements.yml @@ -0,0 +1,4 @@ +--- +collections: + - name: community.mysql + - name: containers.podman