1 |
commit: bba3aa9acf5b9af1a3b05d75535214218dc0c2c7 |
2 |
Author: Sebastian Pipping <sping <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue Jun 30 22:23:17 2020 +0000 |
4 |
Commit: Sebastian Pipping <sping <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Jun 30 22:27:49 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bba3aa9a |
7 |
|
8 |
app-emulation/docker-compose: 1.26.1 |
9 |
|
10 |
Signed-off-by: Sebastian Pipping <sping <AT> gentoo.org> |
11 |
Package-Manager: Portage-2.3.99, Repoman-2.3.22 |
12 |
|
13 |
app-emulation/docker-compose/Manifest | 1 + |
14 |
.../docker-compose/docker-compose-1.26.1.ebuild | 72 ++++++++++++++++++++ |
15 |
.../files/docker-compose-1.26.1-setup-py.patch | 77 ++++++++++++++++++++++ |
16 |
3 files changed, 150 insertions(+) |
17 |
|
18 |
diff --git a/app-emulation/docker-compose/Manifest b/app-emulation/docker-compose/Manifest |
19 |
index fdae55e9579..b4f1b066cab 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.25.4.tar.gz 306513 BLAKE2B 86c779d794deca7ede0adc80041b17a96b21798d2807065e2c9ea804a95fcaf24a8b92fbcad6c7ce4d1b9d1fb3c9ad348b630e3f10bfd032202995a4c34ab019 SHA512 860153fb603d7efcc76535c9997446a2e6fe18f61769d4f05f51b531902a66072be11e3cff012ba80240b0a7802a032495a2a55e053a9784df92b82e5351b72e |
24 |
DIST docker-compose-1.25.5.tar.gz 308569 BLAKE2B 5d5d1fd60f9bcb87f7e9628dbe10b275996f9af38fb8488a547f4cb5427e6f7aaac09a98a421a0c35a7c2c863713e5de9a490ad21adf080f74a7c3bc4336559b SHA512 efe59bd5e82e12e63c82341ccf5ca11eaebd47c8154a50b40d39bc98ec48c37532919335172a5667f036bab4e884df950ebc4b4ccab8174200cc7ea6683bbbd7 |
25 |
DIST docker-compose-1.26.0.tar.gz 313311 BLAKE2B dc70b7557ce0c51beb177a842f11e16b0e1c4f5ab31f03159b1ffb6f712b884f41bce651e673db63bda4908fd9e7d2c497da3c7568bf038471bad81626e28f25 SHA512 b388f8041b921a0d53d15a8fffb9a1f4d79f40e3eaae073fc043ae74189256a5a24eee9a3c63641e3bfbf43d484da806c2a7d732aad38966ba9fb60d8990f512 |
26 |
+DIST docker-compose-1.26.1.tar.gz 313459 BLAKE2B 8320842047700bf5d38f48c21efeafc294f76505ee33c76fbcc0aba78156699bc2d6ec9cb9e52f99125c3eea0f6c4226eaccf850345cfcdc84327c582408e82a SHA512 e655e4930991f0fa3dca07b6b314442dba11ad4203f0eb8ab7175cb25d6cb16aa846198a2e17d4efea5718e184f7d6b6558d5260a86f07855ff4f7791fe8a3b3 |
27 |
|
28 |
diff --git a/app-emulation/docker-compose/docker-compose-1.26.1.ebuild b/app-emulation/docker-compose/docker-compose-1.26.1.ebuild |
29 |
new file mode 100644 |
30 |
index 00000000000..51d5c59583d |
31 |
--- /dev/null |
32 |
+++ b/app-emulation/docker-compose/docker-compose-1.26.1.ebuild |
33 |
@@ -0,0 +1,72 @@ |
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=( python3_{6,7} ) |
40 |
+DISTUTILS_USE_SETUPTOOLS=rdepend |
41 |
+ |
42 |
+inherit bash-completion-r1 distutils-r1 |
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 |
+RESTRICT="!test? ( test )" |
53 |
+ |
54 |
+RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}] |
55 |
+ >=dev-python/cached-property-1.2.0[${PYTHON_USEDEP}] |
56 |
+ >=dev-python/distro-1.5.0[${PYTHON_USEDEP}] |
57 |
+ >=dev-python/docker-py-4.2.2[${PYTHON_USEDEP}] |
58 |
+ >=dev-python/dockerpty-0.4.1[${PYTHON_USEDEP}] |
59 |
+ >=dev-python/docopt-0.6.1[${PYTHON_USEDEP}] |
60 |
+ >=dev-python/python-dotenv-0.13.0[${PYTHON_USEDEP}] |
61 |
+ >=dev-python/jsonschema-2.5.1[${PYTHON_USEDEP}] |
62 |
+ dev-python/paramiko[${PYTHON_USEDEP}] |
63 |
+ >=dev-python/PySocks-1.6.0[${PYTHON_USEDEP}] |
64 |
+ >=dev-python/pyyaml-3.10[${PYTHON_USEDEP}] |
65 |
+ >=dev-python/requests-2.20.0[${PYTHON_USEDEP}] |
66 |
+ >=dev-python/six-1.3.0[${PYTHON_USEDEP}] |
67 |
+ >=dev-python/texttable-0.9.0[${PYTHON_USEDEP}] |
68 |
+ >=dev-python/websocket-client-0.32.0[${PYTHON_USEDEP}]" |
69 |
+ |
70 |
+DEPEND="${RDEPEND} |
71 |
+ test? ( |
72 |
+ >=dev-python/pytest-5[${PYTHON_USEDEP}] |
73 |
+ >=dev-python/ddt-1.2.2[${PYTHON_USEDEP}] |
74 |
+ )" |
75 |
+ |
76 |
+S="${WORKDIR}/compose-${PV}" |
77 |
+ |
78 |
+PATCHES=( |
79 |
+ # Bug #679968 -- https://bugs.gentoo.org/679968 |
80 |
+ # Bug #681002 -- https://bugs.gentoo.org/681002 |
81 |
+ "${FILESDIR}"/${PN}-1.26.1-setup-py.patch |
82 |
+) |
83 |
+ |
84 |
+DOCS=( CHANGELOG.md README.md ) |
85 |
+ |
86 |
+src_prepare() { |
87 |
+ # Address QA issue "docker-compose.exe: missing alias (symlink) for completed command." |
88 |
+ sed 's,^\(complete.*\) docker-compose\.exe\(.*\),\1\2,' -i contrib/completion/bash/docker-compose || die |
89 |
+ |
90 |
+ default |
91 |
+} |
92 |
+ |
93 |
+python_test() { |
94 |
+ distutils_install_for_testing |
95 |
+ ${PYTHON} -m pytest tests/unit/ || die "tests failed under ${EPYTHON}" |
96 |
+} |
97 |
+ |
98 |
+python_install_all() { |
99 |
+ newbashcomp contrib/completion/bash/docker-compose ${PN} |
100 |
+ |
101 |
+ insinto /usr/share/zsh/site-functions |
102 |
+ doins contrib/completion/zsh/* |
103 |
+ |
104 |
+ distutils-r1_python_install_all |
105 |
+} |
106 |
|
107 |
diff --git a/app-emulation/docker-compose/files/docker-compose-1.26.1-setup-py.patch b/app-emulation/docker-compose/files/docker-compose-1.26.1-setup-py.patch |
108 |
new file mode 100644 |
109 |
index 00000000000..662e525551b |
110 |
--- /dev/null |
111 |
+++ b/app-emulation/docker-compose/files/docker-compose-1.26.1-setup-py.patch |
112 |
@@ -0,0 +1,77 @@ |
113 |
+From 067109b44ae049c3f6d72c6dc80e387ff8750b17 Mon Sep 17 00:00:00 2001 |
114 |
+From: Sebastian Pipping <sebastian@×××××××.org> |
115 |
+Date: Tue, 30 Jun 2020 21:00:28 +0200 |
116 |
+Subject: [PATCH] setup.py: Drop generic upper version boundaries |
117 |
+ |
118 |
+--- |
119 |
+ setup.py | 44 ++++++++++++++++++++++---------------------- |
120 |
+ 1 file changed, 22 insertions(+), 22 deletions(-) |
121 |
+ |
122 |
+diff --git a/setup.py b/setup.py |
123 |
+index ac55ce4..dd69bba 100644 |
124 |
+--- a/setup.py |
125 |
++++ b/setup.py |
126 |
+@@ -30,38 +30,38 @@ def find_version(*file_paths): |
127 |
+ |
128 |
+ |
129 |
+ install_requires = [ |
130 |
+- 'cached-property >= 1.2.0, < 2', |
131 |
+- 'docopt >= 0.6.1, < 1', |
132 |
+- 'PyYAML >= 3.10, < 6', |
133 |
+- 'requests >= 2.20.0, < 3', |
134 |
+- 'texttable >= 0.9.0, < 2', |
135 |
+- 'websocket-client >= 0.32.0, < 1', |
136 |
+- 'distro >= 1.5.0, < 2', |
137 |
+- 'docker[ssh] >= 4.2.1, < 5', |
138 |
+- 'dockerpty >= 0.4.1, < 1', |
139 |
+- 'six >= 1.3.0, < 2', |
140 |
+- 'jsonschema >= 2.5.1, < 4', |
141 |
+- 'python-dotenv >= 0.13.0, < 1', |
142 |
++ 'cached-property >= 1.2.0', |
143 |
++ 'docopt >= 0.6.1', |
144 |
++ 'PyYAML >= 3.10', |
145 |
++ 'requests >= 2.20.0', |
146 |
++ 'texttable >= 0.9.0', |
147 |
++ 'websocket-client >= 0.32.0', |
148 |
++ 'distro >= 1.5.0', |
149 |
++ 'docker[ssh] >= 4.2.2', # https://github.com/docker/compose/issues/7576 |
150 |
++ 'dockerpty >= 0.4.1', |
151 |
++ 'six >= 1.3.0', |
152 |
++ 'jsonschema >= 2.5.1', |
153 |
++ 'python-dotenv >= 0.13.0', |
154 |
+ ] |
155 |
+ |
156 |
+ |
157 |
+ tests_require = [ |
158 |
+- 'ddt >= 1.2.2, < 2', |
159 |
+- 'pytest < 6', |
160 |
++ 'ddt >= 1.2.2', |
161 |
++ 'pytest', |
162 |
+ ] |
163 |
+ |
164 |
+ |
165 |
+ if sys.version_info[:2] < (3, 4): |
166 |
+- tests_require.append('mock >= 1.0.1, < 4') |
167 |
++ tests_require.append('mock >= 1.0.1') |
168 |
+ |
169 |
+ extras_require = { |
170 |
+- ':python_version < "3.2"': ['subprocess32 >= 3.5.4, < 4'], |
171 |
+- ':python_version < "3.4"': ['enum34 >= 1.0.4, < 2'], |
172 |
+- ':python_version < "3.5"': ['backports.ssl_match_hostname >= 3.5, < 4'], |
173 |
+- ':python_version < "3.3"': ['backports.shutil_get_terminal_size == 1.0.0', |
174 |
+- 'ipaddress >= 1.0.16, < 2'], |
175 |
+- ':sys_platform == "win32"': ['colorama >= 0.4, < 1'], |
176 |
+- 'socks': ['PySocks >= 1.5.6, != 1.5.7, < 2'], |
177 |
++ ':python_version < "3.2"': ['subprocess32 >= 3.5.4'], |
178 |
++ ':python_version < "3.4"': ['enum34 >= 1.0.4'], |
179 |
++ ':python_version < "3.5"': ['backports.ssl_match_hostname >= 3.5'], |
180 |
++ ':python_version < "3.3"': ['backports.shutil_get_terminal_size >= 1.0.0', |
181 |
++ 'ipaddress >= 1.0.16'], |
182 |
++ ':sys_platform == "win32"': ['colorama >= 0.4'], |
183 |
++ 'socks': ['PySocks >= 1.5.6, != 1.5.7'], |
184 |
+ 'tests': tests_require, |
185 |
+ } |
186 |
+ |
187 |
+-- |
188 |
+2.26.2 |
189 |
+ |