commit: 8b558ba26b658a0094c995a1ccab555b4523365f Author: Sebastian Pipping <sping <AT> gentoo <DOT> org> AuthorDate: Tue Feb 4 23:08:21 2020 +0000 Commit: Sebastian Pipping <sping <AT> gentoo <DOT> org> CommitDate: Tue Feb 4 23:08:21 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8b558ba2
app-emulation/docker-compose: Drop old Signed-off-by: Sebastian Pipping <sping <AT> gentoo.org> Package-Manager: Portage-2.3.84, Repoman-2.3.20 app-emulation/docker-compose/Manifest | 5 -- .../docker-compose/docker-compose-1.24.1.ebuild | 65 -------------------- .../docker-compose/docker-compose-1.25.0-r1.ebuild | 65 -------------------- .../docker-compose/docker-compose-1.25.1.ebuild | 65 -------------------- .../docker-compose/docker-compose-1.25.2.ebuild | 67 -------------------- .../docker-compose/docker-compose-1.25.3.ebuild | 67 -------------------- .../files/docker-compose-1.25.0-setup-py.patch | 71 ---------------------- 7 files changed, 405 deletions(-) diff --git a/app-emulation/docker-compose/Manifest b/app-emulation/docker-compose/Manifest index cdafc7679dc..619bd7b61cb 100644 --- a/app-emulation/docker-compose/Manifest +++ b/app-emulation/docker-compose/Manifest @@ -1,7 +1,2 @@ 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 -DIST docker-compose-1.25.0.tar.gz 320048 BLAKE2B a0615c9d81f897f551d664799e2a7cd4d72c3e0b70ceb0ff9bfb533a81799d2d524824ead27bff2391c5e98fc34430fb2ba724bba663ece66417ac72181241f0 SHA512 38be153a8ba1bf1a4a5c63dc794db3344c93c0819fba0c38feb791067e0aa72142205e4255b5fd31bf2f8159dfa04cde09fdcdabe0511bc0e2865974dff5433d -DIST docker-compose-1.25.1.tar.gz 321627 BLAKE2B 9056b0e359ff6cccba16b7ea5fc96de363f242103c48d15e3ed19ed5291878f7a5c81f99b7fd3eff46eaff5b271e883125ab02ff22bf592c4a5dd12792790fdc SHA512 5e58edd3364caecc9b6ec0e92e629e624694e42f96da836378648918dfaa41ddc0c99b107f2d3f11d1dd6ab86a516a7b2da3783b542623440d8c0c6628c05020 -DIST docker-compose-1.25.2.tar.gz 306196 BLAKE2B 6bf9c1ae14b25f41a7b3893f5ddc5b654743b29eb17c3d1b23e47d004e8e3feaf021b67c2419632faa6b11713ad1bd956b9f756e36fcd8efc7e60404a1de53a7 SHA512 ce045c6af233d6d03fd26100bce836444abb3022d6661ac6073cd8c6b8ed1cc0bbef9cbfad73672c8d3b6f3a12ee98e6e60c5f1b90360f778d5fa8d18e00179e -DIST docker-compose-1.25.3.tar.gz 306220 BLAKE2B 503a76d51ff36e7a91030f240c8b795383f399472517056e3d586ddb72c31dd02fed51474e7716e4f43f801a10160e271ed695c5defa6a2d3e1be647d9f0d33b SHA512 92c7bb2adf5fd033add0bfe92634c04d0acb69846daabb215eea696d396fbcc13ffa175173544c4e2a3ae0c0ec0ac81526b6cef68cdcfe0eecec6ac894c6f8f2 DIST docker-compose-1.25.4.tar.gz 306513 BLAKE2B 86c779d794deca7ede0adc80041b17a96b21798d2807065e2c9ea804a95fcaf24a8b92fbcad6c7ce4d1b9d1fb3c9ad348b630e3f10bfd032202995a4c34ab019 SHA512 860153fb603d7efcc76535c9997446a2e6fe18f61769d4f05f51b531902a66072be11e3cff012ba80240b0a7802a032495a2a55e053a9784df92b82e5351b72e diff --git a/app-emulation/docker-compose/docker-compose-1.24.1.ebuild b/app-emulation/docker-compose/docker-compose-1.24.1.ebuild deleted file mode 100644 index b310d81c22b..00000000000 --- a/app-emulation/docker-compose/docker-compose-1.24.1.ebuild +++ /dev/null @@ -1,65 +0,0 @@ -# Copyright 2018-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_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.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}]" - -DEPEND="${RDEPEND} - test? ( <dev-python/pytest-4[${PYTHON_USEDEP}] - <dev-python/pyyaml-5.1[${PYTHON_USEDEP}] )" - -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/docker-compose-1.25.0-r1.ebuild b/app-emulation/docker-compose/docker-compose-1.25.0-r1.ebuild deleted file mode 100644 index ae28e4a89c3..00000000000 --- a/app-emulation/docker-compose/docker-compose-1.25.0-r1.ebuild +++ /dev/null @@ -1,65 +0,0 @@ -# Copyright 2018-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_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}]" - -DEPEND="${RDEPEND} - test? ( <dev-python/pytest-4[${PYTHON_USEDEP}] - <dev-python/pyyaml-5.1[${PYTHON_USEDEP}] )" - -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/docker-compose-1.25.1.ebuild b/app-emulation/docker-compose/docker-compose-1.25.1.ebuild deleted file mode 100644 index 014701ba9c8..00000000000 --- a/app-emulation/docker-compose/docker-compose-1.25.1.ebuild +++ /dev/null @@ -1,65 +0,0 @@ -# Copyright 2018-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_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}]" - -DEPEND="${RDEPEND} - test? ( <dev-python/pytest-4[${PYTHON_USEDEP}] - <dev-python/pyyaml-5.1[${PYTHON_USEDEP}] )" - -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/docker-compose-1.25.2.ebuild b/app-emulation/docker-compose/docker-compose-1.25.2.ebuild deleted file mode 100644 index 08fd06065ee..00000000000 --- a/app-emulation/docker-compose/docker-compose-1.25.2.ebuild +++ /dev/null @@ -1,67 +0,0 @@ -# Copyright 2018-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_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/v${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}]" - -DEPEND="${RDEPEND} - test? ( - <dev-python/pytest-4[${PYTHON_USEDEP}] - dev-python/ddt[${PYTHON_USEDEP}] - )" - -S="${WORKDIR}/compose-${PV}" - -PATCHES=( - # Bug #679968 -- https://bugs.gentoo.org/679968 - # Bug #681002 -- https://bugs.gentoo.org/681002 - "${FILESDIR}"/${PN}-1.25.2-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/docker-compose-1.25.3.ebuild b/app-emulation/docker-compose/docker-compose-1.25.3.ebuild deleted file mode 100644 index 90f18a6ef86..00000000000 --- a/app-emulation/docker-compose/docker-compose-1.25.3.ebuild +++ /dev/null @@ -1,67 +0,0 @@ -# Copyright 2018-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_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}]" - -DEPEND="${RDEPEND} - test? ( - <dev-python/pytest-4[${PYTHON_USEDEP}] - dev-python/ddt[${PYTHON_USEDEP}] - )" - -S="${WORKDIR}/compose-${PV}" - -PATCHES=( - # Bug #679968 -- https://bugs.gentoo.org/679968 - # Bug #681002 -- https://bugs.gentoo.org/681002 - "${FILESDIR}"/${PN}-1.25.2-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 deleted file mode 100644 index a56ad638198..00000000000 --- a/app-emulation/docker-compose/files/docker-compose-1.25.0-setup-py.patch +++ /dev/null @@ -1,71 +0,0 @@ -From bd58c42fd01829e0dbf475179710e5465655f4b1 Mon Sep 17 00:00:00 2001 -From: Sebastian Pipping <sebast...@pipping.org> -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 -
