From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: <gentoo-commits+bounces-1048693-garchives=archives.gentoo.org@lists.gentoo.org> Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id D5133138334 for <garchives@archives.gentoo.org>; Mon, 24 Sep 2018 16:00:22 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id CF2D7E087A; Mon, 24 Sep 2018 16:00:20 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 89F66E087A for <gentoo-commits@lists.gentoo.org>; Mon, 24 Sep 2018 16:00:20 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id BD14F335C9F for <gentoo-commits@lists.gentoo.org>; Mon, 24 Sep 2018 16:00:18 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 62D593D4 for <gentoo-commits@lists.gentoo.org>; Mon, 24 Sep 2018 16:00:14 +0000 (UTC) From: "Sebastian Pipping" <sping@gentoo.org> To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sebastian Pipping" <sping@gentoo.org> Message-ID: <1537804767.da99ab05e7f74b6060fc9cd34f698fe235ac3861.sping@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-emulation/docker-compose/, app-emulation/docker-compose/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-emulation/docker-compose/docker-compose-1.22.0-r1.ebuild app-emulation/docker-compose/files/docker-compose-1.22.0-setup-py.patch X-VCS-Directories: app-emulation/docker-compose/files/ app-emulation/docker-compose/ X-VCS-Committer: sping X-VCS-Committer-Name: Sebastian Pipping X-VCS-Revision: da99ab05e7f74b6060fc9cd34f698fe235ac3861 X-VCS-Branch: master Date: Mon, 24 Sep 2018 16:00:14 +0000 (UTC) Precedence: bulk List-Post: <mailto:gentoo-commits@lists.gentoo.org> List-Help: <mailto:gentoo-commits+help@lists.gentoo.org> List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org> List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org> List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org> X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: b75e84cc-66af-4d1e-a51b-6b64398e161c X-Archives-Hash: 421c463ede0bfd6222e800c192996eaf commit: da99ab05e7f74b6060fc9cd34f698fe235ac3861 Author: Sebastian Pipping <sping <AT> gentoo <DOT> org> AuthorDate: Mon Sep 24 15:58:13 2018 +0000 Commit: Sebastian Pipping <sping <AT> gentoo <DOT> org> CommitDate: Mon Sep 24 15:59:27 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=da99ab05 app-emulation/docker-compose: Drop generic upper version boundaries Package-Manager: Portage-2.3.49, Repoman-2.3.10 .../docker-compose/docker-compose-1.22.0-r1.ebuild | 72 ++++++++++++++++++++++ .../files/docker-compose-1.22.0-setup-py.patch | 58 +++++++++++++++++ 2 files changed, 130 insertions(+) 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 new file mode 100644 index 00000000000..a9900fc1c66 --- /dev/null +++ b/app-emulation/docker-compose/docker-compose-1.22.0-r1.ebuild @@ -0,0 +1,72 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} ) + +inherit bash-completion-r1 distutils-r1 vcs-snapshot + +MY_PV=${PV/_/} + +DESCRIPTION="Multi-container orchestration for Docker" +HOMEPAGE="https://github.com/docker/compose" +SRC_URI="https://github.com/docker/compose/archive/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="~amd64" +IUSE="test" + +CDEPEND=" + dev-python/setuptools[${PYTHON_USEDEP}] + >=dev-python/cached-property-1.2.0[${PYTHON_USEDEP}] + >=dev-python/dockerpty-0.4.1[${PYTHON_USEDEP}] + >=dev-python/docker-py-3.4.1[${PYTHON_USEDEP}] + >=dev-python/docopt-0.6.1[${PYTHON_USEDEP}] + >=dev-python/jsonschema-2.5.1[${PYTHON_USEDEP}] + >=dev-python/PySocks-1.5.6[${PYTHON_USEDEP}] + !~dev-python/PySocks-1.5.7[${PYTHON_USEDEP}] + >=dev-python/pyyaml-3.10[${PYTHON_USEDEP}] + >=dev-python/requests-2.6.1[${PYTHON_USEDEP}] + !~dev-python/requests-2.11.0[${PYTHON_USEDEP}] + !~dev-python/requests-2.12.2[${PYTHON_USEDEP}] + !~dev-python/requests-2.18.0[${PYTHON_USEDEP}] + >=dev-python/six-1.3.0[${PYTHON_USEDEP}] + >=dev-python/texttable-0.9[${PYTHON_USEDEP}] + >=dev-python/websocket-client-0.32.0[${PYTHON_USEDEP}] + $(python_gen_cond_dep '>=dev-python/enum34-1.0.4[${PYTHON_USEDEP}]' 'python2_7' ) + $(python_gen_cond_dep '>=dev-python/ipaddress-1.0.16[${PYTHON_USEDEP}]' 'python2_7' ) + $(python_gen_cond_dep '>=dev-python/backports-ssl-match-hostname-3.5[${PYTHON_USEDEP}]' 'python2_7' ) +" +DEPEND=" + ${CDEPEND} + test? ( + dev-python/pytest[${PYTHON_USEDEP}] + $(python_gen_cond_dep '>=dev-python/mock-1.0.1[${PYTHON_USEDEP}]' 'python2_7' ) + ) +" +RDEPEND="${CDEPEND}" + +PATCHES=( + "${FILESDIR}"/${P}-setup-py.patch +) + +src_prepare() { + # Address QA issue "docker-compose.exe: missing alias (symlink) for completed command." + sed 's,^\(complete.*\) docker-compose\.exe\(.*\),\1\2,' -i contrib/completion/bash/docker-compose || die + + default +} + +python_test() { + ${PYTHON} -m pytest tests/unit || die "tests failed under ${EPYTHON}" +} + +python_install_all() { + newbashcomp contrib/completion/bash/docker-compose ${PN} + + insinto /usr/share/zsh/site-functions + doins contrib/completion/zsh/* + + distutils-r1_python_install_all +} 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 new file mode 100644 index 00000000000..191e96d6396 --- /dev/null +++ b/app-emulation/docker-compose/files/docker-compose-1.22.0-setup-py.patch @@ -0,0 +1,58 @@ +From 950506efebe97cb76f6cd3a558bab724452a51e9 Mon Sep 17 00:00:00 2001 +From: Sebastian Pipping <sebastian@pipping.org> +Date: Mon, 24 Sep 2018 17:35:22 +0200 +Subject: [PATCH] setup.py: Drop generic upper version boundaries + +--- + setup.py | 24 +++++++++++++------------- + 1 file changed, 13 insertions(+), 13 deletions(-) + +diff --git a/setup.py b/setup.py +index e0a26b0..1f9fb7f 100644 +--- a/setup.py ++++ b/setup.py +@@ -30,16 +30,16 @@ def find_version(*file_paths): + + + install_requires = [ +- 'cached-property >= 1.2.0, < 2', +- 'docopt >= 0.6.1, < 0.7', +- 'PyYAML >= 3.10, < 4', +- 'requests >= 2.6.1, != 2.11.0, != 2.12.2, != 2.18.0, < 2.19', +- 'texttable >= 0.9.0, < 0.10', +- 'websocket-client >= 0.32.0, < 1.0', +- 'docker >= 3.4.1, < 4.0', +- 'dockerpty >= 0.4.1, < 0.5', +- 'six >= 1.3.0, < 2', +- 'jsonschema >= 2.5.1, < 3', ++ 'cached-property >= 1.2.0', ++ 'docopt >= 0.6.1', ++ 'PyYAML >= 3.10', ++ 'requests >= 2.6.1, != 2.11.0, != 2.12.2, != 2.18.0', ++ 'texttable >= 0.9.0', ++ 'websocket-client >= 0.32.0', ++ 'docker >= 3.4.1', ++ 'dockerpty >= 0.4.1', ++ 'six >= 1.3.0', ++ 'jsonschema >= 2.5.1', + ] + + +@@ -52,11 +52,11 @@ if sys.version_info[:2] < (3, 4): + tests_require.append('mock >= 1.0.1') + + extras_require = { +- ':python_version < "3.4"': ['enum34 >= 1.0.4, < 2'], ++ ':python_version < "3.4"': ['enum34 >= 1.0.4'], + ':python_version < "3.5"': ['backports.ssl_match_hostname >= 3.5'], + ':python_version < "3.3"': ['ipaddress >= 1.0.16'], +- ':sys_platform == "win32"': ['colorama >= 0.3.9, < 0.4'], +- 'socks': ['PySocks >= 1.5.6, != 1.5.7, < 2'], ++ ':sys_platform == "win32"': ['colorama >= 0.3.9'], ++ 'socks': ['PySocks >= 1.5.6, != 1.5.7'], + } + + +-- +2.19.0.rc2 +