commit: 7e40b7e42500b6d96ece1ed217234f67e101432b
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 3 20:41:49 2020 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> 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 <mgorny <AT> 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/pytest-4[${PYTHON_USEDEP}]
- <dev-python/pyyaml-5.1[${PYTHON_USEDEP}]
- $(python_gen_cond_dep '>=dev-python/mock-1.0.1[${PYTHON_USEDEP}]'
'python2_7' ) )"
+ <dev-python/pyyaml-5.1[${PYTHON_USEDEP}] )"
S="${WORKDIR}/compose-${PV}"
diff --git a/app-emulation/docker-compose/docker-compose-1.24.1.ebuild
b/app-emulation/docker-compose/docker-compose-1.24.1.ebuild
index 12ac42d6a19..b310d81c22b 100644
--- a/app-emulation/docker-compose/docker-compose-1.24.1.ebuild
+++ b/app-emulation/docker-compose/docker-compose-1.24.1.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/pytest-4[${PYTHON_USEDEP}]
- <dev-python/pyyaml-5.1[${PYTHON_USEDEP}]
- $(python_gen_cond_dep '>=dev-python/mock-1.0.1[${PYTHON_USEDEP}]'
'python2_7' ) )"
+ <dev-python/pyyaml-5.1[${PYTHON_USEDEP}] )"
S="${WORKDIR}/compose-${PV}"
diff --git a/app-emulation/docker-compose/docker-compose-1.25.0-r1.ebuild
b/app-emulation/docker-compose/docker-compose-1.25.0-r1.ebuild
index a6f8868eab7..ae28e4a89c3 100644
--- a/app-emulation/docker-compose/docker-compose-1.25.0-r1.ebuild
+++ b/app-emulation/docker-compose/docker-compose-1.25.0-r1.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,17 +29,11 @@ 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/pytest-4[${PYTHON_USEDEP}]
- <dev-python/pyyaml-5.1[${PYTHON_USEDEP}]
- $(python_gen_cond_dep '>=dev-python/mock-1.0.1[${PYTHON_USEDEP}]'
'python2_7' ) )"
+ <dev-python/pyyaml-5.1[${PYTHON_USEDEP}] )"
S="${WORKDIR}/compose-${PV}"
diff --git a/app-emulation/docker-compose/docker-compose-1.25.1.ebuild
b/app-emulation/docker-compose/docker-compose-1.25.1.ebuild
index 2c7c3fe978b..014701ba9c8 100644
--- a/app-emulation/docker-compose/docker-compose-1.25.1.ebuild
+++ b/app-emulation/docker-compose/docker-compose-1.25.1.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,17 +29,11 @@ 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/pytest-4[${PYTHON_USEDEP}]
- <dev-python/pyyaml-5.1[${PYTHON_USEDEP}]
- $(python_gen_cond_dep '>=dev-python/mock-1.0.1[${PYTHON_USEDEP}]'
'python2_7' ) )"
+ <dev-python/pyyaml-5.1[${PYTHON_USEDEP}] )"
S="${WORKDIR}/compose-${PV}"
diff --git a/app-emulation/docker-compose/docker-compose-1.25.2.ebuild
b/app-emulation/docker-compose/docker-compose-1.25.2.ebuild
index 7bdd266df6a..08fd06065ee 100644
--- a/app-emulation/docker-compose/docker-compose-1.25.2.ebuild
+++ b/app-emulation/docker-compose/docker-compose-1.25.2.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/pytest-4[${PYTHON_USEDEP}]
dev-python/ddt[${PYTHON_USEDEP}]
- $(python_gen_cond_dep
'>=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/pytest-4[${PYTHON_USEDEP}]
dev-python/ddt[${PYTHON_USEDEP}]
- $(python_gen_cond_dep
'>=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/pytest-4[${PYTHON_USEDEP}]
dev-python/ddt[${PYTHON_USEDEP}]
- $(python_gen_cond_dep
'>=dev-python/mock-1.0.1[${PYTHON_USEDEP}]' 'python2_7' )
)"
S="${WORKDIR}/compose-${PV}"
