From: Stephen Finucane <stephen@that.guru>
Date: Wed, 25 Jan 2023 19:56:16 +0000 (+0000)
Subject: Remove tox-pyenv
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=refs%2Fheads%2Fstable%2F3.1;p=thirdparty%2Fpatchwork.git

Remove tox-pyenv

This doesn't appear to be maintained and isn't necessary once we add a
missing 'pyenv init'.

Signed-off-by: Stephen Finucane <stephen@that.guru>
(cherry picked from commit 5d63f97fefad90485d0041cbe822ed1a5d446e88)
---

diff --git a/tools/docker/Dockerfile b/tools/docker/Dockerfile
index de6cda56..05b21418 100644
--- a/tools/docker/Dockerfile
+++ b/tools/docker/Dockerfile
@@ -19,6 +19,8 @@ RUN groupadd --gid=$GID patchwork && \
     useradd --uid=$UID --gid=$GID --create-home patchwork
 RUN rm -f /etc/localtime; ln -s /usr/share/zoneinfo/$TZ /etc/localtime
 
+RUN eval "$(pyenv init -)"
+
 RUN apt-get update && apt-get install -y --no-install-recommends \
     build-essential \
     libmysqlclient-dev \
@@ -30,7 +32,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
     tzdata \
     && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
 
-RUN pip install wheel tox tox-pyenv
+RUN pip install wheel tox
 
 # we deliberately leave the requirements files in /opt so we can ping the user
 # in entrypoint.sh if they change