[gentoo-commits] repo/gentoo:master commit in: app-emulation/docker-compose/ - gentoo-commits

From:	"Michał Górny" <mgorny@g.o>
To:	gentoo-commits@l.g.o
Subject:	[gentoo-commits] repo/gentoo:master commit in: app-emulation/docker-compose/
Date:	Mon, 03 Feb 2020 20:46:19
Message-Id:	`1580762760.7e40b7e42500b6d96ece1ed217234f67e101432b.mgorny@gentoo`

1

commit:     7e40b7e42500b6d96ece1ed217234f67e101432b

2

Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>

3

AuthorDate: Mon Feb  3 20:41:49 2020 +0000

4

Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>

5

CommitDate: Mon Feb  3 20:46:00 2020 +0000

6

URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7e40b7e4

7

8

app-emulation/docker-compose: Remove py2

9

10

Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

11

12

 app-emulation/docker-compose/docker-compose-1.24.0.ebuild    | 10 +++-------

13

 app-emulation/docker-compose/docker-compose-1.24.1.ebuild    | 10 +++-------

14

 app-emulation/docker-compose/docker-compose-1.25.0-r1.ebuild | 12 +++---------

15

 app-emulation/docker-compose/docker-compose-1.25.1.ebuild    | 12 +++---------

16

 app-emulation/docker-compose/docker-compose-1.25.2.ebuild    | 10 ++--------

17

 app-emulation/docker-compose/docker-compose-1.25.3.ebuild    | 10 ++--------

18

 app-emulation/docker-compose/docker-compose-1.25.4.ebuild    | 10 ++--------

19

 7 files changed, 18 insertions(+), 56 deletions(-)

20

21

diff --git a/app-emulation/docker-compose/docker-compose-1.24.0.ebuild b/app-emulation/docker-compose/docker-compose-1.24.0.ebuild

22

index 231ec1bd9f1..3e0bfb04269 100644

23

--- a/app-emulation/docker-compose/docker-compose-1.24.0.ebuild

24

+++ b/app-emulation/docker-compose/docker-compose-1.24.0.ebuild

25

@@ -3,7 +3,7 @@

26

27

 EAPI=7

28

29

-PYTHON_COMPAT=( python{2_7,3_6} )

30

+PYTHON_COMPAT=( python3_6 )

31

32

 inherit bash-completion-r1 distutils-r1

33

34

@@ -29,15 +29,11 @@ RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]

35

 	>=dev-python/requests-2.18.1[${PYTHON_USEDEP}]

36

 	>=dev-python/six-1.3.0[${PYTHON_USEDEP}]

37

 	>=dev-python/texttable-0.9.0[${PYTHON_USEDEP}]

38

-	>=dev-python/websocket-client-0.32.0[${PYTHON_USEDEP}]

39

-	$(python_gen_cond_dep '>=dev-python/enum34-1.0.4[${PYTHON_USEDEP}]' 'python2_7' )

40

-	$(python_gen_cond_dep '>=dev-python/ipaddress-1.0.16[${PYTHON_USEDEP}]' 'python2_7' )

41

-	$(python_gen_cond_dep '>=dev-python/backports-ssl-match-hostname-3.5[${PYTHON_USEDEP}]' 'python2_7' )"

42

+	>=dev-python/websocket-client-0.32.0[${PYTHON_USEDEP}]"

43

44

 DEPEND="${RDEPEND}

45

 	test? ( <dev-python/pytest-4[${PYTHON_USEDEP}]

46

-	<dev-python/pyyaml-5.1[${PYTHON_USEDEP}]

47

-	$(python_gen_cond_dep '>=dev-python/mock-1.0.1[${PYTHON_USEDEP}]' 'python2_7' ) )"

48

+		<dev-python/pyyaml-5.1[${PYTHON_USEDEP}] )"

49

50

 S="${WORKDIR}/compose-${PV}"

51

52

53

diff --git a/app-emulation/docker-compose/docker-compose-1.24.1.ebuild b/app-emulation/docker-compose/docker-compose-1.24.1.ebuild

54

index 12ac42d6a19..b310d81c22b 100644

55

--- a/app-emulation/docker-compose/docker-compose-1.24.1.ebuild

56

+++ b/app-emulation/docker-compose/docker-compose-1.24.1.ebuild

57

@@ -3,7 +3,7 @@

58

59

 EAPI=7

60

61

-PYTHON_COMPAT=( python{2_7,3_6} )

62

+PYTHON_COMPAT=( python3_6 )

63

64

 inherit bash-completion-r1 distutils-r1

65

66

@@ -29,15 +29,11 @@ RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]

67

 	>=dev-python/requests-2.18.1[${PYTHON_USEDEP}]

68

 	>=dev-python/six-1.3.0[${PYTHON_USEDEP}]

69

 	>=dev-python/texttable-0.9.0[${PYTHON_USEDEP}]

70

-	>=dev-python/websocket-client-0.32.0[${PYTHON_USEDEP}]

71

-	$(python_gen_cond_dep '>=dev-python/enum34-1.0.4[${PYTHON_USEDEP}]' 'python2_7' )

72

-	$(python_gen_cond_dep '>=dev-python/ipaddress-1.0.16[${PYTHON_USEDEP}]' 'python2_7' )

73

-	$(python_gen_cond_dep '>=dev-python/backports-ssl-match-hostname-3.5[${PYTHON_USEDEP}]' 'python2_7' )"

74

+	>=dev-python/websocket-client-0.32.0[${PYTHON_USEDEP}]"

75

76

 DEPEND="${RDEPEND}

77

 	test? ( <dev-python/pytest-4[${PYTHON_USEDEP}]

78

-	<dev-python/pyyaml-5.1[${PYTHON_USEDEP}]

79

-	$(python_gen_cond_dep '>=dev-python/mock-1.0.1[${PYTHON_USEDEP}]' 'python2_7' ) )"

80

+		<dev-python/pyyaml-5.1[${PYTHON_USEDEP}] )"

81

82

 S="${WORKDIR}/compose-${PV}"

83

84

85

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

86

index a6f8868eab7..ae28e4a89c3 100644

87

--- a/app-emulation/docker-compose/docker-compose-1.25.0-r1.ebuild

88

+++ b/app-emulation/docker-compose/docker-compose-1.25.0-r1.ebuild

89

@@ -3,7 +3,7 @@

90

91

 EAPI=7

92

93

-PYTHON_COMPAT=( python{2_7,3_6} )

94

+PYTHON_COMPAT=( python3_6 )

95

96

 inherit bash-completion-r1 distutils-r1

97

98

@@ -29,17 +29,11 @@ RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]

99

 	>=dev-python/requests-2.20.0[${PYTHON_USEDEP}]

100

 	>=dev-python/six-1.3.0[${PYTHON_USEDEP}]

101

 	>=dev-python/texttable-0.9.0[${PYTHON_USEDEP}]

102

-	>=dev-python/websocket-client-0.32.0[${PYTHON_USEDEP}]

103

-	$(python_gen_cond_dep '>=dev-python/backports-shutil_get_terminal_size-1.0.0[${PYTHON_USEDEP}]' 'python2_7' )

104

-	$(python_gen_cond_dep '>=dev-python/backports-ssl-match-hostname-3.5[${PYTHON_USEDEP}]' 'python2_7' )

105

-	$(python_gen_cond_dep '>=dev-python/enum34-1.0.4[${PYTHON_USEDEP}]' 'python2_7' )

106

-	$(python_gen_cond_dep '>=dev-python/ipaddress-1.0.16[${PYTHON_USEDEP}]' 'python2_7' )

107

-	$(python_gen_cond_dep '>=dev-python/subprocess32-3.5.4[${PYTHON_USEDEP}]' 'python2_7' )"

108

+	>=dev-python/websocket-client-0.32.0[${PYTHON_USEDEP}]"

109

110

 DEPEND="${RDEPEND}

111

 	test? ( <dev-python/pytest-4[${PYTHON_USEDEP}]

112

-	<dev-python/pyyaml-5.1[${PYTHON_USEDEP}]

113

-	$(python_gen_cond_dep '>=dev-python/mock-1.0.1[${PYTHON_USEDEP}]' 'python2_7' ) )"

114

+		<dev-python/pyyaml-5.1[${PYTHON_USEDEP}] )"

115

116

 S="${WORKDIR}/compose-${PV}"

117

118

119

diff --git a/app-emulation/docker-compose/docker-compose-1.25.1.ebuild b/app-emulation/docker-compose/docker-compose-1.25.1.ebuild

120

index 2c7c3fe978b..014701ba9c8 100644

121

--- a/app-emulation/docker-compose/docker-compose-1.25.1.ebuild

122

+++ b/app-emulation/docker-compose/docker-compose-1.25.1.ebuild

123

@@ -3,7 +3,7 @@

124

125

 EAPI=7

126

127

-PYTHON_COMPAT=( python{2_7,3_6} )

128

+PYTHON_COMPAT=( python3_6 )

129

130

 inherit bash-completion-r1 distutils-r1

131

132

@@ -29,17 +29,11 @@ RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]

133

 	>=dev-python/requests-2.20.0[${PYTHON_USEDEP}]

134

 	>=dev-python/six-1.3.0[${PYTHON_USEDEP}]

135

 	>=dev-python/texttable-0.9.0[${PYTHON_USEDEP}]

136

-	>=dev-python/websocket-client-0.32.0[${PYTHON_USEDEP}]

137

-	$(python_gen_cond_dep '>=dev-python/backports-shutil_get_terminal_size-1.0.0[${PYTHON_USEDEP}]' 'python2_7' )

138

-	$(python_gen_cond_dep '>=dev-python/backports-ssl-match-hostname-3.5[${PYTHON_USEDEP}]' 'python2_7' )

139

-	$(python_gen_cond_dep '>=dev-python/enum34-1.0.4[${PYTHON_USEDEP}]' 'python2_7' )

140

-	$(python_gen_cond_dep '>=dev-python/ipaddress-1.0.16[${PYTHON_USEDEP}]' 'python2_7' )

141

-	$(python_gen_cond_dep '>=dev-python/subprocess32-3.5.4[${PYTHON_USEDEP}]' 'python2_7' )"

142

+	>=dev-python/websocket-client-0.32.0[${PYTHON_USEDEP}]"

143

144

 DEPEND="${RDEPEND}

145

 	test? ( <dev-python/pytest-4[${PYTHON_USEDEP}]

146

-	<dev-python/pyyaml-5.1[${PYTHON_USEDEP}]

147

-	$(python_gen_cond_dep '>=dev-python/mock-1.0.1[${PYTHON_USEDEP}]' 'python2_7' ) )"

148

+		<dev-python/pyyaml-5.1[${PYTHON_USEDEP}] )"

149

150

 S="${WORKDIR}/compose-${PV}"

151

152

153

diff --git a/app-emulation/docker-compose/docker-compose-1.25.2.ebuild b/app-emulation/docker-compose/docker-compose-1.25.2.ebuild

154

index 7bdd266df6a..08fd06065ee 100644

155

--- a/app-emulation/docker-compose/docker-compose-1.25.2.ebuild

156

+++ b/app-emulation/docker-compose/docker-compose-1.25.2.ebuild

157

@@ -3,7 +3,7 @@

158

159

 EAPI=7

160

161

-PYTHON_COMPAT=( python{2_7,3_6} )

162

+PYTHON_COMPAT=( python3_6 )

163

164

 inherit bash-completion-r1 distutils-r1

165

166

@@ -29,18 +29,12 @@ RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]

167

 	>=dev-python/requests-2.20.0[${PYTHON_USEDEP}]

168

 	>=dev-python/six-1.3.0[${PYTHON_USEDEP}]

169

 	>=dev-python/texttable-0.9.0[${PYTHON_USEDEP}]

170

-	>=dev-python/websocket-client-0.32.0[${PYTHON_USEDEP}]

171

-	$(python_gen_cond_dep '>=dev-python/backports-shutil_get_terminal_size-1.0.0[${PYTHON_USEDEP}]' 'python2_7' )

172

-	$(python_gen_cond_dep '>=dev-python/backports-ssl-match-hostname-3.5[${PYTHON_USEDEP}]' 'python2_7' )

173

-	$(python_gen_cond_dep '>=dev-python/enum34-1.0.4[${PYTHON_USEDEP}]' 'python2_7' )

174

-	$(python_gen_cond_dep '>=dev-python/ipaddress-1.0.16[${PYTHON_USEDEP}]' 'python2_7' )

175

-	$(python_gen_cond_dep '>=dev-python/subprocess32-3.5.4[${PYTHON_USEDEP}]' 'python2_7' )"

176

+	>=dev-python/websocket-client-0.32.0[${PYTHON_USEDEP}]"

177

178

 DEPEND="${RDEPEND}

179

 	test? (

180

 		<dev-python/pytest-4[${PYTHON_USEDEP}]

181

 		dev-python/ddt[${PYTHON_USEDEP}]

182

-		$(python_gen_cond_dep '>=dev-python/mock-1.0.1[${PYTHON_USEDEP}]' 'python2_7' )

183

)"

184

185

 S="${WORKDIR}/compose-${PV}"

186

187

diff --git a/app-emulation/docker-compose/docker-compose-1.25.3.ebuild b/app-emulation/docker-compose/docker-compose-1.25.3.ebuild

188

index fa7ef8bfb51..90f18a6ef86 100644

189

--- a/app-emulation/docker-compose/docker-compose-1.25.3.ebuild

190

+++ b/app-emulation/docker-compose/docker-compose-1.25.3.ebuild

191

@@ -3,7 +3,7 @@

192

193

 EAPI=7

194

195

-PYTHON_COMPAT=( python{2_7,3_6} )

196

+PYTHON_COMPAT=( python3_6 )

197

198

 inherit bash-completion-r1 distutils-r1

199

200

@@ -29,18 +29,12 @@ RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]

201

 	>=dev-python/requests-2.20.0[${PYTHON_USEDEP}]

202

 	>=dev-python/six-1.3.0[${PYTHON_USEDEP}]

203

 	>=dev-python/texttable-0.9.0[${PYTHON_USEDEP}]

204

-	>=dev-python/websocket-client-0.32.0[${PYTHON_USEDEP}]

205

-	$(python_gen_cond_dep '>=dev-python/backports-shutil_get_terminal_size-1.0.0[${PYTHON_USEDEP}]' 'python2_7' )

206

-	$(python_gen_cond_dep '>=dev-python/backports-ssl-match-hostname-3.5[${PYTHON_USEDEP}]' 'python2_7' )

207

-	$(python_gen_cond_dep '>=dev-python/enum34-1.0.4[${PYTHON_USEDEP}]' 'python2_7' )

208

-	$(python_gen_cond_dep '>=dev-python/ipaddress-1.0.16[${PYTHON_USEDEP}]' 'python2_7' )

209

-	$(python_gen_cond_dep '>=dev-python/subprocess32-3.5.4[${PYTHON_USEDEP}]' 'python2_7' )"

210

+	>=dev-python/websocket-client-0.32.0[${PYTHON_USEDEP}]"

211

212

 DEPEND="${RDEPEND}

213

 	test? (

214

 		<dev-python/pytest-4[${PYTHON_USEDEP}]

215

 		dev-python/ddt[${PYTHON_USEDEP}]

216

-		$(python_gen_cond_dep '>=dev-python/mock-1.0.1[${PYTHON_USEDEP}]' 'python2_7' )

217

)"

218

219

 S="${WORKDIR}/compose-${PV}"

220

221

diff --git a/app-emulation/docker-compose/docker-compose-1.25.4.ebuild b/app-emulation/docker-compose/docker-compose-1.25.4.ebuild

222

index c7b13e93e7a..7fd5d941ab5 100644

223

--- a/app-emulation/docker-compose/docker-compose-1.25.4.ebuild

224

+++ b/app-emulation/docker-compose/docker-compose-1.25.4.ebuild

225

@@ -3,7 +3,7 @@

226

227

 EAPI=7

228

229

-PYTHON_COMPAT=( python{2_7,3_6} )

230

+PYTHON_COMPAT=( python3_6 )

231

 DISTUTILS_USE_SETUPTOOLS=rdepend

232

233

 inherit bash-completion-r1 distutils-r1

234

@@ -30,18 +30,12 @@ RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]

235

 	>=dev-python/requests-2.20.0[${PYTHON_USEDEP}]

236

 	>=dev-python/six-1.3.0[${PYTHON_USEDEP}]

237

 	>=dev-python/texttable-0.9.0[${PYTHON_USEDEP}]

238

-	>=dev-python/websocket-client-0.32.0[${PYTHON_USEDEP}]

239

-	$(python_gen_cond_dep '>=dev-python/backports-shutil_get_terminal_size-1.0.0[${PYTHON_USEDEP}]' 'python2_7' )

240

-	$(python_gen_cond_dep '>=dev-python/backports-ssl-match-hostname-3.5[${PYTHON_USEDEP}]' 'python2_7' )

241

-	$(python_gen_cond_dep '>=dev-python/enum34-1.0.4[${PYTHON_USEDEP}]' 'python2_7' )

242

-	$(python_gen_cond_dep '>=dev-python/ipaddress-1.0.16[${PYTHON_USEDEP}]' 'python2_7' )

243

-	$(python_gen_cond_dep '>=dev-python/subprocess32-3.5.4[${PYTHON_USEDEP}]' 'python2_7' )"

244

+	>=dev-python/websocket-client-0.32.0[${PYTHON_USEDEP}]"

245

246

 DEPEND="${RDEPEND}

247

 	test? (

248

 		<dev-python/pytest-4[${PYTHON_USEDEP}]

249

 		dev-python/ddt[${PYTHON_USEDEP}]

250

-		$(python_gen_cond_dep '>=dev-python/mock-1.0.1[${PYTHON_USEDEP}]' 'python2_7' )

251

)"

252

253

 S="${WORKDIR}/compose-${PV}"

1	commit: 7e40b7e42500b6d96ece1ed217234f67e101432b
2	Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3	AuthorDate: Mon Feb 3 20:41:49 2020 +0000
4	Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5	CommitDate: Mon Feb 3 20:46:00 2020 +0000
6	URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7e40b7e4
7
8	app-emulation/docker-compose: Remove py2
9
10	Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
11
12	app-emulation/docker-compose/docker-compose-1.24.0.ebuild \| 10 +++-------
13	app-emulation/docker-compose/docker-compose-1.24.1.ebuild \| 10 +++-------
14	app-emulation/docker-compose/docker-compose-1.25.0-r1.ebuild \| 12 +++---------
15	app-emulation/docker-compose/docker-compose-1.25.1.ebuild \| 12 +++---------
16	app-emulation/docker-compose/docker-compose-1.25.2.ebuild \| 10 ++--------
17	app-emulation/docker-compose/docker-compose-1.25.3.ebuild \| 10 ++--------
18	app-emulation/docker-compose/docker-compose-1.25.4.ebuild \| 10 ++--------
19	7 files changed, 18 insertions(+), 56 deletions(-)
20
21	diff --git a/app-emulation/docker-compose/docker-compose-1.24.0.ebuild b/app-emulation/docker-compose/docker-compose-1.24.0.ebuild
22	index 231ec1bd9f1..3e0bfb04269 100644
23	--- a/app-emulation/docker-compose/docker-compose-1.24.0.ebuild
24	+++ b/app-emulation/docker-compose/docker-compose-1.24.0.ebuild
25	@@ -3,7 +3,7 @@
26
27	EAPI=7
28
29	-PYTHON_COMPAT=( python{2_7,3_6} )
30	+PYTHON_COMPAT=( python3_6 )
31
32	inherit bash-completion-r1 distutils-r1
33
34	@@ -29,15 +29,11 @@ RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
35	>=dev-python/requests-2.18.1[${PYTHON_USEDEP}]
36	>=dev-python/six-1.3.0[${PYTHON_USEDEP}]
37	>=dev-python/texttable-0.9.0[${PYTHON_USEDEP}]
38	- >=dev-python/websocket-client-0.32.0[${PYTHON_USEDEP}]
39	- $(python_gen_cond_dep '>=dev-python/enum34-1.0.4[${PYTHON_USEDEP}]' 'python2_7' )
40	- $(python_gen_cond_dep '>=dev-python/ipaddress-1.0.16[${PYTHON_USEDEP}]' 'python2_7' )
41	- $(python_gen_cond_dep '>=dev-python/backports-ssl-match-hostname-3.5[${PYTHON_USEDEP}]' 'python2_7' )"
42	+ >=dev-python/websocket-client-0.32.0[${PYTHON_USEDEP}]"
43
44	DEPEND="${RDEPEND}
45	test? ( <dev-python/pytest-4[${PYTHON_USEDEP}]
46	- <dev-python/pyyaml-5.1[${PYTHON_USEDEP}]
47	- $(python_gen_cond_dep '>=dev-python/mock-1.0.1[${PYTHON_USEDEP}]' 'python2_7' ) )"
48	+ <dev-python/pyyaml-5.1[${PYTHON_USEDEP}] )"
49
50	S="${WORKDIR}/compose-${PV}"
51
52
53	diff --git a/app-emulation/docker-compose/docker-compose-1.24.1.ebuild b/app-emulation/docker-compose/docker-compose-1.24.1.ebuild
54	index 12ac42d6a19..b310d81c22b 100644
55	--- a/app-emulation/docker-compose/docker-compose-1.24.1.ebuild
56	+++ b/app-emulation/docker-compose/docker-compose-1.24.1.ebuild
57	@@ -3,7 +3,7 @@
58
59	EAPI=7
60
61	-PYTHON_COMPAT=( python{2_7,3_6} )
62	+PYTHON_COMPAT=( python3_6 )
63
64	inherit bash-completion-r1 distutils-r1
65
66	@@ -29,15 +29,11 @@ RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
67	>=dev-python/requests-2.18.1[${PYTHON_USEDEP}]
68	>=dev-python/six-1.3.0[${PYTHON_USEDEP}]
69	>=dev-python/texttable-0.9.0[${PYTHON_USEDEP}]
70	- >=dev-python/websocket-client-0.32.0[${PYTHON_USEDEP}]
71	- $(python_gen_cond_dep '>=dev-python/enum34-1.0.4[${PYTHON_USEDEP}]' 'python2_7' )
72	- $(python_gen_cond_dep '>=dev-python/ipaddress-1.0.16[${PYTHON_USEDEP}]' 'python2_7' )
73	- $(python_gen_cond_dep '>=dev-python/backports-ssl-match-hostname-3.5[${PYTHON_USEDEP}]' 'python2_7' )"
74	+ >=dev-python/websocket-client-0.32.0[${PYTHON_USEDEP}]"
75
76	DEPEND="${RDEPEND}
77	test? ( <dev-python/pytest-4[${PYTHON_USEDEP}]
78	- <dev-python/pyyaml-5.1[${PYTHON_USEDEP}]
79	- $(python_gen_cond_dep '>=dev-python/mock-1.0.1[${PYTHON_USEDEP}]' 'python2_7' ) )"
80	+ <dev-python/pyyaml-5.1[${PYTHON_USEDEP}] )"
81
82	S="${WORKDIR}/compose-${PV}"
83
84
85	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
86	index a6f8868eab7..ae28e4a89c3 100644
87	--- a/app-emulation/docker-compose/docker-compose-1.25.0-r1.ebuild
88	+++ b/app-emulation/docker-compose/docker-compose-1.25.0-r1.ebuild
89	@@ -3,7 +3,7 @@
90
91	EAPI=7
92
93	-PYTHON_COMPAT=( python{2_7,3_6} )
94	+PYTHON_COMPAT=( python3_6 )
95
96	inherit bash-completion-r1 distutils-r1
97
98	@@ -29,17 +29,11 @@ RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
99	>=dev-python/requests-2.20.0[${PYTHON_USEDEP}]
100	>=dev-python/six-1.3.0[${PYTHON_USEDEP}]
101	>=dev-python/texttable-0.9.0[${PYTHON_USEDEP}]
102	- >=dev-python/websocket-client-0.32.0[${PYTHON_USEDEP}]
103	- $(python_gen_cond_dep '>=dev-python/backports-shutil_get_terminal_size-1.0.0[${PYTHON_USEDEP}]' 'python2_7' )
104	- $(python_gen_cond_dep '>=dev-python/backports-ssl-match-hostname-3.5[${PYTHON_USEDEP}]' 'python2_7' )
105	- $(python_gen_cond_dep '>=dev-python/enum34-1.0.4[${PYTHON_USEDEP}]' 'python2_7' )
106	- $(python_gen_cond_dep '>=dev-python/ipaddress-1.0.16[${PYTHON_USEDEP}]' 'python2_7' )
107	- $(python_gen_cond_dep '>=dev-python/subprocess32-3.5.4[${PYTHON_USEDEP}]' 'python2_7' )"
108	+ >=dev-python/websocket-client-0.32.0[${PYTHON_USEDEP}]"
109
110	DEPEND="${RDEPEND}
111	test? ( <dev-python/pytest-4[${PYTHON_USEDEP}]
112	- <dev-python/pyyaml-5.1[${PYTHON_USEDEP}]
113	- $(python_gen_cond_dep '>=dev-python/mock-1.0.1[${PYTHON_USEDEP}]' 'python2_7' ) )"
114	+ <dev-python/pyyaml-5.1[${PYTHON_USEDEP}] )"
115
116	S="${WORKDIR}/compose-${PV}"
117
118
119	diff --git a/app-emulation/docker-compose/docker-compose-1.25.1.ebuild b/app-emulation/docker-compose/docker-compose-1.25.1.ebuild
120	index 2c7c3fe978b..014701ba9c8 100644
121	--- a/app-emulation/docker-compose/docker-compose-1.25.1.ebuild
122	+++ b/app-emulation/docker-compose/docker-compose-1.25.1.ebuild
123	@@ -3,7 +3,7 @@
124
125	EAPI=7
126
127	-PYTHON_COMPAT=( python{2_7,3_6} )
128	+PYTHON_COMPAT=( python3_6 )
129
130	inherit bash-completion-r1 distutils-r1
131
132	@@ -29,17 +29,11 @@ RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
133	>=dev-python/requests-2.20.0[${PYTHON_USEDEP}]
134	>=dev-python/six-1.3.0[${PYTHON_USEDEP}]
135	>=dev-python/texttable-0.9.0[${PYTHON_USEDEP}]
136	- >=dev-python/websocket-client-0.32.0[${PYTHON_USEDEP}]
137	- $(python_gen_cond_dep '>=dev-python/backports-shutil_get_terminal_size-1.0.0[${PYTHON_USEDEP}]' 'python2_7' )
138	- $(python_gen_cond_dep '>=dev-python/backports-ssl-match-hostname-3.5[${PYTHON_USEDEP}]' 'python2_7' )
139	- $(python_gen_cond_dep '>=dev-python/enum34-1.0.4[${PYTHON_USEDEP}]' 'python2_7' )
140	- $(python_gen_cond_dep '>=dev-python/ipaddress-1.0.16[${PYTHON_USEDEP}]' 'python2_7' )
141	- $(python_gen_cond_dep '>=dev-python/subprocess32-3.5.4[${PYTHON_USEDEP}]' 'python2_7' )"
142	+ >=dev-python/websocket-client-0.32.0[${PYTHON_USEDEP}]"
143
144	DEPEND="${RDEPEND}
145	test? ( <dev-python/pytest-4[${PYTHON_USEDEP}]
146	- <dev-python/pyyaml-5.1[${PYTHON_USEDEP}]
147	- $(python_gen_cond_dep '>=dev-python/mock-1.0.1[${PYTHON_USEDEP}]' 'python2_7' ) )"
148	+ <dev-python/pyyaml-5.1[${PYTHON_USEDEP}] )"
149
150	S="${WORKDIR}/compose-${PV}"
151
152
153	diff --git a/app-emulation/docker-compose/docker-compose-1.25.2.ebuild b/app-emulation/docker-compose/docker-compose-1.25.2.ebuild
154	index 7bdd266df6a..08fd06065ee 100644
155	--- a/app-emulation/docker-compose/docker-compose-1.25.2.ebuild
156	+++ b/app-emulation/docker-compose/docker-compose-1.25.2.ebuild
157	@@ -3,7 +3,7 @@
158
159	EAPI=7
160
161	-PYTHON_COMPAT=( python{2_7,3_6} )
162	+PYTHON_COMPAT=( python3_6 )
163
164	inherit bash-completion-r1 distutils-r1
165
166	@@ -29,18 +29,12 @@ RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
167	>=dev-python/requests-2.20.0[${PYTHON_USEDEP}]
168	>=dev-python/six-1.3.0[${PYTHON_USEDEP}]
169	>=dev-python/texttable-0.9.0[${PYTHON_USEDEP}]
170	- >=dev-python/websocket-client-0.32.0[${PYTHON_USEDEP}]
171	- $(python_gen_cond_dep '>=dev-python/backports-shutil_get_terminal_size-1.0.0[${PYTHON_USEDEP}]' 'python2_7' )
172	- $(python_gen_cond_dep '>=dev-python/backports-ssl-match-hostname-3.5[${PYTHON_USEDEP}]' 'python2_7' )
173	- $(python_gen_cond_dep '>=dev-python/enum34-1.0.4[${PYTHON_USEDEP}]' 'python2_7' )
174	- $(python_gen_cond_dep '>=dev-python/ipaddress-1.0.16[${PYTHON_USEDEP}]' 'python2_7' )
175	- $(python_gen_cond_dep '>=dev-python/subprocess32-3.5.4[${PYTHON_USEDEP}]' 'python2_7' )"
176	+ >=dev-python/websocket-client-0.32.0[${PYTHON_USEDEP}]"
177
178	DEPEND="${RDEPEND}
179	test? (
180	<dev-python/pytest-4[${PYTHON_USEDEP}]
181	dev-python/ddt[${PYTHON_USEDEP}]
182	- $(python_gen_cond_dep '>=dev-python/mock-1.0.1[${PYTHON_USEDEP}]' 'python2_7' )
183	)"
184
185	S="${WORKDIR}/compose-${PV}"
186
187	diff --git a/app-emulation/docker-compose/docker-compose-1.25.3.ebuild b/app-emulation/docker-compose/docker-compose-1.25.3.ebuild
188	index fa7ef8bfb51..90f18a6ef86 100644
189	--- a/app-emulation/docker-compose/docker-compose-1.25.3.ebuild
190	+++ b/app-emulation/docker-compose/docker-compose-1.25.3.ebuild
191	@@ -3,7 +3,7 @@
192
193	EAPI=7
194
195	-PYTHON_COMPAT=( python{2_7,3_6} )
196	+PYTHON_COMPAT=( python3_6 )
197
198	inherit bash-completion-r1 distutils-r1
199
200	@@ -29,18 +29,12 @@ RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
201	>=dev-python/requests-2.20.0[${PYTHON_USEDEP}]
202	>=dev-python/six-1.3.0[${PYTHON_USEDEP}]
203	>=dev-python/texttable-0.9.0[${PYTHON_USEDEP}]
204	- >=dev-python/websocket-client-0.32.0[${PYTHON_USEDEP}]
205	- $(python_gen_cond_dep '>=dev-python/backports-shutil_get_terminal_size-1.0.0[${PYTHON_USEDEP}]' 'python2_7' )
206	- $(python_gen_cond_dep '>=dev-python/backports-ssl-match-hostname-3.5[${PYTHON_USEDEP}]' 'python2_7' )
207	- $(python_gen_cond_dep '>=dev-python/enum34-1.0.4[${PYTHON_USEDEP}]' 'python2_7' )
208	- $(python_gen_cond_dep '>=dev-python/ipaddress-1.0.16[${PYTHON_USEDEP}]' 'python2_7' )
209	- $(python_gen_cond_dep '>=dev-python/subprocess32-3.5.4[${PYTHON_USEDEP}]' 'python2_7' )"
210	+ >=dev-python/websocket-client-0.32.0[${PYTHON_USEDEP}]"
211
212	DEPEND="${RDEPEND}
213	test? (
214	<dev-python/pytest-4[${PYTHON_USEDEP}]
215	dev-python/ddt[${PYTHON_USEDEP}]
216	- $(python_gen_cond_dep '>=dev-python/mock-1.0.1[${PYTHON_USEDEP}]' 'python2_7' )
217	)"
218
219	S="${WORKDIR}/compose-${PV}"
220
221	diff --git a/app-emulation/docker-compose/docker-compose-1.25.4.ebuild b/app-emulation/docker-compose/docker-compose-1.25.4.ebuild
222	index c7b13e93e7a..7fd5d941ab5 100644
223	--- a/app-emulation/docker-compose/docker-compose-1.25.4.ebuild
224	+++ b/app-emulation/docker-compose/docker-compose-1.25.4.ebuild
225	@@ -3,7 +3,7 @@
226
227	EAPI=7
228
229	-PYTHON_COMPAT=( python{2_7,3_6} )
230	+PYTHON_COMPAT=( python3_6 )
231	DISTUTILS_USE_SETUPTOOLS=rdepend
232
233	inherit bash-completion-r1 distutils-r1
234	@@ -30,18 +30,12 @@ RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
235	>=dev-python/requests-2.20.0[${PYTHON_USEDEP}]
236	>=dev-python/six-1.3.0[${PYTHON_USEDEP}]
237	>=dev-python/texttable-0.9.0[${PYTHON_USEDEP}]
238	- >=dev-python/websocket-client-0.32.0[${PYTHON_USEDEP}]
239	- $(python_gen_cond_dep '>=dev-python/backports-shutil_get_terminal_size-1.0.0[${PYTHON_USEDEP}]' 'python2_7' )
240	- $(python_gen_cond_dep '>=dev-python/backports-ssl-match-hostname-3.5[${PYTHON_USEDEP}]' 'python2_7' )
241	- $(python_gen_cond_dep '>=dev-python/enum34-1.0.4[${PYTHON_USEDEP}]' 'python2_7' )
242	- $(python_gen_cond_dep '>=dev-python/ipaddress-1.0.16[${PYTHON_USEDEP}]' 'python2_7' )
243	- $(python_gen_cond_dep '>=dev-python/subprocess32-3.5.4[${PYTHON_USEDEP}]' 'python2_7' )"
244	+ >=dev-python/websocket-client-0.32.0[${PYTHON_USEDEP}]"
245
246	DEPEND="${RDEPEND}
247	test? (
248	<dev-python/pytest-4[${PYTHON_USEDEP}]
249	dev-python/ddt[${PYTHON_USEDEP}]
250	- $(python_gen_cond_dep '>=dev-python/mock-1.0.1[${PYTHON_USEDEP}]' 'python2_7' )
251	)"
252
253	S="${WORKDIR}/compose-${PV}"

Gentoo Archives: gentoo-commits