From 83d1353df8882803542ea1b6e817104e990eefb5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Markus=20K=C3=BCffner?=
 <11882946+mkuf@users.noreply.github.com>
Date: Sun, 5 May 2024 17:14:04 +0200
Subject: [PATCH] klipper: revert to 3.11 (#152)

---
 docker/klipper/Dockerfile             | 4 ++--
 docker/klipper/requirements-prind.txt | 6 +-----
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/docker/klipper/Dockerfile b/docker/klipper/Dockerfile
index 8198e6e..7954dbc 100644
--- a/docker/klipper/Dockerfile
+++ b/docker/klipper/Dockerfile
@@ -1,6 +1,6 @@
 ## Get Klipper Source and Build venv
 ##
-FROM python:3.12-bookworm as build
+FROM python:3.11-bookworm as build
 
 RUN apt update \
  && apt install -y cmake \
@@ -28,7 +28,7 @@ RUN venv/bin/pip install -r klipper/scripts/klippy-requirements.txt \
 
 ## Klippy Runtime Image
 ##
-FROM python:3.12-slim-bookworm as run
+FROM python:3.11-slim-bookworm as run
 
 WORKDIR /opt
 RUN groupadd klipper --gid 1000 \
diff --git a/docker/klipper/requirements-prind.txt b/docker/klipper/requirements-prind.txt
index af7608c..671fba8 100644
--- a/docker/klipper/requirements-prind.txt
+++ b/docker/klipper/requirements-prind.txt
@@ -1,8 +1,4 @@
 ## This file contains additional requirements
 ## Packages defined here will be installed prior to klippy requirements
 ## 
-numpy==1.26.4
-# this is a workaround as setuptools is no longer installed in venvs since python 3.12
-# klippy is installing python-can==3.3.4 which requires setuptools to be present
-# May be removed if python-can has been upgraded upstream in https://github.com/Klipper3d/klipper/pull/6557.
-setuptools
+numpy