diff --git a/docker-compose-1.25.1.tar.gz b/docker-compose-1.25.1.tar.gz deleted file mode 100644 index d6bc495..0000000 --- a/docker-compose-1.25.1.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:c7703a69b027c1405a127de76d43c2bbbd11fee7ad74b0b71f8b5e7461597900 -size 277965 diff --git a/docker-compose-1.25.4.tar.gz b/docker-compose-1.25.4.tar.gz new file mode 100644 index 0000000..244e7ec --- /dev/null +++ b/docker-compose-1.25.4.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:fabae2bee4abfa7bdd09125b6bbdcdda81f946c7b16e3ccc6bb2d821ef6488f3 +size 273838 diff --git a/no-restrict-upper.patch b/no-restrict-upper.patch index db990d4..ff0598a 100644 --- a/no-restrict-upper.patch +++ b/no-restrict-upper.patch @@ -1,14 +1,14 @@ -Index: docker-compose-1.25.0/setup.py +Index: docker-compose-1.25.4/setup.py =================================================================== ---- docker-compose-1.25.0.orig/setup.py -+++ docker-compose-1.25.0/setup.py -@@ -30,16 +30,16 @@ def find_version(*file_paths): +--- docker-compose-1.25.4.orig/setup.py ++++ docker-compose-1.25.4/setup.py +@@ -30,35 +30,35 @@ def find_version(*file_paths): install_requires = [ - 'cached-property >= 1.2.0, < 2', - 'docopt >= 0.6.1, < 1', -- 'PyYAML >= 3.10, < 5', +- 'PyYAML >= 3.10, < 6', - 'requests >= 2.20.0, < 3', - 'texttable >= 0.9.0, < 2', - 'websocket-client >= 0.32.0, < 1', @@ -29,7 +29,10 @@ Index: docker-compose-1.25.0/setup.py ] -@@ -49,16 +49,16 @@ tests_require = [ + tests_require = [ +- 'pytest < 6', ++ 'pytest', + ] if sys.version_info[:2] < (3, 4): diff --git a/python-docker-compose.changes b/python-docker-compose.changes index 5a14e98..99fb915 100644 --- a/python-docker-compose.changes +++ b/python-docker-compose.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Thu Apr 2 12:49:50 UTC 2020 - Marketa Calabkova + +- Update to 1.25.4 + * Allow compatibility option with COMPOSE_COMPATIBILITY environment variable + * Fix v3.8 schema support for binaries + * few dependendy version bumps + ------------------------------------------------------------------- Fri Jan 10 14:56:46 UTC 2020 - Tomáš Chvátal diff --git a/python-docker-compose.spec b/python-docker-compose.spec index 764aa49..eaedc65 100644 --- a/python-docker-compose.spec +++ b/python-docker-compose.spec @@ -24,7 +24,7 @@ %bcond_without python2 %endif Name: python-docker-compose -Version: 1.25.1 +Version: 1.25.4 Release: 0 Summary: Tool to define and run complex applications using Docker License: Apache-2.0 @@ -41,7 +41,7 @@ BuildRequires: %{python_module jsonschema >= 2.6} BuildRequires: %{python_module pytest} BuildRequires: %{python_module setuptools} BuildRequires: %{python_module six >= 1.3.0} -BuildRequires: %{python_module texttable >= 0.9.0} +BuildRequires: %{python_module texttable >= 0.9.1} BuildRequires: %{python_module websocket-client >= 0.32.0} BuildRequires: fdupes BuildRequires: python-rpm-macros @@ -54,12 +54,12 @@ Requires: python-docker >= 3.7.0 Requires: python-docker-pycreds >= 0.3.0 Requires: python-dockerpty >= 0.4.1 Requires: python-docopt >= 0.6.2 +Requires: python-dotenv >= 0.10.5 Requires: python-idna >= 2.5 Requires: python-jsonschema >= 2.6.0 Requires: python-requests >= 2.20.0 Requires: python-six >= 1.3.0 Requires: python-texttable >= 0.9.1 -Requires: python-urllib3 >= 1.21.1 Requires: python-websocket-client >= 0.32.0 BuildArch: noarch # This is py3 only as we have the binary just there