[packages/docker-compose] up to 1.20.0
atler
atler at pld-linux.org
Wed Mar 21 20:07:22 CET 2018
commit 384fb2dff4bbd1474d788b6a5bb8927f7a334c96
Author: Jan Palus <atler at pld-linux.org>
Date: Wed Mar 21 20:07:00 2018 +0100
up to 1.20.0
docker-compose.spec | 4 +-
remove-requires-upper-bound.patch | 84 +++++++++++++++++++++++----------------
2 files changed, 51 insertions(+), 37 deletions(-)
---
diff --git a/docker-compose.spec b/docker-compose.spec
index 44ae76f..be01caf 100644
--- a/docker-compose.spec
+++ b/docker-compose.spec
@@ -7,13 +7,13 @@
%define pypi_name docker-compose
Summary: Multi-container orchestration for Docker
Name: docker-compose
-Version: 1.16.1
+Version: 1.20.0
Release: 1
License: Apache v2.0
Group: Applications/System
# https://github.com/docker/compose/releases
Source0: https://files.pythonhosted.org/packages/source/d/%{pypi_name}/%{pypi_name}-%{version}.tar.gz
-# Source0-md5: 8dcadf09143600fcb573b43f446c8f9a
+# Source0-md5: 5c3dd3a1ed82b01ee1b21c46c4eb51f3
Patch0: remove-requires-upper-bound.patch
URL: https://docs.docker.com/compose/
%if %{with tests}
diff --git a/remove-requires-upper-bound.patch b/remove-requires-upper-bound.patch
index 2627804..85f78e9 100644
--- a/remove-requires-upper-bound.patch
+++ b/remove-requires-upper-bound.patch
@@ -1,79 +1,93 @@
-diff -up docker-compose-1.15.0/requirements.txt.orig docker-compose-1.15.0/requirements.txt
---- docker-compose-1.15.0/requirements.txt.orig 2017-07-25 19:05:04.000000000 -0400
-+++ docker-compose-1.15.0/requirements.txt 2017-07-28 18:25:47.282974273 -0400
-@@ -1,22 +1,22 @@
--PySocks==1.6.7
--PyYAML==3.12
+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 @@
-backports.ssl-match-hostname==3.5.0.1; python_version < '3'
-cached-property==1.3.0
-+PySocks
-+PyYAML
-+backports.ssl-match-hostname; python_version < '3'
-+cached-property
- certifi==2017.4.17
+-certifi==2017.4.17
-chardet==3.0.4
--colorama==0.3.9
--docker==2.4.2
+-docker==3.1.3
-docker-pycreds==0.2.1
-dockerpty==0.4.1
-docopt==0.6.2
-enum34==1.1.6; python_version < '3.4'
-functools32==3.2.3.post2; python_version < '3.2'
--idna==2.5
--ipaddress==1.0.18
--jsonschema==2.6.0
--pypiwin32==219; sys_platform == 'win32'
--requests==2.11.1
--six==1.10.0
--texttable==0.8.8
--urllib3==1.21.1
--websocket-client==0.32.0
++backports.ssl-match-hostname; python_version < '3'
++cached-property
++certifi
+chardet
-+colorama
+docker
+docker-pycreds
+dockerpty
+docopt
+enum34; python_version < '3.4'
+functools32; python_version < '3.2'
+ git+git://github.com/tartley/colorama.git@bd378c725b45eba0b8e5cc091c3ca76a954c92ff; sys_platform == 'win32'
+-idna==2.5
+-ipaddress==1.0.18
+-jsonschema==2.6.0
+-pypiwin32==219; sys_platform == 'win32' and python_version < '3.6'
+-pypiwin32==220; sys_platform == 'win32' and python_version >= '3.6'
+-PySocks==1.6.7
+-PyYAML==3.12
+-requests==2.18.4
+-six==1.10.0
+-texttable==0.9.1
+-urllib3==1.21.1
+-websocket-client==0.32.0
+idna
+ipaddress
+jsonschema
+pypiwin32; sys_platform == 'win32'
++PySocks
++PyYAML
+requests
+six
+texttable
+urllib3
+websocket-client
-diff -up docker-compose-1.15.0/setup.py.orig docker-compose-1.15.0/setup.py
---- docker-compose-1.15.0/setup.py.orig 2017-07-25 19:05:03.000000000 -0400
-+++ docker-compose-1.15.0/setup.py 2017-07-28 18:19:22.561055698 -0400
-@@ -30,17 +30,17 @@ def find_version(*file_paths):
+diff -ur docker-compose-1.19.0.orig/setup.py docker-compose-1.19.0/setup.py
+--- docker-compose-1.19.0.orig/setup.py 2018-03-05 21:55:17.014552784 +0100
++++ docker-compose-1.19.0/setup.py 2018-03-05 21:58:30.540322510 +0100
+@@ -30,16 +30,16 @@
install_requires = [
- 'cached-property >= 1.2.0, < 2',
-- 'colorama >= 0.3.7, < 0.4',
- 'docopt >= 0.6.1, < 0.7',
- 'PyYAML >= 3.10, < 4',
-- 'requests >= 2.6.1, != 2.11.0, < 2.12',
-- 'texttable >= 0.8.1, < 0.9',
+- 'requests >= 2.6.1, != 2.11.0, != 2.12.2, != 2.18.0, < 2.19',
+- 'texttable >= 0.9.0, < 0.10',
- 'websocket-client >= 0.32.0, < 1.0',
-- 'docker >= 2.4.2, < 3.0',
+- 'docker >= 3.1.3, < 4.0',
- 'dockerpty >= 0.4.1, < 0.5',
- 'six >= 1.3.0, < 2',
- 'jsonschema >= 2.5.1, < 3',
+ 'cached-property >= 1.2.0',
-+ 'colorama >= 0.3.7',
+ 'docopt >= 0.6.1',
+ 'PyYAML >= 3.10',
-+ 'requests >= 2.6.1, != 2.11.0',
-+ 'texttable >= 0.8.1',
++ 'requests >= 2.6.1, != 2.11.0, != 2.12.2, != 2.18.0',
++ 'texttable >= 0.9.0',
+ 'websocket-client >= 0.32.0',
-+ 'docker >= 2.4.2',
++ 'docker >= 3.1.3',
+ 'dockerpty >= 0.4.1',
+ 'six >= 1.3.0',
+ 'jsonschema >= 2.5.1',
]
+@@ -52,11 +52,11 @@
+ tests_require.append('mock >= 1.0.1')
+
+ extras_require = {
+- ':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'],
+- ':sys_platform == "win32"': ['colorama >= 0.3.9, < 0.4'],
+- 'socks': ['PySocks >= 1.5.6, != 1.5.7, < 2'],
++ ':sys_platform == "win32"': ['colorama >= 0.3.9'],
++ 'socks': ['PySocks >= 1.5.6, != 1.5.7'],
+ }
+
+
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/docker-compose.git/commitdiff/384fb2dff4bbd1474d788b6a5bb8927f7a334c96
More information about the pld-cvs-commit
mailing list