1 |
commit: 50906ed198bd2d5e37dda6b4cb8fb8da0e92406c |
2 |
Author: Sebastian Pipping <sping <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon Jan 20 18:59:02 2020 +0000 |
4 |
Commit: Sebastian Pipping <sping <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Jan 20 19:00:27 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=50906ed1 |
7 |
|
8 |
app-emulation/docker-compose: 1.25.2 |
9 |
|
10 |
Signed-off-by: Sebastian Pipping <sping <AT> gentoo.org> |
11 |
Package-Manager: Portage-2.3.84, Repoman-2.3.20 |
12 |
|
13 |
app-emulation/docker-compose/Manifest | 1 + |
14 |
.../docker-compose/docker-compose-1.25.2.ebuild | 73 ++++++++++++++++++++++ |
15 |
.../files/docker-compose-1.25.2-setup-py.patch | 71 +++++++++++++++++++++ |
16 |
3 files changed, 145 insertions(+) |
17 |
|
18 |
diff --git a/app-emulation/docker-compose/Manifest b/app-emulation/docker-compose/Manifest |
19 |
index 9e871f331a9..c5f61faece3 100644 |
20 |
--- a/app-emulation/docker-compose/Manifest |
21 |
+++ b/app-emulation/docker-compose/Manifest |
22 |
@@ -2,3 +2,4 @@ DIST docker-compose-1.24.0.tar.gz 307601 BLAKE2B cb2a6f96e14c04d0279b25c075182d8 |
23 |
DIST docker-compose-1.24.1.tar.gz 307749 BLAKE2B 7ded0a4b82a7a9beb9de38752f38998ca4ea9421e5ed5630627820ec7e250ad6f03f6788bcbebe8bc0dd4c064d275bb4ca5a6055a95b6a0f72d7ae9038ec7f22 SHA512 9b8632ef263b8dfa678e8b99b46e00441f779716a524280ce25f62fcd2605f400723b7790c466338374c34653946dc2c5d7f09593ddd892fee3409c2a2fd1a5f |
24 |
DIST docker-compose-1.25.0.tar.gz 320048 BLAKE2B a0615c9d81f897f551d664799e2a7cd4d72c3e0b70ceb0ff9bfb533a81799d2d524824ead27bff2391c5e98fc34430fb2ba724bba663ece66417ac72181241f0 SHA512 38be153a8ba1bf1a4a5c63dc794db3344c93c0819fba0c38feb791067e0aa72142205e4255b5fd31bf2f8159dfa04cde09fdcdabe0511bc0e2865974dff5433d |
25 |
DIST docker-compose-1.25.1.tar.gz 321627 BLAKE2B 9056b0e359ff6cccba16b7ea5fc96de363f242103c48d15e3ed19ed5291878f7a5c81f99b7fd3eff46eaff5b271e883125ab02ff22bf592c4a5dd12792790fdc SHA512 5e58edd3364caecc9b6ec0e92e629e624694e42f96da836378648918dfaa41ddc0c99b107f2d3f11d1dd6ab86a516a7b2da3783b542623440d8c0c6628c05020 |
26 |
+DIST docker-compose-1.25.2.tar.gz 306196 BLAKE2B 6bf9c1ae14b25f41a7b3893f5ddc5b654743b29eb17c3d1b23e47d004e8e3feaf021b67c2419632faa6b11713ad1bd956b9f756e36fcd8efc7e60404a1de53a7 SHA512 ce045c6af233d6d03fd26100bce836444abb3022d6661ac6073cd8c6b8ed1cc0bbef9cbfad73672c8d3b6f3a12ee98e6e60c5f1b90360f778d5fa8d18e00179e |
27 |
|
28 |
diff --git a/app-emulation/docker-compose/docker-compose-1.25.2.ebuild b/app-emulation/docker-compose/docker-compose-1.25.2.ebuild |
29 |
new file mode 100644 |
30 |
index 00000000000..7bdd266df6a |
31 |
--- /dev/null |
32 |
+++ b/app-emulation/docker-compose/docker-compose-1.25.2.ebuild |
33 |
@@ -0,0 +1,73 @@ |
34 |
+# Copyright 2018-2020 Gentoo Authors |
35 |
+# Distributed under the terms of the GNU General Public License v2 |
36 |
+ |
37 |
+EAPI=7 |
38 |
+ |
39 |
+PYTHON_COMPAT=( python{2_7,3_6} ) |
40 |
+ |
41 |
+inherit bash-completion-r1 distutils-r1 |
42 |
+ |
43 |
+DESCRIPTION="Multi-container orchestration for Docker" |
44 |
+HOMEPAGE="https://github.com/docker/compose" |
45 |
+SRC_URI="https://github.com/docker/compose/archive/v${PV}.tar.gz -> ${P}.tar.gz" |
46 |
+ |
47 |
+LICENSE="Apache-2.0" |
48 |
+SLOT="0" |
49 |
+KEYWORDS="~amd64" |
50 |
+IUSE="test" |
51 |
+RESTRICT="!test? ( test )" |
52 |
+ |
53 |
+RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}] |
54 |
+ >=dev-python/cached-property-1.2.0[${PYTHON_USEDEP}] |
55 |
+ >=dev-python/docker-py-3.7.0[${PYTHON_USEDEP}] |
56 |
+ >=dev-python/dockerpty-0.4.1[${PYTHON_USEDEP}] |
57 |
+ >=dev-python/docopt-0.6.1[${PYTHON_USEDEP}] |
58 |
+ >=dev-python/jsonschema-2.5.1[${PYTHON_USEDEP}] |
59 |
+ dev-python/paramiko[${PYTHON_USEDEP}] |
60 |
+ >=dev-python/PySocks-1.6.0[${PYTHON_USEDEP}] |
61 |
+ >=dev-python/pyyaml-3.10[${PYTHON_USEDEP}] |
62 |
+ >=dev-python/requests-2.20.0[${PYTHON_USEDEP}] |
63 |
+ >=dev-python/six-1.3.0[${PYTHON_USEDEP}] |
64 |
+ >=dev-python/texttable-0.9.0[${PYTHON_USEDEP}] |
65 |
+ >=dev-python/websocket-client-0.32.0[${PYTHON_USEDEP}] |
66 |
+ $(python_gen_cond_dep '>=dev-python/backports-shutil_get_terminal_size-1.0.0[${PYTHON_USEDEP}]' 'python2_7' ) |
67 |
+ $(python_gen_cond_dep '>=dev-python/backports-ssl-match-hostname-3.5[${PYTHON_USEDEP}]' 'python2_7' ) |
68 |
+ $(python_gen_cond_dep '>=dev-python/enum34-1.0.4[${PYTHON_USEDEP}]' 'python2_7' ) |
69 |
+ $(python_gen_cond_dep '>=dev-python/ipaddress-1.0.16[${PYTHON_USEDEP}]' 'python2_7' ) |
70 |
+ $(python_gen_cond_dep '>=dev-python/subprocess32-3.5.4[${PYTHON_USEDEP}]' 'python2_7' )" |
71 |
+ |
72 |
+DEPEND="${RDEPEND} |
73 |
+ test? ( |
74 |
+ <dev-python/pytest-4[${PYTHON_USEDEP}] |
75 |
+ dev-python/ddt[${PYTHON_USEDEP}] |
76 |
+ $(python_gen_cond_dep '>=dev-python/mock-1.0.1[${PYTHON_USEDEP}]' 'python2_7' ) |
77 |
+ )" |
78 |
+ |
79 |
+S="${WORKDIR}/compose-${PV}" |
80 |
+ |
81 |
+PATCHES=( |
82 |
+ # Bug #679968 -- https://bugs.gentoo.org/679968 |
83 |
+ # Bug #681002 -- https://bugs.gentoo.org/681002 |
84 |
+ "${FILESDIR}"/${PN}-1.25.2-setup-py.patch |
85 |
+) |
86 |
+ |
87 |
+src_prepare() { |
88 |
+ # Address QA issue "docker-compose.exe: missing alias (symlink) for completed command." |
89 |
+ sed 's,^\(complete.*\) docker-compose\.exe\(.*\),\1\2,' -i contrib/completion/bash/docker-compose || die |
90 |
+ |
91 |
+ default |
92 |
+} |
93 |
+ |
94 |
+python_test() { |
95 |
+ distutils_install_for_testing |
96 |
+ ${PYTHON} -m pytest tests/unit/ || die "tests failed under ${EPYTHON}" |
97 |
+} |
98 |
+ |
99 |
+python_install_all() { |
100 |
+ newbashcomp contrib/completion/bash/docker-compose ${PN} |
101 |
+ |
102 |
+ insinto /usr/share/zsh/site-functions |
103 |
+ doins contrib/completion/zsh/* |
104 |
+ |
105 |
+ distutils-r1_python_install_all |
106 |
+} |
107 |
|
108 |
diff --git a/app-emulation/docker-compose/files/docker-compose-1.25.2-setup-py.patch b/app-emulation/docker-compose/files/docker-compose-1.25.2-setup-py.patch |
109 |
new file mode 100644 |
110 |
index 00000000000..3af8d2de06e |
111 |
--- /dev/null |
112 |
+++ b/app-emulation/docker-compose/files/docker-compose-1.25.2-setup-py.patch |
113 |
@@ -0,0 +1,71 @@ |
114 |
+From 19d9b58b97127f24e2280e3119e420393e7d239f Mon Sep 17 00:00:00 2001 |
115 |
+From: Sebastian Pipping <sebastian@×××××××.org> |
116 |
+Date: Mon, 20 Jan 2020 19:27:46 +0100 |
117 |
+Subject: [PATCH] setup.py: Drop generic upper version boundaries |
118 |
+ |
119 |
+--- |
120 |
+ setup.py | 38 +++++++++++++++++++------------------- |
121 |
+ 1 file changed, 19 insertions(+), 19 deletions(-) |
122 |
+ |
123 |
+diff --git a/setup.py b/setup.py |
124 |
+index 110441d..3f6a46f 100644 |
125 |
+--- a/setup.py |
126 |
++++ b/setup.py |
127 |
+@@ -30,35 +30,35 @@ def find_version(*file_paths): |
128 |
+ |
129 |
+ |
130 |
+ install_requires = [ |
131 |
+- 'cached-property >= 1.2.0, < 2', |
132 |
+- 'docopt >= 0.6.1, < 1', |
133 |
+- 'PyYAML >= 3.10, < 6', |
134 |
+- 'requests >= 2.20.0, < 3', |
135 |
+- 'texttable >= 0.9.0, < 2', |
136 |
+- 'websocket-client >= 0.32.0, < 1', |
137 |
+- 'docker[ssh] >= 3.7.0, < 5', |
138 |
+- 'dockerpty >= 0.4.1, < 1', |
139 |
+- 'six >= 1.3.0, < 2', |
140 |
+- 'jsonschema >= 2.5.1, < 4', |
141 |
++ 'cached-property >= 1.2.0', |
142 |
++ 'docopt >= 0.6.1', |
143 |
++ 'PyYAML >= 3.10', |
144 |
++ 'requests >= 2.20.0', |
145 |
++ 'texttable >= 0.9.0', |
146 |
++ 'websocket-client >= 0.32.0', |
147 |
++ 'docker[ssh] >= 3.7.0', |
148 |
++ 'dockerpty >= 0.4.1', |
149 |
++ 'six >= 1.3.0', |
150 |
++ 'jsonschema >= 2.5.1', |
151 |
+ ] |
152 |
+ |
153 |
+ |
154 |
+ tests_require = [ |
155 |
+- 'pytest < 6', |
156 |
++ 'pytest', |
157 |
+ ] |
158 |
+ |
159 |
+ |
160 |
+ if sys.version_info[:2] < (3, 4): |
161 |
+- tests_require.append('mock >= 1.0.1, < 4') |
162 |
++ tests_require.append('mock >= 1.0.1') |
163 |
+ |
164 |
+ extras_require = { |
165 |
+- ':python_version < "3.2"': ['subprocess32 >= 3.5.4, < 4'], |
166 |
+- ':python_version < "3.4"': ['enum34 >= 1.0.4, < 2'], |
167 |
+- ':python_version < "3.5"': ['backports.ssl_match_hostname >= 3.5, < 4'], |
168 |
+- ':python_version < "3.3"': ['backports.shutil_get_terminal_size == 1.0.0', |
169 |
+- 'ipaddress >= 1.0.16, < 2'], |
170 |
+- ':sys_platform == "win32"': ['colorama >= 0.4, < 1'], |
171 |
+- 'socks': ['PySocks >= 1.5.6, != 1.5.7, < 2'], |
172 |
++ ':python_version < "3.2"': ['subprocess32 >= 3.5.4'], |
173 |
++ ':python_version < "3.4"': ['enum34 >= 1.0.4'], |
174 |
++ ':python_version < "3.5"': ['backports.ssl_match_hostname >= 3.5'], |
175 |
++ ':python_version < "3.3"': ['backports.shutil_get_terminal_size >= 1.0.0', |
176 |
++ 'ipaddress >= 1.0.16'], |
177 |
++ ':sys_platform == "win32"': ['colorama >= 0.4'], |
178 |
++ 'socks': ['PySocks >= 1.5.6, != 1.5.7'], |
179 |
+ } |
180 |
+ |
181 |
+ |
182 |
+-- |
183 |
+2.24.1 |
184 |
+ |