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 8A0F0138350 for ; Mon, 3 Feb 2020 20:46:19 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id BB7FEE0874; Mon, 3 Feb 2020 20:46:15 +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 84F15E0874 for ; Mon, 3 Feb 2020 20:46:15 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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 C062A34E660 for ; Mon, 3 Feb 2020 20:46:13 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id C4A66132 for ; Mon, 3 Feb 2020 20:46:10 +0000 (UTC) From: "Michał Górny" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michał Górny" Message-ID: <1580762760.7e40b7e42500b6d96ece1ed217234f67e101432b.mgorny@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-emulation/docker-compose/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-emulation/docker-compose/docker-compose-1.24.0.ebuild app-emulation/docker-compose/docker-compose-1.24.1.ebuild app-emulation/docker-compose/docker-compose-1.25.0-r1.ebuild app-emulation/docker-compose/docker-compose-1.25.1.ebuild app-emulation/docker-compose/docker-compose-1.25.2.ebuild app-emulation/docker-compose/docker-compose-1.25.3.ebuild app-emulation/docker-compose/docker-compose-1.25.4.ebuild X-VCS-Directories: app-emulation/docker-compose/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: 7e40b7e42500b6d96ece1ed217234f67e101432b X-VCS-Branch: master Date: Mon, 3 Feb 2020 20:46:10 +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: 3cd4a197-03b1-4a37-a27a-2a487ffff0f3 X-Archives-Hash: 4502ee72048a168d80b18433402493f8 commit: 7e40b7e42500b6d96ece1ed217234f67e101432b Author: Michał Górny gentoo org> AuthorDate: Mon Feb 3 20:41:49 2020 +0000 Commit: Michał Górny gentoo org> CommitDate: Mon Feb 3 20:46:00 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7e40b7e4 app-emulation/docker-compose: Remove py2 Signed-off-by: Michał Górny gentoo.org> app-emulation/docker-compose/docker-compose-1.24.0.ebuild | 10 +++------- app-emulation/docker-compose/docker-compose-1.24.1.ebuild | 10 +++------- app-emulation/docker-compose/docker-compose-1.25.0-r1.ebuild | 12 +++--------- app-emulation/docker-compose/docker-compose-1.25.1.ebuild | 12 +++--------- app-emulation/docker-compose/docker-compose-1.25.2.ebuild | 10 ++-------- app-emulation/docker-compose/docker-compose-1.25.3.ebuild | 10 ++-------- app-emulation/docker-compose/docker-compose-1.25.4.ebuild | 10 ++-------- 7 files changed, 18 insertions(+), 56 deletions(-) diff --git a/app-emulation/docker-compose/docker-compose-1.24.0.ebuild b/app-emulation/docker-compose/docker-compose-1.24.0.ebuild index 231ec1bd9f1..3e0bfb04269 100644 --- a/app-emulation/docker-compose/docker-compose-1.24.0.ebuild +++ b/app-emulation/docker-compose/docker-compose-1.24.0.ebuild @@ -3,7 +3,7 @@ EAPI=7 -PYTHON_COMPAT=( python{2_7,3_6} ) +PYTHON_COMPAT=( python3_6 ) inherit bash-completion-r1 distutils-r1 @@ -29,15 +29,11 @@ RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}] >=dev-python/requests-2.18.1[${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/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' )" + >=dev-python/websocket-client-0.32.0[${PYTHON_USEDEP}]" DEPEND="${RDEPEND} test? ( =dev-python/mock-1.0.1[${PYTHON_USEDEP}]' 'python2_7' ) )" + =dev-python/websocket-client-0.32.0[${PYTHON_USEDEP}]" DEPEND="${RDEPEND} test? ( =dev-python/mock-1.0.1[${PYTHON_USEDEP}]' 'python2_7' ) )" + =dev-python/websocket-client-0.32.0[${PYTHON_USEDEP}]" DEPEND="${RDEPEND} test? ( =dev-python/mock-1.0.1[${PYTHON_USEDEP}]' 'python2_7' ) )" + =dev-python/websocket-client-0.32.0[${PYTHON_USEDEP}]" DEPEND="${RDEPEND} test? ( =dev-python/mock-1.0.1[${PYTHON_USEDEP}]' 'python2_7' ) )" + =dev-python/websocket-client-0.32.0[${PYTHON_USEDEP}]" DEPEND="${RDEPEND} test? ( =dev-python/mock-1.0.1[${PYTHON_USEDEP}]' 'python2_7' ) )" S="${WORKDIR}/compose-${PV}" diff --git a/app-emulation/docker-compose/docker-compose-1.25.3.ebuild b/app-emulation/docker-compose/docker-compose-1.25.3.ebuild index fa7ef8bfb51..90f18a6ef86 100644 --- a/app-emulation/docker-compose/docker-compose-1.25.3.ebuild +++ b/app-emulation/docker-compose/docker-compose-1.25.3.ebuild @@ -3,7 +3,7 @@ EAPI=7 -PYTHON_COMPAT=( python{2_7,3_6} ) +PYTHON_COMPAT=( python3_6 ) inherit bash-completion-r1 distutils-r1 @@ -29,18 +29,12 @@ RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}] >=dev-python/requests-2.20.0[${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/subprocess32-3.5.4[${PYTHON_USEDEP}]' 'python2_7' )" + >=dev-python/websocket-client-0.32.0[${PYTHON_USEDEP}]" DEPEND="${RDEPEND} test? ( =dev-python/mock-1.0.1[${PYTHON_USEDEP}]' 'python2_7' ) )" S="${WORKDIR}/compose-${PV}" diff --git a/app-emulation/docker-compose/docker-compose-1.25.4.ebuild b/app-emulation/docker-compose/docker-compose-1.25.4.ebuild index c7b13e93e7a..7fd5d941ab5 100644 --- a/app-emulation/docker-compose/docker-compose-1.25.4.ebuild +++ b/app-emulation/docker-compose/docker-compose-1.25.4.ebuild @@ -3,7 +3,7 @@ EAPI=7 -PYTHON_COMPAT=( python{2_7,3_6} ) +PYTHON_COMPAT=( python3_6 ) DISTUTILS_USE_SETUPTOOLS=rdepend inherit bash-completion-r1 distutils-r1 @@ -30,18 +30,12 @@ RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}] >=dev-python/requests-2.20.0[${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/subprocess32-3.5.4[${PYTHON_USEDEP}]' 'python2_7' )" + >=dev-python/websocket-client-0.32.0[${PYTHON_USEDEP}]" DEPEND="${RDEPEND} test? ( =dev-python/mock-1.0.1[${PYTHON_USEDEP}]' 'python2_7' ) )" S="${WORKDIR}/compose-${PV}"