Gentoo Archives: gentoo-commits

From: Sebastian Pipping <sping@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-emulation/docker-compose/, app-emulation/docker-compose/files/
Date: Mon, 24 Sep 2018 16:00:22
Message-Id: 1537804767.da99ab05e7f74b6060fc9cd34f698fe235ac3861.sping@gentoo
1 commit: da99ab05e7f74b6060fc9cd34f698fe235ac3861
2 Author: Sebastian Pipping <sping <AT> gentoo <DOT> org>
3 AuthorDate: Mon Sep 24 15:58:13 2018 +0000
4 Commit: Sebastian Pipping <sping <AT> gentoo <DOT> org>
5 CommitDate: Mon Sep 24 15:59:27 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=da99ab05
7
8 app-emulation/docker-compose: Drop generic upper version boundaries
9
10 Package-Manager: Portage-2.3.49, Repoman-2.3.10
11
12 .../docker-compose/docker-compose-1.22.0-r1.ebuild | 72 ++++++++++++++++++++++
13 .../files/docker-compose-1.22.0-setup-py.patch | 58 +++++++++++++++++
14 2 files changed, 130 insertions(+)
15
16 diff --git a/app-emulation/docker-compose/docker-compose-1.22.0-r1.ebuild b/app-emulation/docker-compose/docker-compose-1.22.0-r1.ebuild
17 new file mode 100644
18 index 00000000000..a9900fc1c66
19 --- /dev/null
20 +++ b/app-emulation/docker-compose/docker-compose-1.22.0-r1.ebuild
21 @@ -0,0 +1,72 @@
22 +# Copyright 1999-2018 Gentoo Foundation
23 +# Distributed under the terms of the GNU General Public License v2
24 +
25 +EAPI=6
26 +PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
27 +
28 +inherit bash-completion-r1 distutils-r1 vcs-snapshot
29 +
30 +MY_PV=${PV/_/}
31 +
32 +DESCRIPTION="Multi-container orchestration for Docker"
33 +HOMEPAGE="https://github.com/docker/compose"
34 +SRC_URI="https://github.com/docker/compose/archive/${PV}.tar.gz -> ${P}.tar.gz"
35 +
36 +LICENSE="Apache-2.0"
37 +SLOT="0"
38 +KEYWORDS="~amd64"
39 +IUSE="test"
40 +
41 +CDEPEND="
42 + dev-python/setuptools[${PYTHON_USEDEP}]
43 + >=dev-python/cached-property-1.2.0[${PYTHON_USEDEP}]
44 + >=dev-python/dockerpty-0.4.1[${PYTHON_USEDEP}]
45 + >=dev-python/docker-py-3.4.1[${PYTHON_USEDEP}]
46 + >=dev-python/docopt-0.6.1[${PYTHON_USEDEP}]
47 + >=dev-python/jsonschema-2.5.1[${PYTHON_USEDEP}]
48 + >=dev-python/PySocks-1.5.6[${PYTHON_USEDEP}]
49 + !~dev-python/PySocks-1.5.7[${PYTHON_USEDEP}]
50 + >=dev-python/pyyaml-3.10[${PYTHON_USEDEP}]
51 + >=dev-python/requests-2.6.1[${PYTHON_USEDEP}]
52 + !~dev-python/requests-2.11.0[${PYTHON_USEDEP}]
53 + !~dev-python/requests-2.12.2[${PYTHON_USEDEP}]
54 + !~dev-python/requests-2.18.0[${PYTHON_USEDEP}]
55 + >=dev-python/six-1.3.0[${PYTHON_USEDEP}]
56 + >=dev-python/texttable-0.9[${PYTHON_USEDEP}]
57 + >=dev-python/websocket-client-0.32.0[${PYTHON_USEDEP}]
58 + $(python_gen_cond_dep '>=dev-python/enum34-1.0.4[${PYTHON_USEDEP}]' 'python2_7' )
59 + $(python_gen_cond_dep '>=dev-python/ipaddress-1.0.16[${PYTHON_USEDEP}]' 'python2_7' )
60 + $(python_gen_cond_dep '>=dev-python/backports-ssl-match-hostname-3.5[${PYTHON_USEDEP}]' 'python2_7' )
61 +"
62 +DEPEND="
63 + ${CDEPEND}
64 + test? (
65 + dev-python/pytest[${PYTHON_USEDEP}]
66 + $(python_gen_cond_dep '>=dev-python/mock-1.0.1[${PYTHON_USEDEP}]' 'python2_7' )
67 + )
68 +"
69 +RDEPEND="${CDEPEND}"
70 +
71 +PATCHES=(
72 + "${FILESDIR}"/${P}-setup-py.patch
73 +)
74 +
75 +src_prepare() {
76 + # Address QA issue "docker-compose.exe: missing alias (symlink) for completed command."
77 + sed 's,^\(complete.*\) docker-compose\.exe\(.*\),\1\2,' -i contrib/completion/bash/docker-compose || die
78 +
79 + default
80 +}
81 +
82 +python_test() {
83 + ${PYTHON} -m pytest tests/unit || die "tests failed under ${EPYTHON}"
84 +}
85 +
86 +python_install_all() {
87 + newbashcomp contrib/completion/bash/docker-compose ${PN}
88 +
89 + insinto /usr/share/zsh/site-functions
90 + doins contrib/completion/zsh/*
91 +
92 + distutils-r1_python_install_all
93 +}
94
95 diff --git a/app-emulation/docker-compose/files/docker-compose-1.22.0-setup-py.patch b/app-emulation/docker-compose/files/docker-compose-1.22.0-setup-py.patch
96 new file mode 100644
97 index 00000000000..191e96d6396
98 --- /dev/null
99 +++ b/app-emulation/docker-compose/files/docker-compose-1.22.0-setup-py.patch
100 @@ -0,0 +1,58 @@
101 +From 950506efebe97cb76f6cd3a558bab724452a51e9 Mon Sep 17 00:00:00 2001
102 +From: Sebastian Pipping <sebastian@×××××××.org>
103 +Date: Mon, 24 Sep 2018 17:35:22 +0200
104 +Subject: [PATCH] setup.py: Drop generic upper version boundaries
105 +
106 +---
107 + setup.py | 24 +++++++++++++-------------
108 + 1 file changed, 13 insertions(+), 13 deletions(-)
109 +
110 +diff --git a/setup.py b/setup.py
111 +index e0a26b0..1f9fb7f 100644
112 +--- a/setup.py
113 ++++ b/setup.py
114 +@@ -30,16 +30,16 @@ def find_version(*file_paths):
115 +
116 +
117 + install_requires = [
118 +- 'cached-property >= 1.2.0, < 2',
119 +- 'docopt >= 0.6.1, < 0.7',
120 +- 'PyYAML >= 3.10, < 4',
121 +- 'requests >= 2.6.1, != 2.11.0, != 2.12.2, != 2.18.0, < 2.19',
122 +- 'texttable >= 0.9.0, < 0.10',
123 +- 'websocket-client >= 0.32.0, < 1.0',
124 +- 'docker >= 3.4.1, < 4.0',
125 +- 'dockerpty >= 0.4.1, < 0.5',
126 +- 'six >= 1.3.0, < 2',
127 +- 'jsonschema >= 2.5.1, < 3',
128 ++ 'cached-property >= 1.2.0',
129 ++ 'docopt >= 0.6.1',
130 ++ 'PyYAML >= 3.10',
131 ++ 'requests >= 2.6.1, != 2.11.0, != 2.12.2, != 2.18.0',
132 ++ 'texttable >= 0.9.0',
133 ++ 'websocket-client >= 0.32.0',
134 ++ 'docker >= 3.4.1',
135 ++ 'dockerpty >= 0.4.1',
136 ++ 'six >= 1.3.0',
137 ++ 'jsonschema >= 2.5.1',
138 + ]
139 +
140 +
141 +@@ -52,11 +52,11 @@ if sys.version_info[:2] < (3, 4):
142 + tests_require.append('mock >= 1.0.1')
143 +
144 + extras_require = {
145 +- ':python_version < "3.4"': ['enum34 >= 1.0.4, < 2'],
146 ++ ':python_version < "3.4"': ['enum34 >= 1.0.4'],
147 + ':python_version < "3.5"': ['backports.ssl_match_hostname >= 3.5'],
148 + ':python_version < "3.3"': ['ipaddress >= 1.0.16'],
149 +- ':sys_platform == "win32"': ['colorama >= 0.3.9, < 0.4'],
150 +- 'socks': ['PySocks >= 1.5.6, != 1.5.7, < 2'],
151 ++ ':sys_platform == "win32"': ['colorama >= 0.3.9'],
152 ++ 'socks': ['PySocks >= 1.5.6, != 1.5.7'],
153 + }
154 +
155 +
156 +--
157 +2.19.0.rc2
158 +