Gentoo Archives: gentoo-commits

From: Alex Brandt <alunduil@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-emulation/docker-compose/files/, app-emulation/docker-compose/
Date: Sat, 29 Aug 2015 20:52:17
Message-Id: 1440881492.6772acaf064fb55b2b3d827ce4e733b59d383b4a.alunduil@gentoo
1 commit: 6772acaf064fb55b2b3d827ce4e733b59d383b4a
2 Author: Alex Brandt <alunduil <AT> gentoo <DOT> org>
3 AuthorDate: Sat Aug 29 20:51:32 2015 +0000
4 Commit: Alex Brandt <alunduil <AT> gentoo <DOT> org>
5 CommitDate: Sat Aug 29 20:51:32 2015 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6772acaf
7
8 app-emulation/docker-compose: add version 1.4.0
9
10 Package-Manager: portage-2.2.20.1
11
12 app-emulation/docker-compose/Manifest | 1 +
13 .../docker-compose/docker-compose-1.4.0.ebuild | 65 ++++++++++++++++++++++
14 .../files/expand-request-versions.patch | 13 +++++
15 3 files changed, 79 insertions(+)
16
17 diff --git a/app-emulation/docker-compose/Manifest b/app-emulation/docker-compose/Manifest
18 index fe0f618..a2bae4a 100644
19 --- a/app-emulation/docker-compose/Manifest
20 +++ b/app-emulation/docker-compose/Manifest
21 @@ -1 +1,2 @@
22 DIST docker-compose-1.2.0.tar.gz 57150 SHA256 46ef3c5cb7dd79fa7fd1d5fc5ec5be6a5c634192bc09c604c0ea75adb89cb652 SHA512 d13f6d6d22979dbc4554c003e611097627e2273f06dd13a1c666c1ba138288597ebef08f1beaf6d342721391cb49ad5ce9ae2ff03367a041fc0c53fbb62c9ac4 WHIRLPOOL c7bb3e14a4c2788eb49241ce02dcaed5e49fe60652ca1a51d13e1712f946046415f5397d5bf892b5e0451059a4aee1b156ee7bdfdf64a22d000caae7b17254c0
23 +DIST docker-compose-1.4.0.tar.gz 79532 SHA256 2748cc8dd0829b44f0f686e36683cab58e1a4bc869442a04508504d2f62d0337 SHA512 470442aa78ddb24e8b9287953031e17a96a89780edd3a85955c923ffe00f4bfe655412dc15422437121593d7e2899f0847813d3716fc9ed576f93e6455cb868b WHIRLPOOL 9dc6731dad3df6422ec1e1b66049c8e9f04068b2fc2c8180da44220c1fbedc4919dfe17475cd539c3f33a079f3d04f875baaf769a7bc0875de48cf622670dc4b
24
25 diff --git a/app-emulation/docker-compose/docker-compose-1.4.0.ebuild b/app-emulation/docker-compose/docker-compose-1.4.0.ebuild
26 new file mode 100644
27 index 0000000..9727762
28 --- /dev/null
29 +++ b/app-emulation/docker-compose/docker-compose-1.4.0.ebuild
30 @@ -0,0 +1,65 @@
31 +# Copyright 1999-2015 Gentoo Foundation
32 +# Distributed under the terms of the GNU General Public License v2
33 +# $Header: /var/cvsroot/gentoo-x86/app-emulation/docker-compose/docker-compose-1.2.0-r1.ebuild,v 1.1 2015/05/02 15:59:55 alunduil Exp $
34 +
35 +EAPI=5
36 +PYTHON_COMPAT=( python2_7 )
37 +
38 +inherit bash-completion-r1 distutils-r1
39 +
40 +DESCRIPTION="Multi-container orchestration for Docker"
41 +HOMEPAGE="https://www.docker.com/"
42 +SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
43 +
44 +LICENSE="Apache-2.0"
45 +SLOT="0"
46 +KEYWORDS="~amd64"
47 +IUSE="test"
48 +
49 +CDEPEND="
50 + dev-python/setuptools[${PYTHON_USEDEP}]
51 + >=dev-python/dockerpty-0.3.4[${PYTHON_USEDEP}]
52 + <dev-python/dockerpty-0.4[${PYTHON_USEDEP}]
53 + >=dev-python/docker-py-1.3.1[${PYTHON_USEDEP}]
54 + <dev-python/docker-py-1.4[${PYTHON_USEDEP}]
55 + >=dev-python/docopt-0.6.1[${PYTHON_USEDEP}]
56 + <dev-python/docopt-0.7[${PYTHON_USEDEP}]
57 + >=dev-python/pyyaml-3.10[${PYTHON_USEDEP}]
58 + <dev-python/pyyaml-4[${PYTHON_USEDEP}]
59 + >=dev-python/requests-2.6.1[${PYTHON_USEDEP}]
60 + >=dev-python/six-1.3.0[${PYTHON_USEDEP}]
61 + <dev-python/six-2[${PYTHON_USEDEP}]
62 + >=dev-python/texttable-0.8.1[${PYTHON_USEDEP}]
63 + <dev-python/texttable-0.9[${PYTHON_USEDEP}]
64 + >=dev-python/websocket-client-0.32.0[${PYTHON_USEDEP}]
65 + <dev-python/websocket-client-1.0[${PYTHON_USEDEP}]
66 +"
67 +DEPEND="
68 + test? (
69 + ${CDEPEND}
70 + >=dev-python/mock-1.0.1[${PYTHON_USEDEP}]
71 + dev-python/nose[${PYTHON_USEDEP}]
72 + )
73 +"
74 +RDEPEND="${CDEPEND}"
75 +
76 +python_prepare_all() {
77 + local PATCHES=(
78 + "${FILESDIR}"/expand-request-versions.patch
79 + )
80 +
81 + distutils-r1_python_prepare_all
82 +}
83 +
84 +python_test() {
85 + nosetests tests/unit || die "tests failed under ${EPYTHON}"
86 +}
87 +
88 +python_install_all() {
89 + newbashcomp contrib/completion/bash/docker-compose ${PN}
90 +
91 + insinto /usr/share/zsh/site-functions
92 + doins contrib/completion/zsh/*
93 +
94 + distutils-r1_python_install_all
95 +}
96
97 diff --git a/app-emulation/docker-compose/files/expand-request-versions.patch b/app-emulation/docker-compose/files/expand-request-versions.patch
98 new file mode 100644
99 index 0000000..a1c9bb5
100 --- /dev/null
101 +++ b/app-emulation/docker-compose/files/expand-request-versions.patch
102 @@ -0,0 +1,13 @@
103 +diff --git a/setup.py b/setup.py
104 +index 9bca475..5ea5e73 100644
105 +--- a/setup.py
106 ++++ b/setup.py
107 +@@ -27,7 +27,7 @@ def find_version(*file_paths):
108 + install_requires = [
109 + 'docopt >= 0.6.1, < 0.7',
110 + 'PyYAML >= 3.10, < 4',
111 +- 'requests >= 2.6.1, < 2.7',
112 ++ 'requests >= 2.6.1',
113 + 'texttable >= 0.8.1, < 0.9',
114 + 'websocket-client >= 0.32.0, < 1.0',
115 + 'docker-py >= 1.3.1, < 1.4',