Hello community, here is the log from the commit of package docker-compose for openSUSE:Factory checked in at 2016-04-22 16:23:22 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/docker-compose (Old) and /work/SRC/openSUSE:Factory/.docker-compose.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "docker-compose" Changes: -------- --- /work/SRC/openSUSE:Factory/docker-compose/docker-compose.changes 2015-12-29 13:00:14.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.docker-compose.new/docker-compose.changes 2016-04-22 16:23:23.000000000 +0200 @@ -1,0 +2,22 @@ +Thu Mar 17 16:48:03 UTC 2016 - [email protected] + +- Update to version 1.6.2: + + Add failing test for --abort-on-container-exit + + Stop other containers if the flag is set. + + Revert "Change special case from '_', None to ()" + + Make environment variables without a value the same as docker-cli. + + Updating Dockerfile + + Bump 1.6.1 + + Update docker-py version in requirements to 1.7.2 + + Bump 1.6.2 +- add cached-property requirement +- review version requirements so we don't have surprises if python + packages are updated + +- fix fix-requirements.patch based on versions in Factory + + +This fixes bsc#954145, docker-compose provided by tumbleweed does not run + + +------------------------------------------------------------------- Old: ---- compose-1.5.2.tar.xz New: ---- compose-1.6.2.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ docker-compose.spec ++++++ --- /var/tmp/diff_new_pack.vIdAta/_old 2016-04-22 16:23:24.000000000 +0200 +++ /var/tmp/diff_new_pack.vIdAta/_new 2016-04-22 16:23:24.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package docker-compose # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -19,7 +19,7 @@ %define mod_name compose Name: docker-compose -Version: 1.5.2 +Version: 1.6.2 Release: 0 Summary: Define and run complex applications using Docker License: Apache-2.0 @@ -30,16 +30,28 @@ Patch0: fix-requirements.patch Requires: docker Requires: python-PyYAML >= 3.11 -Requires: python-docker-py >= 1.5.0 -Requires: python-dockerpty >= 0.3.4 +Conflicts: python-PyYAML >= 4 +Requires: python-docker-py >= 1.7.0 +Conflicts: python-docker-py >= 2 +Requires: python-dockerpty >= 0.4.1 +Conflicts: python-dockerpty >= 0.5 Requires: python-docopt >= 0.6.1 +Conflicts: python-docopt >= 0.7 Requires: python-enum34 >= 1.0 +Conflicts: python-enum34 >= 2 Requires: python-jsonschema >= 2.5.1 +Conflicts: python-jsonschema >= 3 Requires: python-requests >= 2.7.0 +Conflicts: python-requests >= 2.10 Requires: python-setuptools Requires: python-six >= 1.7.3 +Conflicts: python-six >= 2 Requires: python-texttable >= 0.8.2 +Conflicts: python-texttable >= 0.9 Requires: python-websocket-client >= 0.32.0 +Conflicts: python-websocket-client >= 1.0 +Requires: python-cached-property >= 1.2.0 +Conflicts: python-cached-property >= 2 BuildRequires: python-setuptools BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ _service ++++++ --- /var/tmp/diff_new_pack.vIdAta/_old 2016-04-22 16:23:24.000000000 +0200 +++ /var/tmp/diff_new_pack.vIdAta/_new 2016-04-22 16:23:24.000000000 +0200 @@ -4,8 +4,8 @@ <param name="url">[email protected]:docker/compose.git</param> <param name="exclude">.git</param> <param name="filename">compose</param> - <param name="versionformat">1.5.2</param> - <param name="revision">1.5.2</param> + <param name="versionformat">1.6.2</param> + <param name="revision">1.6.2</param> <param name="changesgenerate">enable</param> </service> <service name="recompress" mode="disabled"> ++++++ compose-1.5.2.tar.xz -> compose-1.6.2.tar.xz ++++++ ++++ 16720 lines of diff (skipped) ++++++ fix-requirements.patch ++++++ --- /var/tmp/diff_new_pack.vIdAta/_old 2016-04-22 16:23:24.000000000 +0200 +++ /var/tmp/diff_new_pack.vIdAta/_new 2016-04-22 16:23:24.000000000 +0200 @@ -1,35 +1,22 @@ -diff --git a/requirements.txt b/requirements.txt -index 60327d7..65169a6 100644 ---- a/requirements.txt -+++ b/requirements.txt -@@ -2,7 +2,7 @@ PyYAML==3.11 - docker-py==1.5.0 - dockerpty==0.3.4 - docopt==0.6.1 --enum34==1.0.4 -+enum34>=1.0 - jsonschema==2.5.1 - requests==2.7.0 - six==1.7.3 diff --git a/setup.py b/setup.py -index 4020122..6f43d2a 100644 +index df4172c..dd9a00e 100644 --- a/setup.py +++ b/setup.py -@@ -30,7 +30,7 @@ def find_version(*file_paths): - install_requires = [ +@@ -31,7 +31,7 @@ install_requires = [ + 'cached-property >= 1.2.0, < 2', 'docopt >= 0.6.1, < 0.7', 'PyYAML >= 3.10, < 4', - 'requests >= 2.6.1, < 2.8', -+ 'requests >= 2.6.1, < 2.9', ++ 'requests >= 2.6.1, < 2.10', 'texttable >= 0.8.1, < 0.9', 'websocket-client >= 0.32.0, < 1.0', - 'docker-py >= 1.5.0, < 2', -@@ -47,7 +47,7 @@ tests_require = [ + 'docker-py >= 1.7.0, < 2', +@@ -48,7 +48,7 @@ tests_require = [ if sys.version_info[:2] < (3, 4): tests_require.append('mock >= 1.0.1') - install_requires.append('enum34 >= 1.0.4, < 2') -+ install_requires.append('enum34 >= 1.0, < 2') ++ install_requires.append('enum34 >= 1.0.0, < 2') setup(
