diff --git a/.github/workflows/ansible-test.yml b/.github/workflows/ansible-test.yml index a61b5b1..1a3456c 100644 --- a/.github/workflows/ansible-test.yml +++ b/.github/workflows/ansible-test.yml @@ -32,7 +32,7 @@ jobs: matrix: include: - name: archlinux - python: '3.12' + python: '3.13' ansible-core-1: ansible-core ansible-core-2: devel test-with-podman: true @@ -56,10 +56,10 @@ jobs: with: persist-credentials: false - - name: Set up Python 3.12 + - name: Set up Python 3.13 uses: actions/setup-python@v5 with: - python-version: "3.12" + python-version: "3.13" - name: Install dependencies env: diff --git a/.github/workflows/execution-environments.yml b/.github/workflows/execution-environments.yml index c337f39..a5bcdb0 100644 --- a/.github/workflows/execution-environments.yml +++ b/.github/workflows/execution-environments.yml @@ -35,10 +35,10 @@ jobs: with: persist-credentials: false - - name: Set up Python 3.12 + - name: Set up Python 3.13 uses: actions/setup-python@v5 with: - python-version: "3.12" + python-version: "3.13" - name: Install dependencies run: | diff --git a/ansible-test/README.md b/ansible-test/README.md index 74bdf76..5b089f2 100644 --- a/ansible-test/README.md +++ b/ansible-test/README.md @@ -13,12 +13,12 @@ Some container images are provided and supported by ansible-test, such as the fo ansible-test integration --help # [...] target docker images and supported python version (choose one): - base (3.12, 3.8, 3.9, 3.10, 3.11) - default (3.12, 3.8, 3.9, 3.10, 3.11) - alpine319 (3.11) - fedora39 (3.12) - ubuntu2004 (3.8) + base (3.13, 3.8, 3.9, 3.10, 3.11, 3.12) + default (3.13, 3.8, 3.9, 3.10, 3.11, 3.12) + alpine320 (3.12) + fedora40 (3.12) ubuntu2204 (3.10) + ubuntu2404 (3.12) {image} # python must be specified for custom images # [...] ``` @@ -46,16 +46,16 @@ dnf -y install podman buildah pip install ansible-core --user git clone https://github.com/ansible-collections/community.general ansible_collections/community/general cd ansible_collections/community/general -ansible-test integration --python 3.12 --docker localhost/test-image:archlinux ini_file +ansible-test integration --python 3.13 --docker localhost/test-image:archlinux ini_file ``` ## Available images -| image | py27 | py36 | py38 | py39 | py3.10 | py3.11 | py3.12 | Notes | -|-------------------|------|------|------|------|--------|--------|--------|---------------------------------------------| -| [archlinux] | | | | | | | ✔️ | | -| [debian-bullseye] | | | | ✔️ | | | | Based on [ubuntu2004 ansible-test image] | -| [debian-bookworm] | | | | | | ✔️ | | Based on debian-bullseye ansible-test image | +| image | py27 | py36 | py38 | py39 | py3.10 | py3.11 | py3.12 | py3.13 | Notes | +|-------------------|------|------|------|------|--------|--------|--------|--------|---------------------------------------------| +| [archlinux] | | | | | | | | ✔️ | | +| [debian-bullseye] | | | | ✔️ | | | | | Based on [ubuntu2004 ansible-test image] | +| [debian-bookworm] | | | | | | ✔️ | | | Based on debian-bullseye ansible-test image | Note that these images from only work with ansible-test from ansible-core 2.14.0 or later. diff --git a/ansible-test/archlinux/build.sh b/ansible-test/archlinux/build.sh index 91a762f..73a22c8 100755 --- a/ansible-test/archlinux/build.sh +++ b/ansible-test/archlinux/build.sh @@ -10,7 +10,7 @@ build=$(buildah from docker.io/library/archlinux:latest) buildah run "${build}" -- /bin/bash -c "pacman -Syy && pacman-key --init && pacman -S archlinux-keyring --noconfirm && pacman -Su --noconfirm && pacman -S ${DEPENDENCIES} --noconfirm && pacman -Scc --noconfirm" # Disable PEP 668 marker -buildah run "${build}" -- /bin/bash -c "rm /usr/lib/python3.12/EXTERNALLY-MANAGED" +buildah run "${build}" -- /bin/bash -c "rm /usr/lib/python3.13/EXTERNALLY-MANAGED" # Extra python dependencies buildah run --volume ${SCRIPT_DIR}:/tmp/src:z "${build}" -- /bin/bash -c "pip3 install -r /tmp/src/requirements.txt"