From 4b48dcd2db8f7ea27b21d3da3f256edc0ee60b7a Mon Sep 17 00:00:00 2001 From: Toby Merz Date: Mon, 9 Sep 2019 09:25:37 +0200 Subject: [PATCH] docker-compose: update to 1.24.1, patch version check for pyYAML. --- srcpkgs/docker-compose/patches/pyyaml_version.patch | 13 +++++++++++++ srcpkgs/docker-compose/template | 8 +++++--- 2 files changed, 18 insertions(+), 3 deletions(-) create mode 100644 srcpkgs/docker-compose/patches/pyyaml_version.patch diff --git a/srcpkgs/docker-compose/patches/pyyaml_version.patch b/srcpkgs/docker-compose/patches/pyyaml_version.patch new file mode 100644 index 00000000000..77c69fd89a5 --- /dev/null +++ b/srcpkgs/docker-compose/patches/pyyaml_version.patch @@ -0,0 +1,13 @@ +diff --git a/setup.py b/setup.py +index 8371cc756ee0..5e27ab7c5d0e 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, < 0.7', +- 'PyYAML >= 3.10, < 4.3', ++ 'PyYAML >= 3.10', + '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', diff --git a/srcpkgs/docker-compose/template b/srcpkgs/docker-compose/template index eaa967790b6..c3383fdf1ad 100644 --- a/srcpkgs/docker-compose/template +++ b/srcpkgs/docker-compose/template @@ -1,7 +1,7 @@ # Template file for 'docker-compose' pkgname=docker-compose -version=1.24.0 -revision=1 +version=1.24.1 +revision=2 archs=noarch wrksrc="compose-${version}" build_style=python3-module @@ -16,7 +16,9 @@ maintainer="pancake " license="Apache-2.0" homepage="https://docs.docker.com/compose/" distfiles="https://github.com/docker/compose/archive/${version}.tar.gz" -checksum=31933e401d295812617f23377f63fc2b8da13d8456b61a60cec0e02afcad5672 +checksum=63a0e0d3819ff77aebd3d5ea30f77b36475ed522c4dabed2eb10636e35aa9370 +patch_args="-Np1" + pre_build() { # relax texttable and requests upper bound