[packages/docker-compose] up to 1.25.0
atler
atler at pld-linux.org
Thu Nov 21 00:32:42 CET 2019
commit 277c9d507b72ad6ab8eda107a1407e3cb7cc5235
Author: Jan Palus <atler at pld-linux.org>
Date: Thu Nov 21 00:32:34 2019 +0100
up to 1.25.0
docker-compose.spec | 6 ++---
remove-requires-upper-bound.patch | 57 +++++++++++++++++++++------------------
2 files changed, 34 insertions(+), 29 deletions(-)
---
diff --git a/docker-compose.spec b/docker-compose.spec
index f7e6760..b9fdd20 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.24.0
-Release: 2
+Version: 1.25.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: 8d12f41dd8d3abbc777ae2c277421f42
+# Source0-md5: 275b32cffdad6b9816dc8b4c7e55600a
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 7c323f5..5a28d4f 100644
--- a/remove-requires-upper-bound.patch
+++ b/remove-requires-upper-bound.patch
@@ -7,7 +7,7 @@ diff -ur docker-compose-1.19.0.orig/requirements.txt docker-compose-1.19.0/requi
-certifi==2017.4.17
-chardet==3.0.4
-colorama==0.4.0; sys_platform == 'win32'
--docker==3.7.2
+-docker==4.1.0
-docker-pycreds==0.4.0
-dockerpty==0.4.1
-docopt==0.6.2
@@ -15,16 +15,16 @@ diff -ur docker-compose-1.19.0.orig/requirements.txt docker-compose-1.19.0/requi
-functools32==3.2.3.post2; python_version < '3.2'
-idna==2.5
-ipaddress==1.0.18
--jsonschema==2.6.0
--paramiko==2.4.2
+-jsonschema==3.0.1
+-paramiko==2.6.0
-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==4.2b1
--requests==2.20.0
--six==1.10.0
--texttable==0.9.1
--urllib3==1.21.1; python_version == '3.3'
+-requests==2.22.0
+-six==1.12.0
+-texttable==1.6.2
+-urllib3==1.24.2; python_version == '3.3'
-websocket-client==0.32.0
+backports.ssl-match-hostname; python_version < '3'
+cached-property
@@ -49,46 +49,51 @@ diff -ur docker-compose-1.19.0.orig/requirements.txt docker-compose-1.19.0/requi
+texttable
+urllib3; python_version == '3.3'
+websocket-client
-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
+--- docker-compose-1.25.0/setup.py.orig 2019-11-14 15:46:09.000000000 +0100
++++ docker-compose-1.25.0/setup.py 2019-11-21 00:25:32.143128603 +0100
@@ -30,16 +30,16 @@
install_requires = [
- 'cached-property >= 1.2.0, < 2',
-- 'docopt >= 0.6.1, < 0.7',
-- '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[ssh] >= 3.7.0, < 4.0',
-- 'dockerpty >= 0.4.1, < 0.5',
+- 'docopt >= 0.6.1, < 1',
+- 'PyYAML >= 3.10, < 5',
+- 'requests >= 2.20.0, < 3',
+- 'texttable >= 0.9.0, < 2',
+- 'websocket-client >= 0.32.0, < 1',
+- 'docker[ssh] >= 3.7.0, < 5',
+- 'dockerpty >= 0.4.1, < 1',
- 'six >= 1.3.0, < 2',
-- 'jsonschema >= 2.5.1, < 3',
+- 'jsonschema >= 2.5.1, < 4',
+ 'cached-property >= 1.2.0',
+ 'docopt >= 0.6.1',
+ 'PyYAML >= 3.10',
-+ 'requests >= 2.6.1, != 2.11.0, != 2.12.2, != 2.18.0',
++ 'requests >= 2.20.0',
+ 'texttable >= 0.9.0',
+ 'websocket-client >= 0.32.0',
-+ 'docker >= 3.6.0',
++ 'docker >= 3.7.0',
+ 'dockerpty >= 0.4.1',
+ 'six >= 1.3.0',
+ 'jsonschema >= 2.5.1',
]
-@@ -52,11 +52,11 @@
- tests_require.append('mock >= 1.0.1')
+@@ -52,13 +52,13 @@
+ tests_require.append('mock >= 1.0.1, < 4')
extras_require = {
+- ':python_version < "3.2"': ['subprocess32 >= 3.5.4, < 4'],
- ':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.4, < 0.5'],
+- ':python_version < "3.5"': ['backports.ssl_match_hostname >= 3.5, < 4'],
+- ':python_version < "3.3"': ['backports.shutil_get_terminal_size == 1.0.0',
+- 'ipaddress >= 1.0.16, < 2'],
+- ':sys_platform == "win32"': ['colorama >= 0.4, < 1'],
- 'socks': ['PySocks >= 1.5.6, != 1.5.7, < 2'],
++ ':python_version < "3.2"': ['subprocess32 >= 3.5.4'],
++ ':python_version < "3.4"': ['enum34 >= 1.0.4'],
++ ':python_version < "3.5"': ['backports.ssl_match_hostname >= 3.5'],
++ ':python_version < "3.3"': ['backports.shutil_get_terminal_size >= 1.0.0',
++ 'ipaddress >= 1.0.16'],
+ ':sys_platform == "win32"': ['colorama >= 0.4'],
+ 'socks': ['PySocks >= 1.5.6, != 1.5.7'],
}
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/docker-compose.git/commitdiff/277c9d507b72ad6ab8eda107a1407e3cb7cc5235
More information about the pld-cvs-commit
mailing list