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

Stephen Finucane stephen at that.guru
Thu Sep 19 19:05:37 AEST 2019


On Thu, 2019-09-19 at 08:45 +1000, Daniel Axtens wrote:
> Stephen Finucane <stephen at that.guru> writes:
> 
> > On Wed, 2019-09-18 at 16:17 +1000, Daniel Axtens wrote:
> > > 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>
> > 
> > I assume we're not planning to do this work until Patchwork 2.3 or 3.0
> > (or whatever we decide to call it)? If so, I'd be inclined to just drop
> > support for Python 2.7 in this release and add null migration.
> 
> Yeah, I'm not planning it for 2.2. I'm happy for a null migration, I'm
> just going to carry this for development purposes for now.
> 
> I do have a topic branch for patchwork3 on my github that currently
> drops XMLRPC and drops Py2, so I will eventually rebase this on top of
> that, but I'm going to make sure I can do the migration of foreign key
> relationships first.

Cool cool.

> Also, sorry, meant to add that I hope this doesn't step on your toes,
> I was not sure how far you had got with your flattening...

All good. I've a couple of different variations but haven't had time to
sit down and finish any of them. Happy to have someone do that work.

Stephen

> Regards,
> Daniel
> 
> > Stephen
> > 
> > > ---
> > >  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!
> > >  



More information about the Patchwork mailing list