1cab59a5e8
Fixes https://gitlab.com/buildroot.org/buildroot/-/jobs/332656041
The recent bump of a number of python packages broke docker-compose, as
docker-compose specifies both minimum and maximum versions for (most of) its
dependencies:
Dependencies of docker-compse 1.20.1 (! = unmet):
cached-property: < 2 (currently 1.51)
docopt: < 0.7 (currently 0.6.2)
! pyyaml: < 4.0, patched to < 4.3 (currently 5.1.2)
requests: < 2.19, patched to < 3 (currently 2.22.0)
! texttable: < 0.10 (currently 1.6.2)
websocket-client: < 1.0 (currently 0.56.0)
! docker: < 4.0 (currently 4.1.0)
dockerpty: < 0.5 (currently 0.4.1)
six: < 2 (currently 1.12.0)
jsonschema: < 3 (currently 2.5.1)
enum34: < 2 (currently 1.1.6)
backports.ssl-match-hostname: >= 3.5 (currently 3.7.0.1)
ipaddress: >= 1.0.16 (currently 1.0.23)
To fix this, bump docker-compose to the most recent release (1.24.1). This
is unfortunately not enough, as our docker, pyyaml, requests and texttable
packages are too new, so add 3 patches from upstream to relax the version
checks of dependencies. Notice that patch 0003 is from
https://github.com/docker/compose/pull/6623 and has not been merged yet.
Discussions around the problem of these maximum versions of the dependencies
and the fact that all downstream users have to patch it is ongoing here:
https://github.com/docker/compose/issues/6756
docker-compose 1.24.1 added a requirement for ssh support in python-docker in:
7b82b2e8c7
So add a dependency for python-paramiko and update the toolchain dependency
for C++ (from python-paramiko -> python-cryptography) and adjust the
toolchain configuration of the runtime test to match.
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
44 lines
1.3 KiB
Diff
44 lines
1.3 KiB
Diff
From 3be619b814c16c02a02499e7a157dabd065926dd Mon Sep 17 00:00:00 2001
|
|
From: Sergey Fursov <geyser85@gmail.com>
|
|
Date: Sun, 31 Mar 2019 12:45:50 +0700
|
|
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)
|
|
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
|
|
---
|
|
requirements.txt | 2 +-
|
|
setup.py | 2 +-
|
|
2 files changed, 2 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/requirements.txt b/requirements.txt
|
|
index d868fdeb..e3dbc807 100644
|
|
--- a/requirements.txt
|
|
+++ b/requirements.txt
|
|
@@ -16,7 +16,7 @@ paramiko==2.4.2
|
|
pypiwin32==219; sys_platform == 'win32' and python_version < '3.6'
|
|
pypiwin32==223; sys_platform == 'win32' and python_version >= '3.6'
|
|
PySocks==1.6.7
|
|
-PyYAML==4.2b1
|
|
+PyYAML==5.1
|
|
requests==2.20.0
|
|
six==1.10.0
|
|
texttable==1.6.2
|
|
diff --git a/setup.py b/setup.py
|
|
index c9e4729d..17ab678e 100644
|
|
--- a/setup.py
|
|
+++ b/setup.py
|
|
@@ -32,7 +32,7 @@ def find_version(*file_paths):
|
|
install_requires = [
|
|
'cached-property >= 1.2.0, < 2',
|
|
'docopt >= 0.6.1, < 1',
|
|
- 'PyYAML >= 3.10, < 5',
|
|
+ 'PyYAML >= 3.10, < 5.2',
|
|
'requests >= 2.20.0, < 3',
|
|
'texttable >= 0.9.0, < 2',
|
|
'websocket-client >= 0.32.0, < 1',
|
|
--
|
|
2.20.1
|
|
|