All of lore.kernel.org
 help / color / mirror / Atom feed
From: Peter Korsgaard <peter@korsgaard.com>
To: buildroot@busybox.net
Subject: [Buildroot] [PATCH] package/docker-compose: update patch to allow all pyyaml 5.x versions
Date: Wed, 26 Feb 2020 23:19:11 +0100	[thread overview]
Message-ID: <20200226221911.9177-1-peter@korsgaard.com> (raw)

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(-)

diff --git a/package/docker-compose/0003-support-PyYAML-up-to-5.1-version.patch b/package/docker-compose/0003-support-PyYAML-up-to-5.1-version.patch
index ae91b01d03..ecbd197a51 100644
--- a/package/docker-compose/0003-support-PyYAML-up-to-5.1-version.patch
+++ b/package/docker-compose/0003-support-PyYAML-up-to-5.1-version.patch
@@ -6,6 +6,7 @@ Subject: [PATCH] support PyYAML up to 5.1 version
 Signed-off-by: Sergey Fursov <geyser85@gmail.com>
 [Upstream: https://github.com/docker/compose/pull/6623]
 (cherry picked from commit d2ca096f46a56cd4db494c593ed84e5c255dc15d)
+[Peter: allow all 5.x]
 Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
 ---
  requirements.txt | 2 +-
@@ -34,7 +35,7 @@ index c9e4729d..17ab678e 100644
      'cached-property >= 1.2.0, < 2',
      'docopt >= 0.6.1, < 1',
 -    'PyYAML >= 3.10, < 5',
-+    'PyYAML >= 3.10, < 5.2',
++    'PyYAML >= 3.10, < 6',
      'requests >= 2.20.0, < 3',
      'texttable >= 0.9.0, < 2',
      'websocket-client >= 0.32.0, < 1',
-- 
2.20.1

             reply	other threads:[~2020-02-26 22:19 UTC|newest]

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

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=20200226221911.9177-1-peter@korsgaard.com \
    --to=peter@korsgaard.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.