From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id B67E0138334 for ; Thu, 28 Nov 2019 20:56:37 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id DDEC2E087B; Thu, 28 Nov 2019 20:56:36 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id B55D4E087B for ; Thu, 28 Nov 2019 20:56:36 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 6002834D543 for ; Thu, 28 Nov 2019 20:56:35 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id B71058B8 for ; Thu, 28 Nov 2019 20:56:32 +0000 (UTC) From: "Sebastian Pipping" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sebastian Pipping" Message-ID: <1574974517.0dff3c31f19740553c5a8f8675e11853bd398496.sping@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-emulation/docker-compose/files/, app-emulation/docker-compose/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-emulation/docker-compose/docker-compose-1.25.0-r1.ebuild app-emulation/docker-compose/docker-compose-1.25.0.ebuild app-emulation/docker-compose/files/docker-compose-1.25.0-setup-py.patch X-VCS-Directories: app-emulation/docker-compose/files/ app-emulation/docker-compose/ X-VCS-Committer: sping X-VCS-Committer-Name: Sebastian Pipping X-VCS-Revision: 0dff3c31f19740553c5a8f8675e11853bd398496 X-VCS-Branch: master Date: Thu, 28 Nov 2019 20:56:32 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: f691d2c1-4773-4430-9607-e9fc39845561 X-Archives-Hash: 4563aa372bd28f608e1e72154ddb6fea commit: 0dff3c31f19740553c5a8f8675e11853bd398496 Author: Sebastian Pipping gentoo org> AuthorDate: Thu Nov 28 20:53:26 2019 +0000 Commit: Sebastian Pipping gentoo 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 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? ( 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'],