From dd2aea324c07fe1bd13143bb37eff11117b6130a Mon Sep 17 00:00:00 2001 From: "Suren A. Chilingaryan" Date: Thu, 24 Oct 2019 02:09:32 +0200 Subject: Dice(kiwi) and dependencies; kiwi and dependecies (still missing zypper) --- app-emulation/docker-compose/Manifest | 3 + .../docker-compose/docker-compose-1.24.0-r1.ebuild | 68 ++++++++++++++++++++++ .../files/docker-compose-1.24.0-setup-py.patch | 57 ++++++++++++++++++ 3 files changed, 128 insertions(+) create mode 100644 app-emulation/docker-compose/Manifest create mode 100644 app-emulation/docker-compose/docker-compose-1.24.0-r1.ebuild create mode 100644 app-emulation/docker-compose/files/docker-compose-1.24.0-setup-py.patch (limited to 'app-emulation/docker-compose') diff --git a/app-emulation/docker-compose/Manifest b/app-emulation/docker-compose/Manifest new file mode 100644 index 0000000..ed1b2a3 --- /dev/null +++ b/app-emulation/docker-compose/Manifest @@ -0,0 +1,3 @@ +AUX docker-compose-1.24.0-setup-py.patch 1734 BLAKE2B d86f5390c38088c9050f79cc63ae50a7611e1fac4fe2441b936fb7a83a6a0160d6edb5ce0c0b7390b555d424ec55e1362bd2af6bca6937da648f408372d8d1af SHA512 8fce55493f009349a77a95e8a473bc85faa66b03773bccd30ff56d8299bf357676aecd40b2f68a44e292f79e4a28587ae479709dca428010095bda9ec220b85f +DIST docker-compose-1.24.0.tar.gz 307601 BLAKE2B cb2a6f96e14c04d0279b25c075182d8f09e5a622e4cee2ce74995224e3a8634cc5f22ccc548b7754bbeb11630c1e638386cb1a6df927b3619cb6e7e3595aac6c SHA512 318c6bf9877147de09526b4d49c3fd86012d85626e7a9a15863ca55a60e10fa85b27429605045d0aaa993dddd3bc2e5f23cbb76856276a874e84793b878a3e86 +EBUILD docker-compose-1.24.0-r1.ebuild 2234 BLAKE2B 2b94a3071586d66a1e1ca477bbcc4d19f13f43446095df12fdc82148bfb246207e7017607fb010ad4edc5f2a15d04687c742b970888f22b396abdfc82b41732e SHA512 0099f3002d87799e0a678591078f29d67dd7545207763b170f168b5b8aed282daaba470dc802393142fb9b5185ba49dcee1d67440fef73a4afddf73b4df59d60 diff --git a/app-emulation/docker-compose/docker-compose-1.24.0-r1.ebuild b/app-emulation/docker-compose/docker-compose-1.24.0-r1.ebuild new file mode 100644 index 0000000..aacd6aa --- /dev/null +++ b/app-emulation/docker-compose/docker-compose-1.24.0-r1.ebuild @@ -0,0 +1,68 @@ +# Copyright 2018-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python{2_7,3_6} ) + +inherit bash-completion-r1 distutils-r1 + +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" + +RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}] + >=dev-python/cached-property-1.2.0[${PYTHON_USEDEP}] + >=dev-python/docker-py-3.7.0[${PYTHON_USEDEP}] + >=dev-python/dockerpty-0.4.1[${PYTHON_USEDEP}] + >=dev-python/docopt-0.6.1[${PYTHON_USEDEP}] + >=dev-python/jsonschema-2.5.1[${PYTHON_USEDEP}] + dev-python/paramiko[${PYTHON_USEDEP}] + >=dev-python/PySocks-1.6.0[${PYTHON_USEDEP}] + >=dev-python/pyyaml-3.10[${PYTHON_USEDEP}] + >=dev-python/requests-2.18.1[${PYTHON_USEDEP}] + >=dev-python/six-1.3.0[${PYTHON_USEDEP}] + >=dev-python/texttable-0.9.0[${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="${RDEPEND} + test? ( =dev-python/mock-1.0.1[${PYTHON_USEDEP}]' 'python2_7' ) )" + +S="${WORKDIR}/compose-${PV}" + +PATCHES=( + # Bug #679968 -- https://bugs.gentoo.org/679968 + # Bug #681002 -- https://bugs.gentoo.org/681002 + "${FILESDIR}"/${PN}-1.24.0-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() { + distutils_install_for_testing + ${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.24.0-setup-py.patch b/app-emulation/docker-compose/files/docker-compose-1.24.0-setup-py.patch new file mode 100644 index 0000000..d911d19 --- /dev/null +++ b/app-emulation/docker-compose/files/docker-compose-1.24.0-setup-py.patch @@ -0,0 +1,57 @@ +From 981faad5f67a843f2b6c44f40be4dc8d2c5156c7 Mon Sep 17 00:00:00 2001 +From: Sebastian Pipping +Date: Sat, 11 May 2019 00:32:22 +0200 +Subject: [PATCH] setup.py: Drop generic upper version boundaries + +--- + setup.py | 26 +++++++++++++------------- + 1 file changed, 13 insertions(+), 13 deletions(-) + +diff --git a/setup.py b/setup.py +index 8371cc7..b9e5a80 100644 +--- a/setup.py ++++ b/setup.py +@@ -30,16 +30,15 @@ def find_version(*file_paths): + + + install_requires = [ +- 'cached-property >= 1.2.0, < 2', +- 'docopt >= 0.6.1, < 0.7', +- 'PyYAML >= 3.10, < 4.3', +- 'requests >= 2.6.1, != 2.11.0, != 2.12.2, != 2.18.0, < 2.21', +- 'texttable >= 0.9.0, < 0.10', +- 'websocket-client >= 0.32.0, < 1.0', +- 'docker[ssh] >= 3.7.0, < 4.0', +- 'dockerpty >= 0.4.1, < 0.5', +- 'six >= 1.3.0, < 2', +- 'jsonschema >= 2.5.1, < 3', ++ '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[ssh] >= 3.7.0', ++ '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.4, < 0.5'], +- 'socks': ['PySocks >= 1.5.6, != 1.5.7, < 2'], ++ ':sys_platform == "win32"': ['colorama >= 0.4'], ++ 'socks': ['PySocks >= 1.5.6, != 1.5.7'], + } + + +-- +2.21.0 + -- cgit v1.2.3