1 |
commit: ea1b609588285cf520f7eb12f080e55bbf81027a |
2 |
Author: Sebastian Pipping <sping <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu Sep 3 18:09:12 2020 +0000 |
4 |
Commit: Sebastian Pipping <sping <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Sep 3 18:10:22 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ea1b6095 |
7 |
|
8 |
app-emulation/docker-compose: 1.27.0_rc3 |
9 |
|
10 |
Signed-off-by: Sebastian Pipping <sping <AT> gentoo.org> |
11 |
Package-Manager: Portage-3.0.0, Repoman-2.3.23 |
12 |
|
13 |
app-emulation/docker-compose/Manifest | 1 + |
14 |
.../docker-compose-1.27.0_rc3.ebuild | 73 ++++++++++++++++++++++ |
15 |
.../files/docker-compose-1.27.0_rc3-setup-py.patch | 67 ++++++++++++++++++++ |
16 |
3 files changed, 141 insertions(+) |
17 |
|
18 |
diff --git a/app-emulation/docker-compose/Manifest b/app-emulation/docker-compose/Manifest |
19 |
index 260e587c4bb..bebbf8394fb 100644 |
20 |
--- a/app-emulation/docker-compose/Manifest |
21 |
+++ b/app-emulation/docker-compose/Manifest |
22 |
@@ -4,3 +4,4 @@ DIST docker-compose-1.26.1.tar.gz 313459 BLAKE2B 8320842047700bf5d38f48c21efeafc |
23 |
DIST docker-compose-1.26.2.tar.gz 313494 BLAKE2B 656bac181547a3484c45d0ede7111384007db8109aaf3673a06b848bb9b27059cfb8b2cd583e6bc7acd0ebbd90d40e485251d473eefe56a6493abe187132e520 SHA512 4cb8a2f5e25f17eb842e36dea96fae8862df099d706ec590e6fc0790c7a814bed3bb60ec00207e4afc15bf8ad4ca37075320fd28ee0bea5bbec1646f3aed681f |
24 |
DIST docker-compose-1.27.0_rc1.tar.gz 308050 BLAKE2B 347dc4b38feae1d045770ff981a289d9919d47cf7ecf3b46e0c7b996bb3ef6d50a7e36751ca5f996dbe8afbeb0d6fc0967945c3abda05b71024a15efae35fb6c SHA512 ae952deeee7c20f4f506c2f0126e504c2cff432056ac45547c40273d6113fe2c51d87c363f0943247989db3dcb20059c7a7839b2c5328d71a41a15cf12db6062 |
25 |
DIST docker-compose-1.27.0_rc2.tar.gz 308129 BLAKE2B f057d9754040375f71810bbf09cd6a88c9ff05665b4629e0cf45c457b10ff9c4bde1b7a608addb160bcc183d8559a8cb2397f7a2215c1b14ae39577bdb67826b SHA512 556a3b10144ff37996c6e3cd1562ba3fdde2618757d305ead4f861c6614f27bad0cf539885535ca61abaf9e9739bbb1c2b41c489ba87ad75f947213d4cdace19 |
26 |
+DIST docker-compose-1.27.0_rc3.tar.gz 308370 BLAKE2B 094a28a4de8f32dfd82e0720a68cdae1493f63dc553e663081df3b9edf89593c76fba6b67eddcd1d1cd22966345e7d9a535e8603ed3a8f619fda41a1a8b1db9f SHA512 ad996f0df612741ce36e3549d846d3fc507f687e41ed4fb5bd694faa48906da7ca4054d56ab90fe2e64d4548955ec366867be29a449044c357e45b147e475fd9 |
27 |
|
28 |
diff --git a/app-emulation/docker-compose/docker-compose-1.27.0_rc3.ebuild b/app-emulation/docker-compose/docker-compose-1.27.0_rc3.ebuild |
29 |
new file mode 100644 |
30 |
index 00000000000..cf768b054b9 |
31 |
--- /dev/null |
32 |
+++ b/app-emulation/docker-compose/docker-compose-1.27.0_rc3.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=( python3_{6,7} ) |
40 |
+DISTUTILS_USE_SETUPTOOLS=rdepend |
41 |
+ |
42 |
+inherit bash-completion-r1 distutils-r1 |
43 |
+ |
44 |
+MY_PV=${PV/_/-} |
45 |
+DESCRIPTION="Multi-container orchestration for Docker" |
46 |
+HOMEPAGE="https://github.com/docker/compose" |
47 |
+SRC_URI="https://github.com/docker/compose/archive/${MY_PV}.tar.gz -> ${P}.tar.gz" |
48 |
+ |
49 |
+LICENSE="Apache-2.0" |
50 |
+SLOT="0" |
51 |
+KEYWORDS="~amd64" |
52 |
+IUSE="test" |
53 |
+RESTRICT="!test? ( test )" |
54 |
+ |
55 |
+RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}] |
56 |
+ >=dev-python/cached-property-1.2.0[${PYTHON_USEDEP}] |
57 |
+ >=dev-python/distro-1.5.0[${PYTHON_USEDEP}] |
58 |
+ >=dev-python/docker-py-4.3.1[${PYTHON_USEDEP}] |
59 |
+ >=dev-python/dockerpty-0.4.1[${PYTHON_USEDEP}] |
60 |
+ >=dev-python/docopt-0.6.1[${PYTHON_USEDEP}] |
61 |
+ >=dev-python/python-dotenv-0.13.0[${PYTHON_USEDEP}] |
62 |
+ >=dev-python/jsonschema-2.5.1[${PYTHON_USEDEP}] |
63 |
+ dev-python/paramiko[${PYTHON_USEDEP}] |
64 |
+ >=dev-python/PySocks-1.6.0[${PYTHON_USEDEP}] |
65 |
+ >=dev-python/pyyaml-3.10[${PYTHON_USEDEP}] |
66 |
+ >=dev-python/requests-2.20.0[${PYTHON_USEDEP}] |
67 |
+ >=dev-python/six-1.3.0[${PYTHON_USEDEP}] |
68 |
+ >=dev-python/texttable-0.9.0[${PYTHON_USEDEP}] |
69 |
+ >=dev-python/websocket-client-0.32.0[${PYTHON_USEDEP}]" |
70 |
+ |
71 |
+DEPEND="${RDEPEND} |
72 |
+ test? ( |
73 |
+ >=dev-python/pytest-5[${PYTHON_USEDEP}] |
74 |
+ >=dev-python/ddt-1.2.2[${PYTHON_USEDEP}] |
75 |
+ )" |
76 |
+ |
77 |
+S="${WORKDIR}/compose-${MY_PV}" |
78 |
+ |
79 |
+PATCHES=( |
80 |
+ # Bug #679968 -- https://bugs.gentoo.org/679968 |
81 |
+ # Bug #681002 -- https://bugs.gentoo.org/681002 |
82 |
+ "${FILESDIR}"/${PN}-1.27.0_rc3-setup-py.patch |
83 |
+) |
84 |
+ |
85 |
+DOCS=( CHANGELOG.md README.md ) |
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.27.0_rc3-setup-py.patch b/app-emulation/docker-compose/files/docker-compose-1.27.0_rc3-setup-py.patch |
109 |
new file mode 100644 |
110 |
index 00000000000..3026933addd |
111 |
--- /dev/null |
112 |
+++ b/app-emulation/docker-compose/files/docker-compose-1.27.0_rc3-setup-py.patch |
113 |
@@ -0,0 +1,67 @@ |
114 |
+From 3b4800ed5b24cea7af00aa868964e3d46e81364e Mon Sep 17 00:00:00 2001 |
115 |
+From: Sebastian Pipping <sebastian@×××××××.org> |
116 |
+Date: Thu, 3 Sep 2020 19:59:36 +0200 |
117 |
+Subject: [PATCH] setup.py: Drop generic upper version boundaries |
118 |
+ |
119 |
+--- |
120 |
+ setup.py | 34 +++++++++++++++++----------------- |
121 |
+ 1 file changed, 17 insertions(+), 17 deletions(-) |
122 |
+ |
123 |
+diff --git a/setup.py b/setup.py |
124 |
+index e0d4340..648a736 100644 |
125 |
+--- a/setup.py |
126 |
++++ b/setup.py |
127 |
+@@ -25,33 +25,33 @@ 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 |
+- 'distro >= 1.5.0, < 2', |
138 |
+- 'docker[ssh] >= 4.3.1, < 5', |
139 |
+- 'dockerpty >= 0.4.1, < 1', |
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.3.1', |
150 |
++ 'dockerpty >= 0.4.1', |
151 |
++ 'jsonschema >= 2.5.1', |
152 |
++ 'python-dotenv >= 0.13.0', |
153 |
+ ] |
154 |
+ |
155 |
+ |
156 |
+ tests_require = [ |
157 |
+- 'ddt >= 1.2.2, < 2', |
158 |
+- 'pytest < 6', |
159 |
++ 'ddt >= 1.2.2', |
160 |
++ 'pytest', |
161 |
+ ] |
162 |
+ |
163 |
+ |
164 |
+ if sys.version_info[:2] < (3, 4): |
165 |
+- tests_require.append('mock >= 1.0.1, < 4') |
166 |
++ tests_require.append('mock >= 1.0.1') |
167 |
+ |
168 |
+ extras_require = { |
169 |
+- ':python_version < "3.5"': ['backports.ssl_match_hostname >= 3.5, < 4'], |
170 |
+- ':sys_platform == "win32"': ['colorama >= 0.4, < 1'], |
171 |
+- 'socks': ['PySocks >= 1.5.6, != 1.5.7, < 2'], |
172 |
++ ':python_version < "3.5"': ['backports.ssl_match_hostname >= 3.5'], |
173 |
++ ':sys_platform == "win32"': ['colorama >= 0.4'], |
174 |
++ 'socks': ['PySocks >= 1.5.6, != 1.5.7'], |
175 |
+ 'tests': tests_require, |
176 |
+ } |
177 |
+ |
178 |
+-- |
179 |
+2.27.0 |
180 |
+ |