From 8d5dbd847cbc704a6a06405856e94b461011afe3 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 27 Mar 2021 06:06:27 +0000 Subject: gentoo resync : 27.03.2021 --- app-emulation/docker-compose/Manifest | 3 + .../docker-compose/docker-compose-1.28.6.ebuild | 73 ++++++++++++++++++++++ .../files/docker-compose-1.28.6-setup-py.patch | 67 ++++++++++++++++++++ 3 files changed, 143 insertions(+) create mode 100644 app-emulation/docker-compose/docker-compose-1.28.6.ebuild create mode 100644 app-emulation/docker-compose/files/docker-compose-1.28.6-setup-py.patch (limited to 'app-emulation/docker-compose') diff --git a/app-emulation/docker-compose/Manifest b/app-emulation/docker-compose/Manifest index 7b88e508120a..a74a621a75e2 100644 --- a/app-emulation/docker-compose/Manifest +++ b/app-emulation/docker-compose/Manifest @@ -1,10 +1,13 @@ AUX docker-compose-1.27.0_rc3-setup-py.patch 1840 BLAKE2B 15269cc09ad609008afbf2d61beabc5242d63f2e3c6cfb8c65c1768de3aea559dd99e6ab7ff6acd1b93420402d0a176fdb1390c5477c7820e3173b0ff2d39853 SHA512 12a1b996a8d37289991ea979ddf1a303241217f43b26df5b7d2a1241006c7de38234c11ed0b9e99ca92348159d0681c3316e3413a4d639c13fa29acb0ae8cf23 AUX docker-compose-1.28.4-setup-py.patch 1844 BLAKE2B 5e9d683c5e90d30662555c050a07a3d13dd646028b62b9abfa19c84b9e3d0395fe2cedccbc8c352d6c2b89aca0244c750942ba7fb5e25fd2721c18bb47b6d008 SHA512 c60a3d56def25bdf9e884f0af8dcbba8e30d6aa05a8fc3efbef170807f007e67c2177340d6992688d531a937fbd2671656ddf74273dd4c8b4b5511dd73795cd1 AUX docker-compose-1.28.5-setup-py.patch 1844 BLAKE2B 5fee25a003a6c0b2afcb17a38959a8f0c2284ec3f6a8ff2e09afee946dd68a4ef36d66b629922867baf7e16db26ec9b89aa943b7f1f4ee134d0881fa76024290 SHA512 fdc35b95a3a43c250aec3f71b5322badaac45a03ab17dce789ae114b0a9a5f2a493d07d3b177e295cd0ad94f0bda191eaae139517a50e229de1de599216e888e +AUX docker-compose-1.28.6-setup-py.patch 1899 BLAKE2B 391331a3b425cde6657151f35883fcba40641a04063624ab49b6dfe3a4a376211d01547731d810d404c69befca083eb1116265ffdaf0fc4577255233f8391539 SHA512 94000982e32db3a874868565d326b5738ddb642e09759545f7652e2abc55fcd654ad7438ebaad3e19417c9b25fbc3cd93bf005c22ac9dab22f1bc25e01f0be3a DIST docker-compose-1.27.4.tar.gz 309308 BLAKE2B 098af5e0308de4fe72f8f7d5c9cbdb285ec1cb6fbd492baef8a4223f93591321c585ebabd4c7e4a40d7a1bce3ab2d7ccf4cee1d0a15e7f59bb80eb4df5b6c8d6 SHA512 b41b7cf88b1380021a30f9becb7567d1e154ef875c42b37483673b5107f1a26dae6868b92c6a61f695001eb63759b25f3729e6783272eb784047717cafea3b80 DIST docker-compose-1.28.4.tar.gz 318110 BLAKE2B 97a39c52a2e9819fa4632a16080b9b3a029c5b81caa1bcb5143e78b9c6f3981aa462ef23c6c08fcafe80f8b786ce4962959dc84fd4fe2003ceee3dddcb85f438 SHA512 ba0b8a8a87e154c36b499b0fbb422847bcec421bdcbb6a7fc4a4d8169ae410f6bb71867fbff42b670b3d5ae61101527eeb71e68d57458906796e2d64adc0e367 DIST docker-compose-1.28.5.tar.gz 318236 BLAKE2B 32aca16fdebd00c5b211404e82b44b9486340bfa379d4739d164d5aa75d4f35b95d914065c05fef585ea7e412035e582d8058f2b942a4ce17a9b2bc25ff0cd31 SHA512 1f2cc87b82d18c023e8c2d9eb2e991393c96f7a3ab17fa6871d0969a28162b6832f98b42c76cadc641416629f74eb00763c89e044ae8cf02a062bd74b58371c9 +DIST docker-compose-1.28.6.tar.gz 319216 BLAKE2B 6f35f13fd35e08223fd17406b219fcd8c97fe9a2e96a3210607d23d54923496a9a51271f359b1537b73bc5e407d175822075835f44406fcfe028cc23d8eaf9f9 SHA512 0aef0066e58ee3e9ac6ddfef71cd29ae46ba52ed641b6da7ffc74b9e9a60b3974593173e84ac863475bb5d2a3896a0d453fda4decb69101c91abc04f33e50d45 EBUILD docker-compose-1.27.4.ebuild 2108 BLAKE2B 9d7a0dfad313a4311a188076d2cb06975f15a36d98d030c9f5bda18f0d5d7d35d70d65e0ddfa817eef560e575004e7c05f9b06e3a2a0582096f3d8476d480916 SHA512 e378202a4f2ae68eda0750a391d74c7fc9a2bc7614d4db4fffd32b6ca683989ef71e73c72a1d00e5e687296500c06a072c82c3b959b1c794f8942fdd94c33096 EBUILD docker-compose-1.28.4.ebuild 2106 BLAKE2B aca5e45b0979591607a9468e4dfd1d74cdc46a6ca37f1bee0efd7ff74a043fe5d70f7a1d6b0e88f494f3be8791054a8c58afcf99a4ff45665599f2a59a92cef1 SHA512 29ac7efdddf077305e3aafed0786cfaa0af39c839e7fe129d20f540b17ad7b1d1ef276d574201be3e619aa2506b31d3909fbc709d097b59bfd59e4abe700c615 EBUILD docker-compose-1.28.5.ebuild 2106 BLAKE2B 1ba83fc6311c7f57b5f73a19236d0be6f720ed4399735428abc46aba3e02b9ea11f3a34796f6fd89bce60e4ad614ec232293aa57c884412c5fa314bd3e9d1b65 SHA512 9310c2ac24b9d0d31505f78b1bfeaa0c87017c91bac5008de531f283fc4fd0a98343c8c80037616f427e9ed5d59e18dc6dfa96de297d19a580597727cfeff1a9 +EBUILD docker-compose-1.28.6.ebuild 2106 BLAKE2B 4c0b6b20bb8c738885b904338b555fc3d48de10cb850113da2c3c8b79deb14f3c951242100ab12b6edf8b006b346c10d4a0b70c2026acdcb708473ec328bcc56 SHA512 c41c7543b214c369bc11b23bfcbbf84f7a3d5f263b16d02036148f191e8ea8a36fd05c243c84ec4478ac985edc8e2e0381dcb8d154c94f6cdc37928f947593cd MISC metadata.xml 380 BLAKE2B 00c5a74fedd97fdd6dd3274523d134991e50dfb8dcf798027c00049d52cb431c8d06237dd06e48b4793cd14c879eb7a22a95dff01d9ad285cfa4d75e45a19e99 SHA512 04599c73f5b724749979b44f2eb3bcfdc071dc56d06a37c22eedfe7e9b85fee511bc5a0ad5553b96b0e86c054579dab538f2a519bcc21e96b8dbe79b27b95d0e diff --git a/app-emulation/docker-compose/docker-compose-1.28.6.ebuild b/app-emulation/docker-compose/docker-compose-1.28.6.ebuild new file mode 100644 index 000000000000..d9f80948b759 --- /dev/null +++ b/app-emulation/docker-compose/docker-compose-1.28.6.ebuild @@ -0,0 +1,73 @@ +# Copyright 2018-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{7,8,9} ) +DISTUTILS_USE_SETUPTOOLS=rdepend + +inherit bash-completion-r1 distutils-r1 + +MY_PV=${PV/_/-} +DESCRIPTION="Multi-container orchestration for Docker" +HOMEPAGE="https://github.com/docker/compose" +SRC_URI="https://github.com/docker/compose/archive/${MY_PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="~amd64 ~arm64" +IUSE="test" +RESTRICT="!test? ( test )" + +RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}] + >=dev-python/cached-property-1.2.0[${PYTHON_USEDEP}] + >=dev-python/distro-1.5.0[${PYTHON_USEDEP}] + >=dev-python/docker-py-4.4.4[${PYTHON_USEDEP}] + >=dev-python/dockerpty-0.4.1[${PYTHON_USEDEP}] + >=dev-python/docopt-0.6.1[${PYTHON_USEDEP}] + >=dev-python/python-dotenv-0.13.0[${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.20.0[${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}]" + +DEPEND="${RDEPEND} + test? ( + >=dev-python/pytest-5[${PYTHON_USEDEP}] + >=dev-python/ddt-1.2.2[${PYTHON_USEDEP}] + )" + +S="${WORKDIR}/compose-${MY_PV}" + +PATCHES=( + # Bug #679968 -- https://bugs.gentoo.org/679968 + # Bug #681002 -- https://bugs.gentoo.org/681002 + "${FILESDIR}"/${PN}-1.28.6-setup-py.patch +) + +DOCS=( CHANGELOG.md README.md ) + +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.28.6-setup-py.patch b/app-emulation/docker-compose/files/docker-compose-1.28.6-setup-py.patch new file mode 100644 index 000000000000..63ecd7f9642a --- /dev/null +++ b/app-emulation/docker-compose/files/docker-compose-1.28.6-setup-py.patch @@ -0,0 +1,67 @@ +From 0efc455303f08b6a41df021972dfa337c527b9cb Mon Sep 17 00:00:00 2001 +From: Sebastian Pipping +Date: Tue, 23 Mar 2021 17:25:23 +0100 +Subject: [PATCH] setup.py: Drop generic upper version boundaries + +--- + setup.py | 34 +++++++++++++++++----------------- + 1 file changed, 17 insertions(+), 17 deletions(-) + +diff --git a/setup.py b/setup.py +index 7669979..59df626 100644 +--- a/setup.py ++++ b/setup.py +@@ -25,33 +25,33 @@ def find_version(*file_paths): + + + install_requires = [ +- 'docopt >= 0.6.1, < 1', +- 'PyYAML >= 3.10, < 6', +- 'requests >= 2.20.0, < 3', +- 'texttable >= 0.9.0, < 2', +- 'websocket-client >= 0.32.0, < 1', +- 'distro >= 1.5.0, < 2', +- 'docker[ssh] >= 4.4.4, < 5', +- 'dockerpty >= 0.4.1, < 1', +- 'jsonschema >= 2.5.1, < 4', +- 'python-dotenv >= 0.13.0, < 1', ++ 'docopt >= 0.6.1', ++ 'PyYAML >= 3.10', ++ 'requests >= 2.20.0', ++ 'texttable >= 0.9.0', ++ 'websocket-client >= 0.32.0', ++ 'distro >= 1.5.0', ++ 'docker[ssh] >= 4.4.4', ++ 'dockerpty >= 0.4.1', ++ 'jsonschema >= 2.5.1', ++ 'python-dotenv >= 0.13.0', + ] + + + tests_require = [ +- 'ddt >= 1.2.2, < 2', +- 'pytest < 6', ++ 'ddt >= 1.2.2', ++ 'pytest', + ] + + + if sys.version_info[:2] < (3, 4): +- tests_require.append('mock >= 1.0.1, < 4') ++ tests_require.append('mock >= 1.0.1') + + extras_require = { +- ':python_version < "3.5"': ['backports.ssl_match_hostname >= 3.5, < 4'], +- ':python_version < "3.8"': ['cached-property >= 1.2.0, < 2'], +- ':sys_platform == "win32"': ['colorama >= 0.4, < 1'], +- 'socks': ['PySocks >= 1.5.6, != 1.5.7, < 2'], ++ ':python_version < "3.5"': ['backports.ssl_match_hostname >= 3.5'], ++ ':python_version < "3.8"': ['cached-property >= 1.2.0'], ++ ':sys_platform == "win32"': ['colorama >= 0.4'], ++ 'socks': ['PySocks >= 1.5.6, != 1.5.7'], + 'tests': tests_require, + } + +-- +2.30.2 + -- cgit v1.2.3