Buildroot Archive on lore.kernel.org
 help / color / mirror / Atom feed
From: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
To: buildroot@busybox.net
Subject: [Buildroot] [PATCH] package/docker-compose: update patch to allow all pyyaml 5.x versions
Date: Thu, 27 Feb 2020 08:58:00 +0100	[thread overview]
Message-ID: <20200227085800.15ee6358@windsurf> (raw)
In-Reply-To: <20200226221911.9177-1-peter@korsgaard.com>

On Wed, 26 Feb 2020 23:19:11 +0100
Peter Korsgaard <peter@korsgaard.com> wrote:

> The recent bump of python-pyyaml to version 5.3 causes a runtime failure in docker-compose:
> 
> pkg_resources.ContextualVersionConflict: (PyYAML 5.3 (/usr/lib/python3.8/site-packages), Requirement.parse('PyYAML<5.2,>=3.10'), {'docker-compose'})
> 
> https://gitlab.com/buildroot.org/buildroot/-/jobs/442151461
> 
> Fix it by adjusting 0003-support-PyYAML-up-to-5.1-version.patch to allow all
> pyyaml 5.x versions, similar to what upstream has done post-1.24.1:
> 
> https://github.com/docker/compose/commit/c818bfc62c0574009175d832c1a8a2857bf1b1bf
> 
> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
> ---
>  .../docker-compose/0003-support-PyYAML-up-to-5.1-version.patch | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)

Applied to master, thanks.

Thomas
-- 
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com

      reply	other threads:[~2020-02-27  7:58 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-02-26 22:19 [Buildroot] [PATCH] package/docker-compose: update patch to allow all pyyaml 5.x versions Peter Korsgaard
2020-02-27  7:58 ` Thomas Petazzoni [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20200227085800.15ee6358@windsurf \
    --to=thomas.petazzoni@bootlin.com \
    --cc=buildroot@busybox.net \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox