missing patch update; rel 2

diff --git a/docker-compose.spec b/docker-compose.spec
index 5b80441a10bed03c61ab1d796cfab3d7fa491db3..f7e6760acec6a06a73e0e180a848db0446bafc76 100644 (file)
--- a/docker-compose.spec
+++ b/docker-compose.spec
@@ -8,7 +8,7 @@
 Summary:       Multi-container orchestration for Docker
 Name:          docker-compose
 Version:       1.24.0
-Release:       1
+Release:       2
 License:       Apache v2.0
 Group:         Applications/System
 # https://github.com/docker/compose/releases

diff --git a/remove-requires-upper-bound.patch b/remove-requires-upper-bound.patch
index ccdc05ac8e939bd373814e036962889f331e4b9d..7c323f5dfcb7d663390b97412ab856c044f687eb 100644 (file)
--- a/remove-requires-upper-bound.patch
+++ b/remove-requires-upper-bound.patch
@@ -1,14 +1,14 @@
 diff -ur docker-compose-1.19.0.orig/requirements.txt docker-compose-1.19.0/requirements.txt
 --- docker-compose-1.19.0.orig/requirements.txt        2018-03-05 21:55:17.014552784 +0100
 +++ docker-compose-1.19.0/requirements.txt     2018-03-05 21:56:54.020768816 +0100
-@@ -1,23 +1,22 @@
+@@ -1,24 +1,23 @@
 -backports.ssl-match-hostname==3.5.0.1; python_version < '3'
 -cached-property==1.3.0
 -certifi==2017.4.17
 -chardet==3.0.4
 -colorama==0.4.0; sys_platform == 'win32'
--docker==3.6.0
--docker-pycreds==0.3.0
+-docker==3.7.2
+-docker-pycreds==0.4.0
 -dockerpty==0.4.1
 -docopt==0.6.2
 -enum34==1.1.6; python_version < '3.4'
@@ -16,10 +16,11 @@ diff -ur docker-compose-1.19.0.orig/requirements.txt docker-compose-1.19.0/requi
 -idna==2.5
 -ipaddress==1.0.18
 -jsonschema==2.6.0
+-paramiko==2.4.2
 -pypiwin32==219; sys_platform == 'win32' and python_version < '3.6'
 -pypiwin32==223; sys_platform == 'win32' and python_version >= '3.6'
 -PySocks==1.6.7
--PyYAML==3.12
+-PyYAML==4.2b1
 -requests==2.20.0
 -six==1.10.0
 -texttable==0.9.1
@@ -39,6 +40,7 @@ diff -ur docker-compose-1.19.0.orig/requirements.txt docker-compose-1.19.0/requi
 +idna
 +ipaddress
 +jsonschema
++paramiko
 +pypiwin32; sys_platform == 'win32'
 +PySocks
 +PyYAML
@@ -56,11 +58,11 @@ diff -ur docker-compose-1.19.0.orig/setup.py docker-compose-1.19.0/setup.py
  install_requires = [
 -    'cached-property >= 1.2.0, < 2',
 -    'docopt >= 0.6.1, < 0.7',
--    'PyYAML >= 3.10, < 4',
+-    '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.6.0, < 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',