From f353e79cfd21f2b4994da73f9f9920967a5e15a6225c6ce8ead93f832cbfe4e9 Mon Sep 17 00:00:00 2001 From: Steve Kowalik Date: Tue, 16 Jun 2020 06:37:29 +0000 Subject: [PATCH] - Update to 1.26.0: * Bugs + Properly escape values coming from env_files + Sync compose-schemas with upstream (docker/cli) + Remove None entries on exec command + Add python-dotenv to delegate .env file processing + Don't adjust output on terminal width when piped into another command + Show an error message when version attribute is malformed + Fix HTTPS connection when DOCKER_HOST is remote * Bugfixes + Fix CI script to enforce the minimal MacOS version to 10.11 + Fix docker-compose exec for keys with no value + Fix CI script to enforce the compilation with Python3 + Fix binary's sha256 in the release page + Validate version format on formats 2+ + Assume infinite terminal width when not running in a terminal * Features + Add docker context support + Add missing test dependency ddt to setup.py + Add --attach-dependencies to command up for attaching to dependencies + Allow compatibility option with COMPOSE_COMPATIBILITY environment variable + Bump Pytest to 5.3.4 and add refactor compatibility with new version + Bump OpenSSL from 1.1.1f to 1.1.1g + Bump docker-py from 4.2.0 to 4.2.1 + Bump OpenSSL from 1.1.1d to 1.1.1f + Add 3.8 compose version + Allow compatibility option with COMPOSE_COMPATIBILITY environment variable + Bump PyInstaller from 3.5 to 3.6 + Bump pysocks from 1.6.7 to 1.7.1 + Bump websocket-client from 0.32.0 to 0.57.0 + Bump urllib3 from 1.24.2 to 1.25.7 + Bump jsonschema from 3.0.1 to 3.2.0 + Bump PyYAML from 4.2b1 to 5.3 + Bump certifi from 2017.4.17 to 2019.11.28 + Bump coverage from 4.5.4 to 5.0.3 + Bump paramiko from 2.6.0 to 2.7.1 + Bump cached-property from 1.3.0 to 1.5.1 + Bump minor Linux and MacOSX dependencies OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-docker-compose?expand=0&rev=27 --- docker-compose-1.25.4.tar.gz | 3 --- docker-compose-1.26.0.tar.gz | 3 +++ no-restrict-upper.patch | 25 ++++++++++++--------- python-docker-compose.changes | 42 +++++++++++++++++++++++++++++++++++ python-docker-compose.spec | 6 ++++- 5 files changed, 65 insertions(+), 14 deletions(-) delete mode 100644 docker-compose-1.25.4.tar.gz create mode 100644 docker-compose-1.26.0.tar.gz diff --git a/docker-compose-1.25.4.tar.gz b/docker-compose-1.25.4.tar.gz deleted file mode 100644 index 244e7ec..0000000 --- a/docker-compose-1.25.4.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:fabae2bee4abfa7bdd09125b6bbdcdda81f946c7b16e3ccc6bb2d821ef6488f3 -size 273838 diff --git a/docker-compose-1.26.0.tar.gz b/docker-compose-1.26.0.tar.gz new file mode 100644 index 0000000..3e11988 --- /dev/null +++ b/docker-compose-1.26.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7e836102d139aca667d6af53f0f4d942c9459ec24d6dd4f0203d74359b0fd311 +size 283124 diff --git a/no-restrict-upper.patch b/no-restrict-upper.patch index ff0598a..589f325 100644 --- a/no-restrict-upper.patch +++ b/no-restrict-upper.patch @@ -1,8 +1,8 @@ -Index: docker-compose-1.25.4/setup.py +Index: docker-compose-1.26.0/setup.py =================================================================== ---- docker-compose-1.25.4.orig/setup.py -+++ docker-compose-1.25.4/setup.py -@@ -30,35 +30,35 @@ def find_version(*file_paths): +--- docker-compose-1.26.0.orig/setup.py ++++ docker-compose-1.26.0/setup.py +@@ -30,38 +30,38 @@ def find_version(*file_paths): install_requires = [ @@ -12,25 +12,31 @@ Index: docker-compose-1.25.4/setup.py - 'requests >= 2.20.0, < 3', - 'texttable >= 0.9.0, < 2', - 'websocket-client >= 0.32.0, < 1', +- 'distro >= 1.5.0, < 2', - 'docker[ssh] >= 3.7.0, < 5', - 'dockerpty >= 0.4.1, < 1', - 'six >= 1.3.0, < 2', - 'jsonschema >= 2.5.1, < 4', +- 'python-dotenv >= 0.13.0, < 1', + 'cached-property >= 1.2.0', + 'docopt >= 0.6.1', + 'PyYAML >= 3.10', + 'requests >= 2.20.0', + 'texttable >= 0.9.0', + 'websocket-client >= 0.32.0', ++ 'distro >= 1.5.0', + 'docker[ssh] >= 3.7.0', + 'dockerpty >= 0.4.1', + 'six >= 1.3.0', + 'jsonschema >= 2.5.1', ++ 'python-dotenv >= 0.13.0', ] tests_require = [ +- 'ddt >= 1.2.2, < 2', - 'pytest < 6', ++ 'ddt >= 1.2.2', + 'pytest', ] @@ -43,17 +49,16 @@ Index: docker-compose-1.25.4/setup.py - ':python_version < "3.2"': ['subprocess32 >= 3.5.4, < 4'], - ':python_version < "3.4"': ['enum34 >= 1.0.4, < 2'], - ':python_version < "3.5"': ['backports.ssl_match_hostname >= 3.5, < 4'], -- ':python_version < "3.3"': ['backports.shutil_get_terminal_size == 1.0.0', -- 'ipaddress >= 1.0.16, < 2'], -- ':sys_platform == "win32"': ['colorama >= 0.4, < 1'], -- 'socks': ['PySocks >= 1.5.6, != 1.5.7, < 2'], + ':python_version < "3.2"': ['subprocess32 >= 3.5.4'], + ':python_version < "3.4"': ['enum34 >= 1.0.4'], + ':python_version < "3.5"': ['backports.ssl_match_hostname >= 3.5'], -+ ':python_version < "3.3"': ['backports.shutil_get_terminal_size >= 1.0.0', + ':python_version < "3.3"': ['backports.shutil_get_terminal_size == 1.0.0', +- 'ipaddress >= 1.0.16, < 2'], +- ':sys_platform == "win32"': ['colorama >= 0.4, < 1'], +- 'socks': ['PySocks >= 1.5.6, != 1.5.7, < 2'], + 'ipaddress >= 1.0.16'], + ':sys_platform == "win32"': ['colorama >= 0.4'], + 'socks': ['PySocks >= 1.5.6, != 1.5.7'], + 'tests': tests_require, } - diff --git a/python-docker-compose.changes b/python-docker-compose.changes index 049af07..59ef398 100644 --- a/python-docker-compose.changes +++ b/python-docker-compose.changes @@ -1,3 +1,45 @@ +------------------------------------------------------------------- +Tue Jun 16 06:29:10 UTC 2020 - Steve Kowalik + +- Update to 1.26.0: + * Bugs + + Properly escape values coming from env_files + + Sync compose-schemas with upstream (docker/cli) + + Remove None entries on exec command + + Add python-dotenv to delegate .env file processing + + Don't adjust output on terminal width when piped into another command + + Show an error message when version attribute is malformed + + Fix HTTPS connection when DOCKER_HOST is remote + * Bugfixes + + Fix CI script to enforce the minimal MacOS version to 10.11 + + Fix docker-compose exec for keys with no value + + Fix CI script to enforce the compilation with Python3 + + Fix binary's sha256 in the release page + + Validate version format on formats 2+ + + Assume infinite terminal width when not running in a terminal + * Features + + Add docker context support + + Add missing test dependency ddt to setup.py + + Add --attach-dependencies to command up for attaching to dependencies + + Allow compatibility option with COMPOSE_COMPATIBILITY environment variable + + Bump Pytest to 5.3.4 and add refactor compatibility with new version + + Bump OpenSSL from 1.1.1f to 1.1.1g + + Bump docker-py from 4.2.0 to 4.2.1 + + Bump OpenSSL from 1.1.1d to 1.1.1f + + Add 3.8 compose version + + Allow compatibility option with COMPOSE_COMPATIBILITY environment variable + + Bump PyInstaller from 3.5 to 3.6 + + Bump pysocks from 1.6.7 to 1.7.1 + + Bump websocket-client from 0.32.0 to 0.57.0 + + Bump urllib3 from 1.24.2 to 1.25.7 + + Bump jsonschema from 3.0.1 to 3.2.0 + + Bump PyYAML from 4.2b1 to 5.3 + + Bump certifi from 2017.4.17 to 2019.11.28 + + Bump coverage from 4.5.4 to 5.0.3 + + Bump paramiko from 2.6.0 to 2.7.1 + + Bump cached-property from 1.3.0 to 1.5.1 + + Bump minor Linux and MacOSX dependencies + ------------------------------------------------------------------- Tue May 26 07:22:43 UTC 2020 - Petr Gajdos diff --git a/python-docker-compose.spec b/python-docker-compose.spec index 4d72355..7ec28da 100644 --- a/python-docker-compose.spec +++ b/python-docker-compose.spec @@ -19,7 +19,7 @@ %{?!python_module:%define python_module() python-%{**} python3-%{**}} %bcond_without python2 Name: python-docker-compose -Version: 1.25.4 +Version: 1.26.0 Release: 0 Summary: Tool to define and run complex applications using Docker License: Apache-2.0 @@ -30,11 +30,13 @@ Patch0: no-restrict-upper.patch BuildRequires: %{python_module PyYAML >= 3.10} BuildRequires: %{python_module cached-property >= 1.2.0} BuildRequires: %{python_module ddt >= 1.2.2} +BuildRequires: %{python_module distro >= 1.5.0} BuildRequires: %{python_module docker >= 3.7.0} BuildRequires: %{python_module dockerpty >= 0.4.1} BuildRequires: %{python_module docopt >= 0.6.1} BuildRequires: %{python_module jsonschema >= 2.6} BuildRequires: %{python_module pytest} +BuildRequires: %{python_module python-dotenv >= 0.13.0} BuildRequires: %{python_module setuptools} BuildRequires: %{python_module six >= 1.3.0} BuildRequires: %{python_module texttable >= 0.9.1} @@ -46,12 +48,14 @@ Requires: python-PySocks >= 1.5.6 Requires: python-PyYAML >= 3.10 Requires: python-cached-property >= 1.3.0 Requires: python-chardet >= 3.0.4 +Requires: python-distro >= 1.5.0 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-idna >= 2.5 Requires: python-jsonschema >= 2.6.0 +Requires: python-python-dotenv >= 0.13.0 Requires: python-requests >= 2.20.0 Requires: python-six >= 1.3.0 Requires: python-texttable >= 0.9.1