diff --git a/docker-compose.spec b/docker-compose.spec index f61a4f1adfde7576ae1d8d8ccc55aeee25171f8c..ad0631a7300567f04e65838a3961ad95d4e852fa 100644 --- a/docker-compose.spec +++ b/docker-compose.spec @@ -2,7 +2,7 @@ Name: docker-compose Version: 1.22.0 -Release: 3 +Release: 4 Summary: Multi-container orchestration for Docker License: ASL 2.0 URL: https://github.com/docker/compose @@ -75,6 +75,9 @@ install -D -p -m 644 contrib/completion/fish/docker-compose.fish %{buildroot}%{_ %{_datadir}/fish %changelog +* Thr Sep 10 2020 xiadanni - 1.22.0-4 +- modify the limit maximum version + * Thu Jun 2 2020 maqiang - 1.22.0-3 - modify the limit maximum version diff --git a/modify-the-limit-maximum-version.patch b/modify-the-limit-maximum-version.patch index a00bafd4ece00a22d36555ba2e00357a82ab4a5c..b32d5fcd5ea1e88ec11ae2cc0b8518ea0118bc5a 100644 --- a/modify-the-limit-maximum-version.patch +++ b/modify-the-limit-maximum-version.patch @@ -11,7 +11,7 @@ diff --git a/setup.py b/setup.py index e0a26b0..aec9e3a 100644 --- a/setup.py +++ b/setup.py -@@ -32,11 +32,11 @@ def find_version(*file_paths): +@@ -32,14 +32,14 @@ def find_version(*file_paths): install_requires = [ 'cached-property >= 1.2.0, < 2', 'docopt >= 0.6.1, < 0.7', @@ -19,14 +19,18 @@ index e0a26b0..aec9e3a 100644 - 'requests >= 2.6.1, != 2.11.0, != 2.12.2, != 2.18.0, < 2.19', - 'texttable >= 0.9.0, < 0.10', + 'PyYAML >= 3.10, < 5.4', -+ 'requests >= 2.6.1, != 2.11.0, != 2.12.2, != 2.18.0, < 2.22', ++ 'requests >= 2.6.1, != 2.11.0, != 2.12.2, != 2.18.0, < 3', + 'texttable >= 0.9.0, < 1.50', 'websocket-client >= 0.32.0, < 1.0', - 'docker >= 3.4.1, < 4.0', + 'docker >= 3.4.1, < 4.1', 'dockerpty >= 0.4.1, < 0.5', 'six >= 1.3.0, < 2', - 'jsonschema >= 2.5.1, < 3', +- 'jsonschema >= 2.5.1, < 3', ++ 'jsonschema >= 2.5.1, < 4', + ] + + if sys.version_info[:2] < (3, 4): -- 1.8.3.1