[PATCH 1/6] pyenv: also install requirements for python2

Daniel Axtens dja at axtens.net
Wed Sep 18 16:17:26 AEST 2019


The first time you do a migration with python3, you get a whole
lot of seemingly null changes. This is a bit annoying so I use
py2 to generate the changes. To do that, first fix the pyenv
transition so requirements are still installed for python2.

Signed-off-by: Daniel Axtens <dja at axtens.net>
---
 tools/docker/Dockerfile | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/tools/docker/Dockerfile b/tools/docker/Dockerfile
index 35324b13c66a..78a97ffef9eb 100644
--- a/tools/docker/Dockerfile
+++ b/tools/docker/Dockerfile
@@ -48,12 +48,21 @@ RUN pyenv latest install 2.7 && \
     pyenv latest install 3.6 && \
     pyenv latest install 3.7
 
-RUN pyenv global $(pyenv versions --bare | tac)
+# old python 2.7
+RUN pyenv global $(pyenv versions --bare)
 
 COPY requirements-*.txt /tmp/
 RUN pip install tox tox-pyenv && \
     pip install -r /tmp/requirements-dev.txt
 
+# most recent python
+RUN pyenv global $(pyenv versions --bare | tac)
+
+RUN pip install tox tox-pyenv && \
+    pip install -r /tmp/requirements-dev.txt
+
+
+
 # we deliberately leave the requirements files in tmp so we can
 # ping the user in entrypoint.sh if the change them!
 
-- 
2.20.1



More information about the Patchwork mailing list