From 7bc9c63c9da678a7e6fceb095d56c634afd22c56 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 15 Dec 2019 18:09:03 +0000 Subject: gentoo resync : 15.12.2019 --- app-emulation/docker-compose/Manifest | 7 ++- .../docker-compose/docker-compose-1.24.0.ebuild | 1 + .../docker-compose/docker-compose-1.24.1.ebuild | 1 + .../docker-compose/docker-compose-1.25.0-r1.ebuild | 71 ++++++++++++++++++++++ .../files/docker-compose-1.25.0-setup-py.patch | 71 ++++++++++++++++++++++ 5 files changed, 149 insertions(+), 2 deletions(-) create mode 100644 app-emulation/docker-compose/docker-compose-1.25.0-r1.ebuild create mode 100644 app-emulation/docker-compose/files/docker-compose-1.25.0-setup-py.patch (limited to 'app-emulation/docker-compose') diff --git a/app-emulation/docker-compose/Manifest b/app-emulation/docker-compose/Manifest index 6eade4287c94..45705a67769e 100644 --- a/app-emulation/docker-compose/Manifest +++ b/app-emulation/docker-compose/Manifest @@ -1,6 +1,9 @@ AUX docker-compose-1.24.0-setup-py.patch 1767 BLAKE2B 14ad1ab45fc11006a6054e4b5774990ba199344fc233f55b6ad034cf5fdce47cef96b15466c9b04cf33633a1cd34074db597b38b85d443499ff5264afc878a61 SHA512 1bd028ec272a8758ecec351590046919172a73d63b61643737438cda445f35caa2f85afed0b3ebe2c9092f5c7b1a84b1f340f661e4fcfa80301ef5d70f25e8bf +AUX docker-compose-1.25.0-setup-py.patch 2209 BLAKE2B 151abd435ec6e5745d0d073a3509206c095c14391a7fb5e50b1679da61dec4e001e36c0757995e84c5174ce6c9c38aada385b44314f4325e76bbc76bfe0943ff SHA512 3a10564ef42e03da2e722a24564f536c978403d9702350465dfb3b255048641ebe41aa320461098f65a59ba48e73a14b66e073a5d52c44fa9d4416e309797bb7 DIST docker-compose-1.24.0.tar.gz 307601 BLAKE2B cb2a6f96e14c04d0279b25c075182d8f09e5a622e4cee2ce74995224e3a8634cc5f22ccc548b7754bbeb11630c1e638386cb1a6df927b3619cb6e7e3595aac6c SHA512 318c6bf9877147de09526b4d49c3fd86012d85626e7a9a15863ca55a60e10fa85b27429605045d0aaa993dddd3bc2e5f23cbb76856276a874e84793b878a3e86 DIST docker-compose-1.24.1.tar.gz 307749 BLAKE2B 7ded0a4b82a7a9beb9de38752f38998ca4ea9421e5ed5630627820ec7e250ad6f03f6788bcbebe8bc0dd4c064d275bb4ca5a6055a95b6a0f72d7ae9038ec7f22 SHA512 9b8632ef263b8dfa678e8b99b46e00441f779716a524280ce25f62fcd2605f400723b7790c466338374c34653946dc2c5d7f09593ddd892fee3409c2a2fd1a5f -EBUILD docker-compose-1.24.0.ebuild 2234 BLAKE2B 2b94a3071586d66a1e1ca477bbcc4d19f13f43446095df12fdc82148bfb246207e7017607fb010ad4edc5f2a15d04687c742b970888f22b396abdfc82b41732e SHA512 0099f3002d87799e0a678591078f29d67dd7545207763b170f168b5b8aed282daaba470dc802393142fb9b5185ba49dcee1d67440fef73a4afddf73b4df59d60 -EBUILD docker-compose-1.24.1.ebuild 2235 BLAKE2B 04f88a55d885551f875c3e572dcf77df389673ef64170f051e8827b0a6de499f2503e0eb199bdc1eb4623472c170090c806c0c53d769ef886f1f6edf90ac6043 SHA512 fa02d983aa04adf0b4f832fa68fd0ad0f0cd23bfeec5a4a852f8efcf946f59650c71fda4f080faeae8c89102654c9f9e5d3e62955a09cd19d1a4168cbb2ae5d2 +DIST docker-compose-1.25.0.tar.gz 320048 BLAKE2B a0615c9d81f897f551d664799e2a7cd4d72c3e0b70ceb0ff9bfb533a81799d2d524824ead27bff2391c5e98fc34430fb2ba724bba663ece66417ac72181241f0 SHA512 38be153a8ba1bf1a4a5c63dc794db3344c93c0819fba0c38feb791067e0aa72142205e4255b5fd31bf2f8159dfa04cde09fdcdabe0511bc0e2865974dff5433d +EBUILD docker-compose-1.24.0.ebuild 2261 BLAKE2B e4aef84ffa83e5b73335a6d88a981549ba9888b411a7acdd33b78b42a589bb3e97159266b3b6252d734cb086ca41eeb43c7ca0f6df32c3d746e164da49b84374 SHA512 40e1dbfb659a2c121e3b287114db1075b78b74034074f51f17419c370f7ac5c5b216dea8ab5af3667dc852166422aac64b55c55e2c8ce241c5c9c9a02474dd68 +EBUILD docker-compose-1.24.1.ebuild 2262 BLAKE2B e1a7c1f2b4d5f20b74747916ea79349ba082f93d6b6b621b2438e5968c726bdb54dc25a62cd31705ac66398747d0405727ec7a28fd88fcf308ebed8f4c41075e SHA512 12e8cc7b892932fd7109fb8f46440c5c253af4346faef6a8e560303a0e6d7d7f50e5a534e8aa20d0df13d1c03f00d7cc059cb2db2bdde4fce37d20bf1c7644ae +EBUILD docker-compose-1.25.0-r1.ebuild 2462 BLAKE2B 70b24d9e859862f3b44abdf9c73f7b38924503ede0c8b121dbcb488f6553c0fd49d519139e38f9f15879f5c20935d6b9584e4087c3d94d3b960c86841ddddd19 SHA512 bb62f237659bb049d66f26f2558748592d8caace2ab09581f4d92a5d32bbb4a3191018695500766163edde96f9a2c9edba43412d7c0b65302747780f5765358f MISC metadata.xml 326 BLAKE2B 264e99e7fdc551ca2a29d4295d21fb587cb1eeb0bf995b9df63e63015b01b22a51db9254b3a6cb3eb76b8a4eb9e8bf3a1a4c6a936212690fa996e7edf20167dd SHA512 0c50efc71462eb8b312b5bab5b5de85450478f3b7a548c7f3725a4be5514078fb125305f277d14b5fa082027c805171e640367b6094668c05660d426c65043fc diff --git a/app-emulation/docker-compose/docker-compose-1.24.0.ebuild b/app-emulation/docker-compose/docker-compose-1.24.0.ebuild index aacd6aa050a4..231ec1bd9f17 100644 --- a/app-emulation/docker-compose/docker-compose-1.24.0.ebuild +++ b/app-emulation/docker-compose/docker-compose-1.24.0.ebuild @@ -15,6 +15,7 @@ LICENSE="Apache-2.0" SLOT="0" KEYWORDS="amd64" IUSE="test" +RESTRICT="!test? ( test )" RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}] >=dev-python/cached-property-1.2.0[${PYTHON_USEDEP}] diff --git a/app-emulation/docker-compose/docker-compose-1.24.1.ebuild b/app-emulation/docker-compose/docker-compose-1.24.1.ebuild index a9866c0a92e6..12ac42d6a193 100644 --- a/app-emulation/docker-compose/docker-compose-1.24.1.ebuild +++ b/app-emulation/docker-compose/docker-compose-1.24.1.ebuild @@ -15,6 +15,7 @@ LICENSE="Apache-2.0" SLOT="0" KEYWORDS="~amd64" IUSE="test" +RESTRICT="!test? ( test )" RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}] >=dev-python/cached-property-1.2.0[${PYTHON_USEDEP}] diff --git a/app-emulation/docker-compose/docker-compose-1.25.0-r1.ebuild b/app-emulation/docker-compose/docker-compose-1.25.0-r1.ebuild new file mode 100644 index 000000000000..a6f8868eab7b --- /dev/null +++ b/app-emulation/docker-compose/docker-compose-1.25.0-r1.ebuild @@ -0,0 +1,71 @@ +# 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" +RESTRICT="!test? ( 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.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}] + $(python_gen_cond_dep '>=dev-python/backports-shutil_get_terminal_size-1.0.0[${PYTHON_USEDEP}]' 'python2_7' ) + $(python_gen_cond_dep '>=dev-python/backports-ssl-match-hostname-3.5[${PYTHON_USEDEP}]' 'python2_7' ) + $(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/subprocess32-3.5.4[${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.25.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.25.0-setup-py.patch b/app-emulation/docker-compose/files/docker-compose-1.25.0-setup-py.patch new file mode 100644 index 000000000000..a56ad638198b --- /dev/null +++ b/app-emulation/docker-compose/files/docker-compose-1.25.0-setup-py.patch @@ -0,0 +1,71 @@ +From bd58c42fd01829e0dbf475179710e5465655f4b1 Mon Sep 17 00:00:00 2001 +From: Sebastian Pipping +Date: Mon, 18 Nov 2019 23:34:51 +0100 +Subject: [PATCH] setup.py: Drop generic upper version boundaries + +--- + setup.py | 38 +++++++++++++++++++------------------- + 1 file changed, 19 insertions(+), 19 deletions(-) + +diff --git a/setup.py b/setup.py +index 23ae08a..3f6a46f 100644 +--- a/setup.py ++++ b/setup.py +@@ -30,35 +30,35 @@ def find_version(*file_paths): + + + install_requires = [ +- 'cached-property >= 1.2.0, < 2', +- 'docopt >= 0.6.1, < 1', +- 'PyYAML >= 3.10, < 5', +- 'requests >= 2.20.0, < 3', +- 'texttable >= 0.9.0, < 2', +- 'websocket-client >= 0.32.0, < 1', +- 'docker[ssh] >= 3.7.0, < 5', +- 'dockerpty >= 0.4.1, < 1', +- 'six >= 1.3.0, < 2', +- 'jsonschema >= 2.5.1, < 4', ++ 'cached-property >= 1.2.0', ++ 'docopt >= 0.6.1', ++ 'PyYAML >= 3.10', ++ 'requests >= 2.20.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', + ] + + + tests_require = [ +- 'pytest < 6', ++ '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.2"': ['subprocess32 >= 3.5.4, < 4'], +- ':python_version < "3.4"': ['enum34 >= 1.0.4, < 2'], +- ':python_version < "3.5"': ['backports.ssl_match_hostname >= 3.5, < 4'], +- ':python_version < "3.3"': ['backports.shutil_get_terminal_size == 1.0.0', +- 'ipaddress >= 1.0.16, < 2'], +- ':sys_platform == "win32"': ['colorama >= 0.4, < 1'], +- 'socks': ['PySocks >= 1.5.6, != 1.5.7, < 2'], ++ ':python_version < "3.2"': ['subprocess32 >= 3.5.4'], ++ ':python_version < "3.4"': ['enum34 >= 1.0.4'], ++ ':python_version < "3.5"': ['backports.ssl_match_hostname >= 3.5'], ++ ':python_version < "3.3"': ['backports.shutil_get_terminal_size >= 1.0.0', ++ 'ipaddress >= 1.0.16'], ++ ':sys_platform == "win32"': ['colorama >= 0.4'], ++ 'socks': ['PySocks >= 1.5.6, != 1.5.7'], + } + + +-- +2.23.0 + -- cgit v1.2.3