package/docker-compose: bump version to 1.24.1
authorPeter Korsgaard <peter@korsgaard.com>
Sat, 26 Oct 2019 14:05:24 +0000 (16:05 +0200)
committerThomas Petazzoni <thomas.petazzoni@bootlin.com>
Sat, 26 Oct 2019 18:17:14 +0000 (20:17 +0200)
commit1cab59a5e808c448063be4984cb52c6abe775236
tree97ba464f2cd3dc2609c00246932b91e11c7f23c9
parent845db35fe4c9ceacfee6331ce80ff8b8c0b183f7
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>
package/docker-compose/0001-Strip-up-generic-versions-and-bump-requests.patch [new file with mode: 0644]
package/docker-compose/0001-setup.py-allow-all-recent-2.x-requests-releases.patch [deleted file]
package/docker-compose/0002-Bump-texttable-from-0.9.1-to-1.6.2.patch [new file with mode: 0644]
package/docker-compose/0002-Upgrade-pyyaml-to-4.2b1.patch [deleted file]
package/docker-compose/0003-support-PyYAML-up-to-5.1-version.patch [new file with mode: 0644]
package/docker-compose/Config.in
package/docker-compose/docker-compose.hash
package/docker-compose/docker-compose.mk
support/testing/tests/package/test_docker_compose.py