diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index df890b5..cb21822 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -2,27 +2,28 @@ "name": "Python 3", "image": "mcr.microsoft.com/devcontainers/python:3.10", "features": { - "ghcr.io/devcontainers/features/github-cli:1": {}, - "ghcr.io/devcontainers-contrib/features/ansible:2": {}, - "ghcr.io/devcontainers-contrib/features/flake8:2": {}, - "ghcr.io/devcontainers-contrib/features/yamllint:2": {} + "ghcr.io/devcontainers/features/github-cli:1": {}, + "ghcr.io/devcontainers-contrib/features/ansible:2": {}, + "ghcr.io/devcontainers-contrib/features/yamllint:2": {}, + "ghcr.io/hspaans/devcontainer-features/ansible-lint:1": {}, + "ghcr.io/hspaans/devcontainer-features/pytest:1": {}, + "ghcr.io/hspaans/devcontainer-features/pymarkdownlnt:1": {} }, "customizations": { - "vscode": { - "extensions": [ - "EditorConfig.EditorConfig", - "ms-python.autopep8", - "ms-python.flake8", - "redhat.ansible", - "redhat.vscode-yaml" - ], - "[python]": { - "editor.defaultFormatter": "ms-python.autopep8", - "editor.formatOnSave": true - }, - "ansible.python.interpreterPath": "/usr/local/bin/python", - "python.formatting.provider": "none" - } - }, - "postCreateCommand": "pip install -r requirements.txt" + "vscode": { + "extensions": [ + "EditorConfig.EditorConfig", + "ms-python.autopep8", + "ms-python.flake8", + "redhat.ansible", + "redhat.vscode-yaml" + ], + "[python]": { + "editor.defaultFormatter": "ms-python.autopep8", + "editor.formatOnSave": true + }, + "ansible.python.interpreterPath": "/usr/local/bin/python", + "python.formatting.provider": "none" + } + } } \ No newline at end of file diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 567aeae..3fa2e4f 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -1,7 +1,20 @@ --- version: 2 updates: + - package-ecosystem: devcontainers + directory: /.devcontainer/ + schedule: + interval: monthly + groups: + devcontainers: + patterns: + - "*" + - package-ecosystem: github-actions directory: / schedule: - interval: weekly + interval: monthly + groups: + github-actions: + patterns: + - "*" diff --git a/meta/main.yml b/meta/main.yml index d9995f0..ea1ea9e 100644 --- a/meta/main.yml +++ b/meta/main.yml @@ -6,18 +6,18 @@ galaxy_info: license: MIT - min_ansible_version: 7.0.0 + min_ansible_version: "2.17.0" platforms: - name: Debian versions: - - buster - bullseye - bookworm - name: Ubuntu versions: - focal - jammy + - noble galaxy_tags: - mail diff --git a/molecule/default/molecule.yml b/molecule/default/molecule.yml index 07532b3..6d09534 100644 --- a/molecule/default/molecule.yml +++ b/molecule/default/molecule.yml @@ -12,25 +12,10 @@ lint: | # exit-zero treats all errors as warnings. The GitHub editor is 127 chars wide flake8 . --count --exit-zero --max-complexity=10 --max-line-length=127 --statistics platforms: - - name: debian-10 - image: "ghcr.io/hspaans/molecule-containers:debian-10" - command: "" - cgroupns_mode: host - tmpfs: - - /run - - /tmp - volumes: - - /sys/fs/cgroup:/sys/fs/cgroup:rw - privileged: true - pre_build_image: true - - name: debian-11 image: "ghcr.io/hspaans/molecule-containers:debian-11" command: "" cgroupns_mode: host - tmpfs: - - /run - - /tmp volumes: - /sys/fs/cgroup:/sys/fs/cgroup:rw privileged: true @@ -40,9 +25,6 @@ platforms: image: "ghcr.io/hspaans/molecule-containers:debian-12" command: "" cgroupns_mode: host - tmpfs: - - /run - - /tmp volumes: - /sys/fs/cgroup:/sys/fs/cgroup:rw privileged: true diff --git a/requirements.txt b/requirements.txt deleted file mode 100644 index ece6fc2..0000000 --- a/requirements.txt +++ /dev/null @@ -1,3 +0,0 @@ -ansible-lint==6.22.1 -pytest==7.4.3 -pytest-testinfra==10.0.0 \ No newline at end of file