diff --git a/.gitignore b/.gitignore index 7ff995e..29004c8 100644 --- a/.gitignore +++ b/.gitignore @@ -16,3 +16,4 @@ /docker-compose-1.12.0.tar.gz /docker-compose-1.13.0.tar.gz /docker-compose-1.14.0.tar.gz +/docker-compose-1.15.0.tar.gz diff --git a/docker-compose.spec b/docker-compose.spec index f08ea7b..e76c993 100644 --- a/docker-compose.spec +++ b/docker-compose.spec @@ -1,8 +1,8 @@ %global debug_package %{nil} Name: docker-compose -Version: 1.14.0 -Release: 2%{?dist} +Version: 1.15.0 +Release: 1%{?dist} Summary: Multi-container orchestration for Docker License: ASL 2.0 @@ -29,7 +29,7 @@ BuildRequires: python3-docopt Requires: python3-setuptools # Upstream package name change; see BZ#1422198 -Requires: python3-docker >= 2.1.1-1 +Requires: python3-docker >= 2.3.0-1 # Version required due to upstream requirement; see BZ#1300106 Requires: python3-dockerpty >= 0.4.1-1 Requires: python3-texttable @@ -41,6 +41,9 @@ Requires: python3-jsonschema Requires: python3-PyYAML Requires: python3-cached_property Requires: python3-colorama +Requires: python3-pysocks +Requires: python3-certifi +Requires: python3-idna BuildArch: noarch @@ -85,6 +88,11 @@ rm -r docker_compose.egg-info %{python3_sitelib}/compose* %changelog +* Fri Jul 28 2017 Michael Hampton - 1.15.0-1 +- Update to 1.15.0 (#1471093) +- Explicit python3-docker requirement +- New upstream requirements python3-pysocks, python3-certifi, python3-idna + * Wed Jul 26 2017 Fedora Release Engineering - 1.14.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild diff --git a/remove-requires-upper-bound.patch b/remove-requires-upper-bound.patch index 865c634..2627804 100644 --- a/remove-requires-upper-bound.patch +++ b/remove-requires-upper-bound.patch @@ -1,42 +1,53 @@ -diff -up docker-compose-1.14.0/requirements.txt.orig docker-compose-1.14.0/requirements.txt ---- docker-compose-1.14.0/requirements.txt.orig 2017-06-15 20:07:50.000000000 -0400 -+++ docker-compose-1.14.0/requirements.txt 2017-06-20 10:57:33.649842501 -0400 -@@ -1,16 +1,16 @@ --PyYAML==3.11 +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 -backports.ssl-match-hostname==3.5.0.1; python_version < '3' --cached-property==1.2.0 --colorama==0.3.7 --docker==2.3.0 +-cached-property==1.3.0 ++PySocks ++PyYAML ++backports.ssl-match-hostname; python_version < '3' ++cached-property + certifi==2017.4.17 +-chardet==3.0.4 +-colorama==0.3.9 +-docker==2.4.2 +-docker-pycreds==0.2.1 -dockerpty==0.4.1 --docopt==0.6.1 --enum34==1.0.4; python_version < '3.4' +-docopt==0.6.2 +-enum34==1.1.6; python_version < '3.4' -functools32==3.2.3.post2; python_version < '3.2' --ipaddress==1.0.16 --jsonschema==2.5.1 +-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.4 +-texttable==0.8.8 +-urllib3==1.21.1 -websocket-client==0.32.0 -+PyYAML -+backports.ssl-match-hostname; python_version < '3' -+cached-property ++chardet +colorama +docker ++docker-pycreds +dockerpty +docopt +enum34; python_version < '3.4' +functools32; python_version < '3.2' ++idna +ipaddress +jsonschema +pypiwin32; sys_platform == 'win32' +requests +six +texttable ++urllib3 +websocket-client -diff -up docker-compose-1.14.0/setup.py.orig docker-compose-1.14.0/setup.py ---- docker-compose-1.14.0/setup.py.orig 2017-06-06 15:33:59.000000000 -0400 -+++ docker-compose-1.14.0/setup.py 2017-06-20 10:58:28.495938981 -0400 +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): @@ -48,7 +59,7 @@ diff -up docker-compose-1.14.0/setup.py.orig docker-compose-1.14.0/setup.py - 'requests >= 2.6.1, != 2.11.0, < 2.12', - 'texttable >= 0.8.1, < 0.9', - 'websocket-client >= 0.32.0, < 1.0', -- 'docker >= 2.3.0, < 3.0', +- 'docker >= 2.4.2, < 3.0', - 'dockerpty >= 0.4.1, < 0.5', - 'six >= 1.3.0, < 2', - 'jsonschema >= 2.5.1, < 3', @@ -56,10 +67,10 @@ diff -up docker-compose-1.14.0/setup.py.orig docker-compose-1.14.0/setup.py + 'colorama >= 0.3.7', + 'docopt >= 0.6.1', + 'PyYAML >= 3.10', -+ 'requests >= 2.6.1', ++ 'requests >= 2.6.1, != 2.11.0', + 'texttable >= 0.8.1', + 'websocket-client >= 0.32.0', -+ 'docker >= 2.3.0', ++ 'docker >= 2.4.2', + 'dockerpty >= 0.4.1', + 'six >= 1.3.0', + 'jsonschema >= 2.5.1', diff --git a/sources b/sources index b22ae25..a974d9c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (docker-compose-1.14.0.tar.gz) = d9216744b70155044d5eeffc5a29c4341a217b46af8904ee4ac11c6c766e0233225f5d65ee8f1bed6979cf2443df10f1b8ebca09a1e092aa0e07ec8afed52c77 +SHA512 (docker-compose-1.15.0.tar.gz) = 98de68db089754eb73a6f65971fca393703680241bce02e13fdbc88cbcdab93a3dbf3b94f359f8a9ff296535f001f06baee238d174e1555b39bd581d46328f42