kumquat-buildroot/package/docker-compose/0002-Bump-texttable-from-0.9.1-to-1.6.2.patch

42 lines
1.2 KiB
Diff
Raw Normal View History

package/docker-compose: bump version to 1.24.1 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: https://github.com/docker/compose/commit/7b82b2e8c721010b73f664e9d4657746a1fcd92b 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>
2019-10-26 16:05:24 +02:00
From e55dd65ba42a17ba4b017b42f14f7ee647efe64f Mon Sep 17 00:00:00 2001
From: Ulysses Souza <ulysses.souza@docker.com>
Date: Mon, 8 Jul 2019 14:52:30 +0200
Subject: [PATCH] Bump texttable from 0.9.1 to 1.6.2
Signed-off-by: Ulysses Souza <ulysses.souza@docker.com>
(cherry picked from commit 0bfa1c34f054d86674434770d4d6340e02508e52)
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 6007ee3f..d868fdeb 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -19,6 +19,6 @@ PySocks==1.6.7
PyYAML==4.2b1
requests==2.20.0
six==1.10.0
-texttable==0.9.1
+texttable==1.6.2
urllib3==1.21.1; python_version == '3.3'
websocket-client==0.56.0
diff --git a/setup.py b/setup.py
index 61447801..c9e4729d 100644
--- a/setup.py
+++ b/setup.py
@@ -34,7 +34,7 @@ install_requires = [
'docopt >= 0.6.1, < 1',
'PyYAML >= 3.10, < 5',
'requests >= 2.20.0, < 3',
- 'texttable >= 0.9.0, < 1',
+ 'texttable >= 0.9.0, < 2',
'websocket-client >= 0.32.0, < 1',
'docker[ssh] >= 3.7.0, < 5',
'dockerpty >= 0.4.1, < 1',
--
2.20.1