From bad99fc62df50ac5856756a368c0f1e0a05f04ff Mon Sep 17 00:00:00 2001 From: Bobby Noelte Date: Sun, 16 Nov 2025 13:25:45 +0100 Subject: [PATCH] chore: bump python version to 3.13.9 (#767) --- .github/workflows/pytest.yml | 2 +- Dockerfile | 2 +- Makefile | 7 +++++-- docker-compose.yaml | 1 + docs/develop/install.md | 11 +++++++---- 5 files changed, 15 insertions(+), 8 deletions(-) diff --git a/.github/workflows/pytest.yml b/.github/workflows/pytest.yml index 8b679b7..f5d505a 100644 --- a/.github/workflows/pytest.yml +++ b/.github/workflows/pytest.yml @@ -16,7 +16,7 @@ jobs: - name: Set up Python uses: actions/setup-python@v5 with: - python-version: "3.12" + python-version: "3.13.9" - name: Install dependencies run: | diff --git a/Dockerfile b/Dockerfile index f442517..c24066b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ # syntax=docker/dockerfile:1.7 -ARG PYTHON_VERSION=3.12.7 +ARG PYTHON_VERSION=3.13.9 FROM python:${PYTHON_VERSION}-slim LABEL source="https://github.com/Akkudoktor-EOS/EOS" diff --git a/Makefile b/Makefile index 88c38cf..442b752 100644 --- a/Makefile +++ b/Makefile @@ -36,7 +36,8 @@ help: # Target to set up a Python 3 virtual environment venv: python3 -m venv .venv - @echo "Virtual environment created in '.venv'. Activate it using 'source .venv/bin/activate'." + @PYVER=$$(./.venv/bin/python --version) && \ + echo "Virtual environment created in '.venv' with $$PYVER. Activate it using 'source .venv/bin/activate'." # Target to install dependencies from requirements.txt pip: venv @@ -157,10 +158,12 @@ mypy: # Run entire setup on docker docker-run: + @docker pull python:3.13.9-slim @docker compose up --remove-orphans docker-build: - @docker compose build --pull + @docker pull python:3.13.9-slim + @docker compose build # Bump Akkudoktoreos version VERSION ?= 0.2.0+dev diff --git a/docker-compose.yaml b/docker-compose.yaml index ca7d3ff..63fd486 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -1,6 +1,7 @@ --- networks: default: + external: true name: "eos" services: eos: diff --git a/docs/develop/install.md b/docs/develop/install.md index 223eddc..80c3df1 100644 --- a/docs/develop/install.md +++ b/docs/develop/install.md @@ -5,10 +5,10 @@ This guide provides different methods to install AkkudoktorEOS: -- Installation from Source (GitHub) -- Installation from Release Package (GitHub) -- Installation with Docker (DockerHub) -- Installation with Docker (docker-compose) +- Installation from Source (GitHub) (M1) +- Installation from Release Package (GitHub) (M2) +- Installation with Docker (DockerHub) (M3) +- Installation with Docker (docker-compose) (M4) Choose the method that best suits your needs. @@ -34,6 +34,9 @@ Before installing, ensure you have the following: - Docker Engine 20.10 or higher - Docker Compose (optional, recommended) +See [Install Docker Engine](https://docs.docker.com/engine/install/) on how to install docker on +your Linux distro. + ## Installation from Source (GitHub) (M1) Recommended for developers or users wanting the latest updates.