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>
67 lines
2 KiB
Diff
67 lines
2 KiB
Diff
From 2bb1a267aba3ca5fe414d0f79192def668c18bab Mon Sep 17 00:00:00 2001
|
|
From: Ulysses Souza <ulysses.souza@docker.com>
|
|
Date: Tue, 2 Jul 2019 15:49:07 +0200
|
|
Subject: [PATCH] Strip up generic versions and bump requests
|
|
|
|
Replaces generic limitations with a next major value
|
|
Bump the minimal `requests` to 2.20.0
|
|
|
|
Signed-off-by: Ulysses Souza <ulysses.souza@docker.com>
|
|
(cherry picked from commit ce5451c5b4a3b449ce703168d2a568b0a4d25ee6)
|
|
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
|
|
---
|
|
setup.py | 24 ++++++++++++------------
|
|
1 file changed, 12 insertions(+), 12 deletions(-)
|
|
|
|
diff --git a/setup.py b/setup.py
|
|
index 8371cc75..61447801 100644
|
|
--- a/setup.py
|
|
+++ b/setup.py
|
|
@@ -31,31 +31,31 @@ def find_version(*file_paths):
|
|
|
|
install_requires = [
|
|
'cached-property >= 1.2.0, < 2',
|
|
- 'docopt >= 0.6.1, < 0.7',
|
|
- 'PyYAML >= 3.10, < 4.3',
|
|
- 'requests >= 2.6.1, != 2.11.0, != 2.12.2, != 2.18.0, < 2.21',
|
|
- 'texttable >= 0.9.0, < 0.10',
|
|
- 'websocket-client >= 0.32.0, < 1.0',
|
|
- 'docker[ssh] >= 3.7.0, < 4.0',
|
|
- 'dockerpty >= 0.4.1, < 0.5',
|
|
+ 'docopt >= 0.6.1, < 1',
|
|
+ 'PyYAML >= 3.10, < 5',
|
|
+ 'requests >= 2.20.0, < 3',
|
|
+ 'texttable >= 0.9.0, < 1',
|
|
+ 'websocket-client >= 0.32.0, < 1',
|
|
+ 'docker[ssh] >= 3.7.0, < 5',
|
|
+ 'dockerpty >= 0.4.1, < 1',
|
|
'six >= 1.3.0, < 2',
|
|
'jsonschema >= 2.5.1, < 3',
|
|
]
|
|
|
|
|
|
tests_require = [
|
|
- 'pytest',
|
|
+ 'pytest < 6',
|
|
]
|
|
|
|
|
|
if sys.version_info[:2] < (3, 4):
|
|
- tests_require.append('mock >= 1.0.1')
|
|
+ tests_require.append('mock >= 1.0.1, < 2')
|
|
|
|
extras_require = {
|
|
':python_version < "3.4"': ['enum34 >= 1.0.4, < 2'],
|
|
- ':python_version < "3.5"': ['backports.ssl_match_hostname >= 3.5'],
|
|
- ':python_version < "3.3"': ['ipaddress >= 1.0.16'],
|
|
- ':sys_platform == "win32"': ['colorama >= 0.4, < 0.5'],
|
|
+ ':python_version < "3.5"': ['backports.ssl_match_hostname >= 3.5, < 4'],
|
|
+ ':python_version < "3.3"': ['ipaddress >= 1.0.16, < 2'],
|
|
+ ':sys_platform == "win32"': ['colorama >= 0.4, < 1'],
|
|
'socks': ['PySocks >= 1.5.6, != 1.5.7, < 2'],
|
|
}
|
|
|
|
--
|
|
2.20.1
|
|
|