1 |
commit: 53e4fdb64cdd2662c153d0f3769e402f8996ee3b |
2 |
Author: Sebastian Pipping <sping <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed Oct 31 17:57:07 2018 +0000 |
4 |
Commit: Sebastian Pipping <sping <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Oct 31 17:58:45 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=53e4fdb6 |
7 |
|
8 |
app-emulation/docker-compose: 1.23.0 |
9 |
|
10 |
Signed-off-by: Sebastian Pipping <sping <AT> gentoo.org> |
11 |
Package-Manager: Portage-2.3.50, Repoman-2.3.11 |
12 |
|
13 |
app-emulation/docker-compose/Manifest | 1 + |
14 |
.../docker-compose/docker-compose-1.23.0.ebuild | 73 ++++++++++++++++++++++ |
15 |
.../files/docker-compose-1.23.0-setup-py.patch | 59 +++++++++++++++++ |
16 |
3 files changed, 133 insertions(+) |
17 |
|
18 |
diff --git a/app-emulation/docker-compose/Manifest b/app-emulation/docker-compose/Manifest |
19 |
index 25a210d5bfc..bc123b2ca6d 100644 |
20 |
--- a/app-emulation/docker-compose/Manifest |
21 |
+++ b/app-emulation/docker-compose/Manifest |
22 |
@@ -1,3 +1,4 @@ |
23 |
DIST docker-compose-1.19.0.tar.gz 238307 BLAKE2B 2a7bbcf50c2cc591eba1d59db30cb0341e33e3f1ebe948e0b6762d9bffcdcc72d98e2da19fc549c5fabda192fca69a9d54e016601ddb4f4a94f0dc1c93f99a29 SHA512 f1d522621580a5130378508e6b15ad2e4708e9c5ff713627ca54308ab3e6bf000e21c55bbdf9585b2116e73648fdc773500a5415ab81a72dd2c69c9c07e71581 |
24 |
DIST docker-compose-1.21.2.tar.gz 294070 BLAKE2B c27ce8708f20385ee3f072c4aa832a42dc975d08d71d9e61ce3a822055d606db7e1e7b6e182523e64115922416d5c1baeca14897a241e84873a97aa755bce539 SHA512 6392582d8c6c321458b1163336f1c902548cc250f9ab5b765d144287b006ef6dacdc47199fafbb6efe426e382325b94986aa159df08dec4974a71968862a8435 |
25 |
DIST docker-compose-1.22.0.tar.gz 296747 BLAKE2B 9dfd25fb186436801d9c12900c4103c1c0d83bee3b424b3f2373247aeeb8261fed04cf9be9cee230a48e1c19523b48d5618a18f322c236bac1d769036f9ac979 SHA512 eccef2165221fcfdac089ffd3bd0795d08d8c6f7158709dbc2fc83a6d6e9466af4b73c0c7d24a751c6b546b4219e10dfc96cd41e13e7ebc676da603c97b7620e |
26 |
+DIST docker-compose-1.23.0.tar.gz 302110 BLAKE2B 0239d787a383c983d9965cecb087ff8d3050cd98bba0c324ea8f12f062f1b582fcfb20498d0cd0e323fe0912439f6ba288798f5c3d83e3c6a77fb298225fdf3a SHA512 b22f4c76e4187e9a01186516bbfaf988e9fc3e74e7a8455b6424cec61572a621d82f7bec9e23188fa297da26b0777c83d01374a628575d73fbb95502fb27d2db |
27 |
|
28 |
diff --git a/app-emulation/docker-compose/docker-compose-1.23.0.ebuild b/app-emulation/docker-compose/docker-compose-1.23.0.ebuild |
29 |
new file mode 100644 |
30 |
index 00000000000..504a8d4449a |
31 |
--- /dev/null |
32 |
+++ b/app-emulation/docker-compose/docker-compose-1.23.0.ebuild |
33 |
@@ -0,0 +1,73 @@ |
34 |
+# Copyright 1999-2018 Gentoo Authors |
35 |
+# Distributed under the terms of the GNU General Public License v2 |
36 |
+ |
37 |
+EAPI=6 |
38 |
+PYTHON_COMPAT=( python{2_7,3_{4,5,6}} ) |
39 |
+ |
40 |
+inherit bash-completion-r1 distutils-r1 vcs-snapshot |
41 |
+ |
42 |
+MY_PV=${PV/_/} |
43 |
+ |
44 |
+DESCRIPTION="Multi-container orchestration for Docker" |
45 |
+HOMEPAGE="https://github.com/docker/compose" |
46 |
+SRC_URI="https://github.com/docker/compose/archive/${PV}.tar.gz -> ${P}.tar.gz" |
47 |
+ |
48 |
+LICENSE="Apache-2.0" |
49 |
+SLOT="0" |
50 |
+KEYWORDS="~amd64" |
51 |
+IUSE="test" |
52 |
+ |
53 |
+CDEPEND=" |
54 |
+ dev-python/setuptools[${PYTHON_USEDEP}] |
55 |
+ >=dev-python/cached-property-1.2.0[${PYTHON_USEDEP}] |
56 |
+ >=dev-python/colorama-0.4[${PYTHON_USEDEP}] |
57 |
+ >=dev-python/dockerpty-0.4.1[${PYTHON_USEDEP}] |
58 |
+ >=dev-python/docker-py-3.5.0[${PYTHON_USEDEP}] |
59 |
+ >=dev-python/docopt-0.6.1[${PYTHON_USEDEP}] |
60 |
+ >=dev-python/jsonschema-2.5.1[${PYTHON_USEDEP}] |
61 |
+ >=dev-python/PySocks-1.5.6[${PYTHON_USEDEP}] |
62 |
+ !~dev-python/PySocks-1.5.7[${PYTHON_USEDEP}] |
63 |
+ >=dev-python/pyyaml-3.10[${PYTHON_USEDEP}] |
64 |
+ >=dev-python/requests-2.6.1[${PYTHON_USEDEP}] |
65 |
+ !~dev-python/requests-2.11.0[${PYTHON_USEDEP}] |
66 |
+ !~dev-python/requests-2.12.2[${PYTHON_USEDEP}] |
67 |
+ !~dev-python/requests-2.18.0[${PYTHON_USEDEP}] |
68 |
+ >=dev-python/six-1.3.0[${PYTHON_USEDEP}] |
69 |
+ >=dev-python/texttable-0.9[${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 |
+" |
75 |
+DEPEND=" |
76 |
+ ${CDEPEND} |
77 |
+ test? ( |
78 |
+ dev-python/pytest[${PYTHON_USEDEP}] |
79 |
+ $(python_gen_cond_dep '>=dev-python/mock-1.0.1[${PYTHON_USEDEP}]' 'python2_7' ) |
80 |
+ ) |
81 |
+" |
82 |
+RDEPEND="${CDEPEND}" |
83 |
+ |
84 |
+PATCHES=( |
85 |
+ "${FILESDIR}"/${P}-setup-py.patch |
86 |
+) |
87 |
+ |
88 |
+src_prepare() { |
89 |
+ # Address QA issue "docker-compose.exe: missing alias (symlink) for completed command." |
90 |
+ sed 's,^\(complete.*\) docker-compose\.exe\(.*\),\1\2,' -i contrib/completion/bash/docker-compose || die |
91 |
+ |
92 |
+ default |
93 |
+} |
94 |
+ |
95 |
+python_test() { |
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.23.0-setup-py.patch b/app-emulation/docker-compose/files/docker-compose-1.23.0-setup-py.patch |
109 |
new file mode 100644 |
110 |
index 00000000000..c95c776b2c3 |
111 |
--- /dev/null |
112 |
+++ b/app-emulation/docker-compose/files/docker-compose-1.23.0-setup-py.patch |
113 |
@@ -0,0 +1,59 @@ |
114 |
+From c481f53ff75d015b4db37b294c5a2142d0272f32 Mon Sep 17 00:00:00 2001 |
115 |
+From: Sebastian Pipping <sebastian@×××××××.org> |
116 |
+Date: Wed, 31 Oct 2018 18:45:59 +0100 |
117 |
+Subject: [PATCH] setup.py: Drop generic upper version boundaries |
118 |
+ |
119 |
+--- |
120 |
+ setup.py | 28 ++++++++++++++-------------- |
121 |
+ 1 file changed, 14 insertions(+), 14 deletions(-) |
122 |
+ |
123 |
+diff --git a/setup.py b/setup.py |
124 |
+index 8260ebc..7f76abb 100644 |
125 |
+--- a/setup.py |
126 |
++++ b/setup.py |
127 |
+@@ -30,16 +30,16 @@ def find_version(*file_paths): |
128 |
+ |
129 |
+ |
130 |
+ install_requires = [ |
131 |
+- 'cached-property >= 1.2.0, < 2', |
132 |
+- 'docopt >= 0.6.1, < 0.7', |
133 |
+- 'PyYAML >= 3.10, < 4', |
134 |
+- 'requests >= 2.6.1, != 2.11.0, != 2.12.2, != 2.18.0, < 2.21', |
135 |
+- 'texttable >= 0.9.0, < 0.10', |
136 |
+- 'websocket-client >= 0.32.0, < 1.0', |
137 |
+- 'docker >= 3.5.0, < 4.0', |
138 |
+- 'dockerpty >= 0.4.1, < 0.5', |
139 |
+- 'six >= 1.3.0, < 2', |
140 |
+- 'jsonschema >= 2.5.1, < 3', |
141 |
++ 'cached-property >= 1.2.0', |
142 |
++ 'docopt >= 0.6.1', |
143 |
++ 'PyYAML >= 3.10', |
144 |
++ 'requests >= 2.6.1, != 2.11.0, != 2.12.2, != 2.18.0', |
145 |
++ 'texttable >= 0.9.0', |
146 |
++ 'websocket-client >= 0.32.0', |
147 |
++ 'docker >= 3.5.0', |
148 |
++ 'dockerpty >= 0.4.1', |
149 |
++ 'six >= 1.3.0', |
150 |
++ 'jsonschema >= 2.5.1', |
151 |
+ ] |
152 |
+ |
153 |
+ |
154 |
+@@ -52,11 +52,11 @@ if sys.version_info[:2] < (3, 4): |
155 |
+ tests_require.append('mock >= 1.0.1') |
156 |
+ |
157 |
+ extras_require = { |
158 |
+- ':python_version < "3.4"': ['enum34 >= 1.0.4, < 2'], |
159 |
++ ':python_version < "3.4"': ['enum34 >= 1.0.4'], |
160 |
+ ':python_version < "3.5"': ['backports.ssl_match_hostname >= 3.5'], |
161 |
+- ':python_version < "3.3"': ['ipaddress >= 1.0.16'], |
162 |
+- ':sys_platform == "win32"': ['colorama >= 0.4, < 0.5'], |
163 |
+- 'socks': ['PySocks >= 1.5.6, != 1.5.7, < 2'], |
164 |
++ ':python_version < "3.3"': ['ipaddress'], |
165 |
++ ':sys_platform == "win32"': ['colorama >= 0.4'], |
166 |
++ 'socks': ['PySocks >= 1.5.6, != 1.5.7'], |
167 |
+ } |
168 |
+ |
169 |
+ |
170 |
+-- |
171 |
+2.19.1 |
172 |
+ |