[packages/docker-compose] up to 1.7.1

[glen]

commit 1ea8eb340ebb2e2c8152e44e80ab8d1745086728
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Thu May 19 14:27:47 2016 +0300

    up to 1.7.1
    
    Note that Compose 1.7.1 requires Docker Engine 1.10.0 or later for
    version 2 of the Compose File format, and Docker Engine 1.9.1 or later
    for version 1.

 docker-compose.spec               | 12 +++++++-----
 remove-requires-upper-bound.patch | 37 ++++++++++---------------------------
 2 files changed, 17 insertions(+), 32 deletions(-)
---
diff --git a/docker-compose.spec b/docker-compose.spec
index cce6f34..b4aba95 100644
--- a/docker-compose.spec
+++ b/docker-compose.spec
@@ -4,14 +4,16 @@
 
 Summary:	Multi-container orchestration for Docker
 Name:		docker-compose
-Version:	1.7.0
+Version:	1.7.1
 Release:	1
 License:	Apache v2.0
-Source0:	https://pypi.python.org/packages/source/d/docker-compose/%{name}-%{version}.tar.gz
-# Source0-md5:	7d9cc3103f02dfcbffdd3c1dfda47ac4
 Group:		Applications/System
-URL:		https://docs.docker.com/compose/
+# https://github.com/docker/compose/releases
+# https://pypi.python.org/pypi/docker-compose
+Source0:	https://pypi.python.org/packages/b6/20/0a65e13ac06c4693f28ded22b87882ca1750239bdc0a05d4a4df4e3a9faa/%{name}-%{version}.tar.gz
+# Source0-md5:	8c2b9a88c3aa46dbef422c7eb6802108
 Patch0:		remove-requires-upper-bound.patch
+URL:		https://docs.docker.com/compose/
 %if %{with tests}
 BuildRequires:	python-PyYAML
 BuildRequires:	python-docker
@@ -23,6 +25,7 @@ BuildRequires:	python-websocket-client
 %endif
 BuildRequires:	rpm-pythonprov
 BuildRequires:	rpmbuild(macros) >= 1.714
+Requires:	docker >= 1.10.0
 BuildArch:	noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -41,7 +44,6 @@ Docker-compose allows you to:
 %setup -q
 %patch0 -p1
 
-# Upstream uses an underscore here
 rm -r docker_compose.egg-info
 
 %build
diff --git a/remove-requires-upper-bound.patch b/remove-requires-upper-bound.patch
index 21b075b..50c0da5 100644
--- a/remove-requires-upper-bound.patch
+++ b/remove-requires-upper-bound.patch
@@ -1,31 +1,14 @@
-# Remove dependency version constraints not relevant in Fedora/EPEL
---- docker-compose-1.6.2/setup.py.orig	2016-02-12 16:42:36.000000000 +0200
-+++ docker-compose-1.6.2/setup.py	2016-05-02 22:34:41.740785187 +0300
-@@ -28,16 +28,16 @@
- 
- 
- install_requires = [
--    'cached-property >= 1.2.0, < 2',
--    'docopt >= 0.6.1, < 0.7',
--    'PyYAML >= 3.10, < 4',
+--- docker-compose-1.7.1/setup.py~	2016-05-04 21:52:57.000000000 +0300
++++ docker-compose-1.7.1/setup.py	2016-05-19 14:24:16.408589040 +0300
+@@ -31,7 +31,7 @@
+     'cached-property >= 1.2.0, < 2',
+     'docopt >= 0.6.1, < 0.7',
+     'PyYAML >= 3.10, < 4',
 -    'requests >= 2.6.1, < 2.8',
--    'texttable >= 0.8.1, < 0.9',
--    'websocket-client >= 0.32.0, < 1.0',
-+    'cached-property',
-+    'docopt',
-+    'PyYAML',
-+    'requests',
-+    'texttable',
-+    'websocket-client',
-     'docker-py > 1.7.2, < 2',
-     'dockerpty >= 0.4.1, < 0.5',
--    'six >= 1.3.0, < 2',
--    'jsonschema >= 2.5.1, < 3',
-+    'six',
-+    'jsonschema',
- ]
- 
- 
++    'requests >= 2.6.1',
+     'texttable >= 0.8.1, < 0.9',
+     'websocket-client >= 0.32.0, < 1.0',
+     'docker-py >= 1.8.1, < 2',
 @@ -47,8 +47,8 @@
  
  
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/docker-compose.git/commitdiff/1ea8eb340ebb2e2c8152e44e80ab8d1745086728