diff --git a/.gitignore b/.gitignore index e2df8f0..57d6749 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ /docker-compose-1.4.0.tar.gz /docker-compose-1.4.1.tar.gz /docker-compose-1.4.2.tar.gz +/docker-compose-1.5.2.tar.gz diff --git a/docker-compose.spec b/docker-compose.spec index 675dc55..a735822 100644 --- a/docker-compose.spec +++ b/docker-compose.spec @@ -1,7 +1,7 @@ %global debug_package %{nil} Name: docker-compose -Version: 1.4.2 +Version: 1.5.2 Release: 1%{?dist} Summary: Multi-container orchestration for Docker @@ -74,6 +74,9 @@ rm -r docker_compose.egg-info %{python2_sitelib}/compose* %changelog +* Wed Dec 30 2015 Michael Hampton - 1.5.2-1 +- Update to upstream 1.5.2 + * Wed Sep 23 2015 Michael Hampton - 1.4.2-1 - Fixes a regression in the 1.4.1 release that would cause docker-compose up without the -d option to exit immediately. diff --git a/remove-requires-upper-bound.patch b/remove-requires-upper-bound.patch index 46bc12d..57f8683 100644 --- a/remove-requires-upper-bound.patch +++ b/remove-requires-upper-bound.patch @@ -1,18 +1,19 @@ -diff -up docker-compose-1.4.0/setup.py.orig docker-compose-1.4.0/setup.py ---- docker-compose-1.4.0/setup.py.orig 2015-08-11 13:15:02.000000000 -0400 -+++ docker-compose-1.4.0/setup.py 2015-08-11 20:30:12.947634912 -0400 -@@ -25,14 +25,14 @@ +diff -up docker-compose-1.5.2/setup.py.orig docker-compose-1.5.2/setup.py +--- docker-compose-1.5.2/setup.py.orig 2015-12-03 19:36:35.000000000 -0500 ++++ docker-compose-1.5.2/setup.py 2015-12-29 19:57:40.141038849 -0500 +@@ -28,15 +28,15 @@ install_requires = [ - 'docopt >= 0.6.1, < 0.7', - 'PyYAML >= 3.10, < 4', -- 'requests >= 2.6.1, < 2.7', +- 'requests >= 2.6.1, < 2.8', - 'texttable >= 0.8.1, < 0.9', - 'websocket-client >= 0.32.0, < 1.0', -- 'docker-py >= 1.3.1, < 1.4', +- 'docker-py >= 1.5.0, < 2', - 'dockerpty >= 0.3.4, < 0.4', - 'six >= 1.3.0, < 2', +- 'jsonschema >= 2.5.1, < 3', + 'docopt', + 'PyYAML', + 'requests', @@ -21,6 +22,16 @@ diff -up docker-compose-1.4.0/setup.py.orig docker-compose-1.4.0/setup.py + 'docker-py', + 'dockerpty', + 'six', ++ 'jsonschema', ] +@@ -47,7 +47,7 @@ + + 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') + + + setup( diff --git a/sources b/sources index 89dd8ac..a7a8c67 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -e1aac29f3244a14b4a84532d5ace366a docker-compose-1.4.2.tar.gz +19f9a5a6cac393166a01d29cd94c6931 docker-compose-1.5.2.tar.gz