commit: 0dff3c31f19740553c5a8f8675e11853bd398496 Author: Sebastian Pipping <sping <AT> gentoo <DOT> org> AuthorDate: Thu Nov 28 20:53:26 2019 +0000 Commit: Sebastian Pipping <sping <AT> gentoo <DOT> org> CommitDate: Thu Nov 28 20:55:17 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0dff3c31
app-emulation/docker-compose: Fix 1.25.0 for py27 Closes: https://bugs.gentoo.org/701394 Signed-off-by: Sebastian Pipping <sping <AT> gentoo.org> Package-Manager: Portage-2.3.78, Repoman-2.3.16 ...se-1.25.0.ebuild => docker-compose-1.25.0-r1.ebuild} | 4 +++- .../files/docker-compose-1.25.0-setup-py.patch | 17 +++++++++-------- 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/app-emulation/docker-compose/docker-compose-1.25.0.ebuild b/app-emulation/docker-compose/docker-compose-1.25.0-r1.ebuild similarity index 90% rename from app-emulation/docker-compose/docker-compose-1.25.0.ebuild rename to app-emulation/docker-compose/docker-compose-1.25.0-r1.ebuild index b90ebe18f8e..a6f8868eab7 100644 --- a/app-emulation/docker-compose/docker-compose-1.25.0.ebuild +++ b/app-emulation/docker-compose/docker-compose-1.25.0-r1.ebuild @@ -30,9 +30,11 @@ RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}] >=dev-python/six-1.3.0[${PYTHON_USEDEP}] >=dev-python/texttable-0.9.0[${PYTHON_USEDEP}] >=dev-python/websocket-client-0.32.0[${PYTHON_USEDEP}] + $(python_gen_cond_dep '>=dev-python/backports-shutil_get_terminal_size-1.0.0[${PYTHON_USEDEP}]' 'python2_7' ) + $(python_gen_cond_dep '>=dev-python/backports-ssl-match-hostname-3.5[${PYTHON_USEDEP}]' 'python2_7' ) $(python_gen_cond_dep '>=dev-python/enum34-1.0.4[${PYTHON_USEDEP}]' 'python2_7' ) $(python_gen_cond_dep '>=dev-python/ipaddress-1.0.16[${PYTHON_USEDEP}]' 'python2_7' ) - $(python_gen_cond_dep '>=dev-python/backports-ssl-match-hostname-3.5[${PYTHON_USEDEP}]' 'python2_7' )" + $(python_gen_cond_dep '>=dev-python/subprocess32-3.5.4[${PYTHON_USEDEP}]' 'python2_7' )" DEPEND="${RDEPEND} test? ( <dev-python/pytest-4[${PYTHON_USEDEP}] diff --git a/app-emulation/docker-compose/files/docker-compose-1.25.0-setup-py.patch b/app-emulation/docker-compose/files/docker-compose-1.25.0-setup-py.patch index 029dc54bb8f..a56ad638198 100644 --- a/app-emulation/docker-compose/files/docker-compose-1.25.0-setup-py.patch +++ b/app-emulation/docker-compose/files/docker-compose-1.25.0-setup-py.patch @@ -1,14 +1,14 @@ -From 8f2924d4146ddb1131e98efbee13a68b5445b7f8 Mon Sep 17 00:00:00 2001 +From bd58c42fd01829e0dbf475179710e5465655f4b1 Mon Sep 17 00:00:00 2001 From: Sebastian Pipping <[email protected]> Date: Mon, 18 Nov 2019 23:34:51 +0100 Subject: [PATCH] setup.py: Drop generic upper version boundaries --- - setup.py | 36 ++++++++++++++++++------------------ - 1 file changed, 18 insertions(+), 18 deletions(-) + setup.py | 38 +++++++++++++++++++------------------- + 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/setup.py b/setup.py -index 23ae08a..97a8fbe 100644 +index 23ae08a..3f6a46f 100644 --- a/setup.py +++ b/setup.py @@ -30,35 +30,35 @@ def find_version(*file_paths): @@ -52,13 +52,14 @@ index 23ae08a..97a8fbe 100644 - ':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.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'], ++ ':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', + 'ipaddress >= 1.0.16'], + ':sys_platform == "win32"': ['colorama >= 0.4'], + 'socks': ['PySocks >= 1.5.6, != 1.5.7'],
