gentoo resync : 18.05.2019

2 files changed, 20 insertions, 21 deletions

diff --git a/app-emulation/docker-compose/files/docker-compose-1.23.0-setup-py.patch b/app-emulation/docker-compose/files/docker-compose-1.23.2-setup-py.patch
index c95c776b2c38..193ece1c09f9 100644
--- a/app-emulation/docker-compose/files/docker-compose-1.23.0-setup-py.patch
+++ b/app-emulation/docker-compose/files/docker-compose-1.23.2-setup-py.patch
@@ -1,14 +1,14 @@
-From c481f53ff75d015b4db37b294c5a2142d0272f32 Mon Sep 17 00:00:00 2001
+From 15b1ac5bfeb0ca2a8524dae10db7573b4efacba9 Mon Sep 17 00:00:00 2001
 From: Sebastian Pipping <sebastian@pipping.org>
-Date: Wed, 31 Oct 2018 18:45:59 +0100
+Date: Fri, 10 May 2019 23:54:14 +0200
 Subject: [PATCH] setup.py: Drop generic upper version boundaries
 
 ---
- setup.py | 28 ++++++++++++++--------------
- 1 file changed, 14 insertions(+), 14 deletions(-)
+ setup.py | 26 +++++++++++++-------------
+ 1 file changed, 13 insertions(+), 13 deletions(-)
 
 diff --git a/setup.py b/setup.py
-index 8260ebc..7f76abb 100644
+index 22dafdb..00167ce 100644
 --- a/setup.py
 +++ b/setup.py
 @@ -30,16 +30,16 @@ def find_version(*file_paths):
@@ -21,7 +21,7 @@ index 8260ebc..7f76abb 100644
 -    '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 >= 3.5.0, < 4.0',
+-    'docker >= 3.6.0, < 4.0',
 -    'dockerpty >= 0.4.1, < 0.5',
 -    'six >= 1.3.0, < 2',
 -    'jsonschema >= 2.5.1, < 3',
@@ -31,7 +31,7 @@ index 8260ebc..7f76abb 100644
 +    'requests >= 2.6.1, != 2.11.0, != 2.12.2, != 2.18.0',
 +    'texttable >= 0.9.0',
 +    'websocket-client >= 0.32.0',
-+    'docker >= 3.5.0',
++    'docker >= 3.6.0',
 +    'dockerpty >= 0.4.1',
 +    'six >= 1.3.0',
 +    'jsonschema >= 2.5.1',
@@ -45,15 +45,14 @@ index 8260ebc..7f76abb 100644
 -    ':python_version < "3.4"': ['enum34 >= 1.0.4, < 2'],
 +    ':python_version < "3.4"': ['enum34 >= 1.0.4'],
      ':python_version < "3.5"': ['backports.ssl_match_hostname >= 3.5'],
--    ':python_version < "3.3"': ['ipaddress >= 1.0.16'],
+     ':python_version < "3.3"': ['ipaddress >= 1.0.16'],
 -    ':sys_platform == "win32"': ['colorama >= 0.4, < 0.5'],
 -    'socks': ['PySocks >= 1.5.6, != 1.5.7, < 2'],
-+    ':python_version < "3.3"': ['ipaddress'],
 +    ':sys_platform == "win32"': ['colorama >= 0.4'],
 +    'socks': ['PySocks >= 1.5.6, != 1.5.7'],
  }
  
  
 -- 
-2.19.1
+2.21.0
 
diff --git a/app-emulation/docker-compose/files/docker-compose-1.22.0-setup-py.patch b/app-emulation/docker-compose/files/docker-compose-1.24.0-setup-py.patch
index 191e96d63961..1632a018bd41 100644
--- a/app-emulation/docker-compose/files/docker-compose-1.22.0-setup-py.patch
+++ b/app-emulation/docker-compose/files/docker-compose-1.24.0-setup-py.patch
@@ -1,14 +1,14 @@
-From 950506efebe97cb76f6cd3a558bab724452a51e9 Mon Sep 17 00:00:00 2001
+From 981faad5f67a843f2b6c44f40be4dc8d2c5156c7 Mon Sep 17 00:00:00 2001
 From: Sebastian Pipping <sebastian@pipping.org>
-Date: Mon, 24 Sep 2018 17:35:22 +0200
+Date: Sat, 11 May 2019 00:32:22 +0200
 Subject: [PATCH] setup.py: Drop generic upper version boundaries
 
 ---
- setup.py | 24 +++++++++++++-------------
+ setup.py | 26 +++++++++++++-------------
  1 file changed, 13 insertions(+), 13 deletions(-)
 
 diff --git a/setup.py b/setup.py
-index e0a26b0..1f9fb7f 100644
+index 8371cc7..b9e5a80 100644
 --- a/setup.py
 +++ b/setup.py
 @@ -30,16 +30,16 @@ def find_version(*file_paths):
@@ -17,11 +17,11 @@ index e0a26b0..1f9fb7f 100644
  install_requires = [
 -    'cached-property >= 1.2.0, < 2',
 -    'docopt >= 0.6.1, < 0.7',
--    'PyYAML >= 3.10, < 4',
--    'requests >= 2.6.1, != 2.11.0, != 2.12.2, != 2.18.0, < 2.19',
+-    '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 >= 3.4.1, < 4.0',
+-    'docker[ssh] >= 3.7.0, < 4.0',
 -    'dockerpty >= 0.4.1, < 0.5',
 -    'six >= 1.3.0, < 2',
 -    'jsonschema >= 2.5.1, < 3',
@@ -31,7 +31,7 @@ index e0a26b0..1f9fb7f 100644
 +    'requests >= 2.6.1, != 2.11.0, != 2.12.2, != 2.18.0',
 +    'texttable >= 0.9.0',
 +    'websocket-client >= 0.32.0',
-+    'docker >= 3.4.1',
++    'docker[ssh] >= 3.7.0',
 +    'dockerpty >= 0.4.1',
 +    'six >= 1.3.0',
 +    'jsonschema >= 2.5.1',
@@ -46,13 +46,13 @@ index e0a26b0..1f9fb7f 100644
 +    ':python_version < "3.4"': ['enum34 >= 1.0.4'],
      ':python_version < "3.5"': ['backports.ssl_match_hostname >= 3.5'],
      ':python_version < "3.3"': ['ipaddress >= 1.0.16'],
--    ':sys_platform == "win32"': ['colorama >= 0.3.9, < 0.4'],
+-    ':sys_platform == "win32"': ['colorama >= 0.4, < 0.5'],
 -    'socks': ['PySocks >= 1.5.6, != 1.5.7, < 2'],
-+    ':sys_platform == "win32"': ['colorama >= 0.3.9'],
++    ':sys_platform == "win32"': ['colorama >= 0.4'],
 +    'socks': ['PySocks >= 1.5.6, != 1.5.7'],
  }
  
  
 -- 
-2.19.0.rc2
+2.21.0