diff --git a/sysutils/docker-compose/Makefile b/sysutils/docker-compose/Makefile index 923b98ed3661..32a99d7760b2 100644 --- a/sysutils/docker-compose/Makefile +++ b/sysutils/docker-compose/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= docker-compose -PORTVERSION= 1.17.1 +PORTVERSION= 1.18.0 CATEGORIES= sysutils python MASTER_SITES= CHEESESHOP diff --git a/sysutils/docker-compose/distinfo b/sysutils/docker-compose/distinfo index 544198fadbed..0f6711803d78 100644 --- a/sysutils/docker-compose/distinfo +++ b/sysutils/docker-compose/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1510341304 -SHA256 (docker-compose-1.17.1.tar.gz) = e29469dbd78457c82ddad674c0fa0b7afed065b2c73858d332dd6d20d92a8541 -SIZE (docker-compose-1.17.1.tar.gz) = 219947 +TIMESTAMP = 1513694845 +SHA256 (docker-compose-1.18.0.tar.gz) = 2930cbfe2685018fbb75377600ab6288861d9955717b3f14212f63950351d379 +SIZE (docker-compose-1.18.0.tar.gz) = 231256 diff --git a/sysutils/docker-compose/files/patch-setup.py b/sysutils/docker-compose/files/patch-setup.py index f67f4f1abc06..88552f46e782 100644 --- a/sysutils/docker-compose/files/patch-setup.py +++ b/sysutils/docker-compose/files/patch-setup.py @@ -1,13 +1,11 @@ ---- setup.py.orig 2017-09-05 13:29:08 UTC +--- setup.py.orig 2017-12-19 14:49:12 UTC +++ setup.py -@@ -33,8 +33,8 @@ install_requires = [ - 'cached-property >= 1.2.0, < 2', +@@ -34,7 +34,7 @@ install_requires = [ 'docopt >= 0.6.1, < 0.7', 'PyYAML >= 3.10, < 4', -- 'requests >= 2.6.1, != 2.11.0, < 2.12', + 'requests >= 2.6.1, != 2.11.0, != 2.12.2, != 2.18.0, < 2.19', - 'texttable >= 0.9.0, < 0.10', -+ 'requests >= 2.6.1, != 2.11.0, < 3', + 'texttable >= 0.9.0, < 2', 'websocket-client >= 0.32.0, < 1.0', - 'docker >= 2.5.1, < 3.0', + 'docker >= 2.6.1, < 3.0', 'dockerpty >= 0.4.1, < 0.5',