Skip to content

Commit

Permalink
Arch Linux updated to Python 3.13 (#108)
Browse files Browse the repository at this point in the history
* Update ansible-test help output.

* Arch Linux updated to Python 3.13.

* Forgot to bump a Python version for archlinux.

* Also bump Python versions for CI.
  • Loading branch information
felixfontein authored Dec 22, 2024
1 parent 31ac26f commit cba31a9
Show file tree
Hide file tree
Showing 4 changed files with 17 additions and 17 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/ansible-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/execution-environments.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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: |
Expand Down
22 changes: 11 additions & 11 deletions ansible-test/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
# [...]
```
Expand Down Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion ansible-test/archlinux/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down

0 comments on commit cba31a9

Please sign in to comment.